X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fgoodfet.c;h=900e8363278767d03647baf639f86a403cd6ef3a;hp=b08313f01c1d71857aefc51446d86df3f3fab3e8;hb=d4a4c6dfcfbe972cfed51bb0f549e7c6dccae232;hpb=c63fa4693820603a0444cc323ca34ad0b8fa9791

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index b08313f..900e836 100644
--- a/firmware/goodfet.c
+++ b/firmware/goodfet.c
@@ -28,6 +28,11 @@ void init(){
   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,6 +43,7 @@ void handle(unsigned char app,
 	    unsigned char verb,
 	    unsigned long len){
   //debugstr("GoodFET");
+  P1OUT&=~1;
   switch(app){
   case GLITCH:
     glitchhandle(app,verb,len);
@@ -60,6 +66,9 @@ void handle(unsigned char app,
   case JTAG:
     jtaghandle(app,verb,len);
     break;
+  case EJTAG:
+    ejtaghandle(app,verb,len);
+    break;
   case JTAG430: //Also JTAG430X, JTAG430X2
     jtag430x2handle(app,verb,len);
     break;
@@ -68,9 +77,9 @@ void handle(unsigned char app,
       pluginhandle(app,verb,len);
     }else{
       debugstr("Plugin missing.");
+      debughex(app);
       txdata(app,NOK,0);
     }
-      
     break;
   }
 }
@@ -81,10 +90,12 @@ 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();
-  glitchsetup();
-  
+
   txstring(MONITOR,OK,"http://goodfet.sf.net/");
   
   
@@ -92,6 +103,25 @@ int main(void)
   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();