X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fgoodfet.c;h=53591509c91d11d567ba031b7a09803f35a642a5;hp=b9485aa5b87d233347adb8b8bf56b5428314ef66;hb=6e4a1014e1ddfdf63dbf07fa3fdcaa1fdca99bab;hpb=d8eef3ccb487fb87b2aca1dc6a0bd9b9bbe31861

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index b9485aa..5359150 100644
--- a/firmware/goodfet.c
+++ b/firmware/goodfet.c
@@ -10,7 +10,7 @@
 #include "platform.h"
 #include "command.h"
 #include "apps.h"
-
+#include "glitch.h"
 
 
 //LED on P1.0
@@ -22,12 +22,17 @@ void init(){
   
   //LED out and on.
   PLEDDIR |= PLEDPIN;
-  PLEDOUT |= PLEDPIN;
+  PLEDOUT &= ~PLEDPIN;
   
   //Setup clocks, unique to each '430.
   msp430_init_dco();
   msp430_init_uart();
   
+  //DAC should be at full voltage if it exists.
+  #ifdef DAC12IR
+  glitchvoltages(0xfff,0xfff);
+  #endif
+  
   //Enable Interrupts.
   //eint();
 }
@@ -38,7 +43,11 @@ void handle(unsigned char app,
 	    unsigned char verb,
 	    unsigned long len){
   //debugstr("GoodFET");
+  P1OUT&=~1;
   switch(app){
+  case GLITCH:
+    glitchhandle(app,verb,len);
+    break;
   case MONITOR:
     monitorhandle(app,verb,len);
     break;
@@ -65,9 +74,9 @@ void handle(unsigned char app,
       pluginhandle(app,verb,len);
     }else{
       debugstr("Plugin missing.");
+      debughex(app);
       txdata(app,NOK,0);
     }
-      
     break;
   }
 }
@@ -78,15 +87,38 @@ int main(void)
   volatile unsigned int i;
   unsigned char app, verb;
   unsigned long len;
+  // MSP reboot count for reset input & reboot function located at 0xFFFE
+  volatile unsigned int reset_count = 0;
+  void (*reboot_function)(void) = (void *) 0xFFFE;
   
   init();
-  
+
   txstring(MONITOR,OK,"http://goodfet.sf.net/");
   
+  
   //Command loop.  There's no end!
   while(1){
     //Magic 3
     app=serial_rx();
+
+	// If the app is the reset byte (0x80) increment and loop
+	if (app == 0x80) {
+		reset_count++;
+
+		if (reset_count > 4) {
+			// We could trigger the WDT with either:
+			// WDTCTL = 0;
+			// or
+			// WDTCTL = WDTPW + WDTCNTCL + WDTSSEL + 0x00;
+			// but instead we'll jump to our reboot function pointer
+			(*reboot_function)();
+		}
+
+		continue;
+	} else {
+		reset_count = 0;
+	}
+
     verb=serial_rx();
     //len=serial_rx();
     len=rxword();