Removing the ugliest of hacks.

[goodfet] / firmware / goodfet.c

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index bf63b13..2fe74e1 100644 (file)
--- a/firmware/goodfet.c
+++ b/firmware/goodfet.c
@@ -1,5 +1,6 @@
 /*! \file goodfet.c\r
   \author Travis Goodspeed\r
 /*! \file goodfet.c\r
   \author Travis Goodspeed\r

+  \brief Main module.\r

   \r
   This is the main module of the GoodFET, which calls the initialization\r
   routines and delegates commands to the various applications.\r
   \r
   This is the main module of the GoodFET, which calls the initialization\r
   routines and delegates commands to the various applications.\r


@@ -9,7 +10,7 @@
 #include "platform.h"\r
 #include "command.h"\r
 #include "apps.h"\r
 #include "platform.h"\r
 #include "command.h"\r
 #include "apps.h"\r

-\r
+#include "glitch.h"\r

 \r
 \r
 //LED on P1.0\r
 \r
 \r
 //LED on P1.0\r


@@ -21,27 +22,41 @@ void init(){
   \r
   //LED out and on.\r
   PLEDDIR |= PLEDPIN;\r
   \r
   //LED out and on.\r
   PLEDDIR |= PLEDPIN;\r

-  PLEDOUT |= PLEDPIN;\r
+  PLEDOUT &= ~PLEDPIN;\r

   \r
   //Setup clocks, unique to each '430.\r
   msp430_init_dco();\r
   msp430_init_uart();\r
   \r
   \r
   //Setup clocks, unique to each '430.\r
   msp430_init_dco();\r
   msp430_init_uart();\r
   \r

+  //DAC should be at full voltage if it exists.\r
+  #ifdef DAC12IR\r
+  glitchvoltages(0xfff,0xfff);\r
+  #endif\r
+  \r

   //Enable Interrupts.\r
   //eint();\r
 }\r
 \r
   //Enable Interrupts.\r
   //eint();\r
 }\r
 \r

+\r

 //! Handle a command.\r
 void handle(unsigned char app,\r
            unsigned char verb,\r
 //! Handle a command.\r
 void handle(unsigned char app,\r
            unsigned char verb,\r

-           unsigned char len){\r
+           unsigned long len){\r
+  //debugstr("GoodFET");\r
+  P1OUT&=~1;\r

   switch(app){\r
   switch(app){\r

+  case GLITCH:\r
+    glitchhandle(app,verb,len);\r
+    break;\r

   case MONITOR:\r
     monitorhandle(app,verb,len);\r
     break;\r
   case SPI:\r
     spihandle(app,verb,len);\r
     break;\r
   case MONITOR:\r
     monitorhandle(app,verb,len);\r
     break;\r
   case SPI:\r
     spihandle(app,verb,len);\r
     break;\r

+  case AVR:\r
+    avrhandle(app,verb,len);\r
+    break;\r

   case I2CAPP:\r
     i2chandle(app,verb,len);\r
     break;\r
   case I2CAPP:\r
     i2chandle(app,verb,len);\r
     break;\r


@@ -55,11 +70,13 @@ void handle(unsigned char app,
     jtag430x2handle(app,verb,len);\r
     break;\r
   default:\r
     jtag430x2handle(app,verb,len);\r
     break;\r
   default:\r

-    #ifdef HANDLEOTHER\r
-    HANDLEOTHER(app,verb,len);\r
-    #else\r
-    txdata(app,NOK,0);\r
-    #endif\r
+    if(pluginhandle){\r
+      pluginhandle(app,verb,len);\r
+    }else{\r
+      debugstr("Plugin missing.");\r
+      debughex(app);\r
+      txdata(app,NOK,0);\r
+    }\r

     break;\r
   }\r
 }\r
     break;\r
   }\r
 }\r


@@ -68,24 +85,36 @@ void handle(unsigned char app,
 int main(void)\r
 {\r
   volatile unsigned int i;\r
 int main(void)\r
 {\r
   volatile unsigned int i;\r

-  unsigned char app, verb, len;\r
+  unsigned char app, verb;\r
+  unsigned long len;\r

   \r
   init();\r
   \r
   init();\r

-  \r
+\r

   txstring(MONITOR,OK,"http://goodfet.sf.net/");\r
   \r
   txstring(MONITOR,OK,"http://goodfet.sf.net/");\r
   \r

+  \r

   //Command loop.  There's no end!\r
   while(1){\r
     //Magic 3\r
     app=serial_rx();\r
     verb=serial_rx();\r
   //Command loop.  There's no end!\r
   while(1){\r
     //Magic 3\r
     app=serial_rx();\r
     verb=serial_rx();\r

-    len=serial_rx();\r
+    //len=serial_rx();\r
+    len=rxword();\r

     \r
     \r

-    //Read data, if any\r
-    for(i=0;i<len;i++){\r
-      cmddata[i]=serial_rx();\r
+    //Read data, looking for buffer overflow.y\r
+    if(len<=CMDDATALEN){\r
+      for(i=0;i<len;i++){\r
+       cmddata[i]=serial_rx();\r
+      }\r
+      handle(app,verb,len);\r
+    }else{\r
+      //Listen to the blaberring.\r
+      for(i-0;i<len;i++)\r
+       serial_rx();\r
+      //Reply with an error.\r
+      debugstr("Buffer length exceeded.");\r
+      txdata(MONITOR,NOK,0);\r

     }\r
     }\r

-    handle(app,verb,len);\r

   }\r
 }\r
 \r
   }\r
 }\r
 \r