From: travisutk <travisutk@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Date: Wed, 3 Jun 2009 17:10:12 +0000 (+0000)
Subject: Firmware coming together.
X-Git-Url: http://git.rot13.org/?p=goodfet;a=commitdiff_plain;h=6a87a627534bd71abda0c446269dd03c5cad4a42

Firmware coming together.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@22 12e2690d-a6be-4b82-a7b7-67c4a43b65c8
---

diff --git a/firmware/apps/Makefile b/firmware/apps/Makefile
new file mode 100644
index 0000000..83f3125
--- /dev/null
+++ b/firmware/apps/Makefile
@@ -0,0 +1,24 @@
+
+PORT=/dev/ttyUSB0
+BSL=tos-bsl --invert-reset --invert-test -c $(PORT)
+
+#mcu=msp430x1611
+mcu=msp430x1612
+
+#ldscript is wonky
+GCCINC=-T ../ldscripts/161x.x
+
+CC=msp430-gcc -g -mmcu=$(mcu) -DGCC $(GCCINC) -I ../include
+
+apps= monitor/monitor.c
+libs= ../lib/msp430f1612.c ../lib/command.c
+app=goodfet
+
+install: $(app)
+	$(BSL) -e -p $(app) 
+	$(BSL) -P $(app) -r
+$(app): $(app).c $(libs) $(apps)
+erase:
+	$(BSL) -e 
+clean:
+	rm -f $(app)
diff --git a/firmware/apps/goodfet.c b/firmware/apps/goodfet.c
new file mode 100644
index 0000000..c5e037e
--- /dev/null
+++ b/firmware/apps/goodfet.c
@@ -0,0 +1,78 @@
+//GOODFET Echo test.
+
+
+#include "platform.h"
+#include "command.h"
+#include "apps.h"
+
+#include <signal.h>
+#include <io.h>
+#include <iomacros.h>
+
+
+//LED on P1.0
+//IO on P5
+
+//! Initialize registers and all that jazz.
+void init(){
+  volatile unsigned int i;
+  WDTCTL = WDTPW + WDTHOLD;                 // Stop watchdog timer
+  
+  //LED and TX OUT
+  PLEDDIR |= PLEDPIN;
+  
+  msp430_init_dco();
+  msp430_init_uart();
+  
+  //Enable Interrupts.
+  //eint();
+}
+
+//! Handle a command.
+void handle(unsigned char app,
+	    unsigned char verb,
+	    unsigned char len){
+  switch(app){
+  case MONITOR:
+    monitorhandle(app,verb,len);
+    break;
+  default:
+    txdata(app,NOK,0);
+  }
+}
+
+//! Main loop.
+int main(void)
+{
+  volatile unsigned int i;
+  unsigned char app, verb, len;
+  
+  init();
+  
+  //Command loop.  There's no end!
+  while(1){
+    //Ready
+    txdata(MONITOR,OK,0);
+    
+    //Magic 3
+    app=serial_rx();
+    verb=serial_rx();
+    len=serial_rx();
+    //Read data, if any
+    for(i=0;i<len;i++){
+      cmddata[i]=serial_rx();
+    }
+    handle(app,verb,len);
+  }
+    
+  //while(1) serial_tx(serial_rx());
+  while(1) serial_tx(serial_rx());
+  
+  while(1){
+    i = 10000;
+    while(i--);
+    
+    PLEDOUT^=PLEDPIN;  // Blink
+  }
+}
+
diff --git a/firmware/apps/monitor/monitor.c b/firmware/apps/monitor/monitor.c
new file mode 100644
index 0000000..0bb7838
--- /dev/null
+++ b/firmware/apps/monitor/monitor.c
@@ -0,0 +1,15 @@
+#include "command.h"
+
+//! Handles a monitor command.
+void monitorhandle(unsigned char app,
+		   unsigned char verb,
+		   unsigned char len){
+  switch(verb){
+  case PEEK:
+    cmddata[0]=memorybyte[cmddataword[0]];
+    txdata(app,verb,1);
+    break;
+  case POKE:
+    break;
+  }
+}
diff --git a/firmware/include/apps.h b/firmware/include/apps.h
new file mode 100644
index 0000000..8a8b999
--- /dev/null
+++ b/firmware/include/apps.h
@@ -0,0 +1,10 @@
+//! Application stuff.
+
+#define MONITOR 0x00
+#define SPI 0x01
+#define I2C 0x02
+#define JTAG 0x10
+#define JTAG430 0x11
+#define CHIPCON 0x30
+#define SIF 0x31
+
diff --git a/firmware/include/command.h b/firmware/include/command.h
new file mode 100644
index 0000000..5d7813b
--- /dev/null
+++ b/firmware/include/command.h
@@ -0,0 +1,22 @@
+//! Command handling functions.
+
+//! Global data buffer.
+extern unsigned char cmddata[256];
+#define cmddataword ((unsigned int*) cmddata)
+#define memorybyte ((unsigned char*) 0)
+
+// Command prefixes
+#define READ  0x00
+#define WRITE 0x01
+#define PEEK  0x02
+#define POKE  0x03
+#define NOK   0x7E
+#define OK    0x7F
+
+//!Handle a command.  Defined in goodfet.c
+void handle(unsigned char app,unsigned char verb,unsigned  char len);
+
+//!Transmit data.
+void txdata(unsigned char app,
+	    unsigned char verb,
+	    unsigned char len);
diff --git a/firmware/lib/command.c b/firmware/lib/command.c
new file mode 100644
index 0000000..c9c1b1c
--- /dev/null
+++ b/firmware/lib/command.c
@@ -0,0 +1,16 @@
+//! Different command handling functions.
+
+unsigned char cmddata[256];
+
+//!Transmit data.
+void txdata(unsigned char app,
+	    unsigned char verb,
+	    unsigned char len){
+  unsigned int i=0;
+  serial_tx(app);
+  serial_tx(verb);
+  serial_tx(len);
+  for(i=0;i<len;i++){
+    serial_tx(cmddata[i]);
+  }
+}