Unnecessary definition.

[goodfet] / firmware / goodfet.c

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index 8ff94b6..900e836 100644 (file)
--- a/firmware/goodfet.c
+++ b/firmware/goodfet.c
@@ -10,7 +10,7 @@
 #include "platform.h"\r
 #include "command.h"\r
 #include "apps.h"\r
-\r
+#include "glitch.h"\r
 \r
 \r
 //LED on P1.0\r
@@ -22,22 +22,32 @@ void init(){
   \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
+  //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
+\r
 //! Handle a command.\r
 void handle(unsigned char app,\r
            unsigned char verb,\r
            unsigned long len){\r
   //debugstr("GoodFET");\r
+  P1OUT&=~1;\r
   switch(app){\r
+  case GLITCH:\r
+    glitchhandle(app,verb,len);\r
+    break;\r
   case MONITOR:\r
     monitorhandle(app,verb,len);\r
     break;\r
@@ -56,6 +66,9 @@ void handle(unsigned char app,
   case JTAG:\r
     jtaghandle(app,verb,len);\r
     break;\r
+  case EJTAG:\r
+    ejtaghandle(app,verb,len);\r
+    break;\r
   case JTAG430: //Also JTAG430X, JTAG430X2\r
     jtag430x2handle(app,verb,len);\r
     break;\r
@@ -64,9 +77,9 @@ void handle(unsigned char app,
       pluginhandle(app,verb,len);\r
     }else{\r
       debugstr("Plugin missing.");\r
+      debughex(app);\r
       txdata(app,NOK,0);\r
     }\r
-      \r
     break;\r
   }\r
 }\r
@@ -77,15 +90,38 @@ int main(void)
   volatile unsigned int i;\r
   unsigned char app, verb;\r
   unsigned long len;\r
+  // MSP reboot count for reset input & reboot function located at 0xFFFE\r
+  volatile unsigned int reset_count = 0;\r
+  void (*reboot_function)(void) = (void *) 0xFFFE;\r
   \r
   init();\r
-  \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
+\r
+       // If the app is the reset byte (0x80) increment and loop\r
+       if (app == 0x80) {\r
+               reset_count++;\r
+\r
+               if (reset_count > 4) {\r
+                       // We could trigger the WDT with either:\r
+                       // WDTCTL = 0;\r
+                       // or\r
+                       // WDTCTL = WDTPW + WDTCNTCL + WDTSSEL + 0x00;\r
+                       // but instead we'll jump to our reboot function pointer\r
+                       (*reboot_function)();\r
+               }\r
+\r
+               continue;\r
+       } else {\r
+               reset_count = 0;\r
+       }\r
+\r
     verb=serial_rx();\r
     //len=serial_rx();\r
     len=rxword();\r