X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fgoodfet.c;h=900e8363278767d03647baf639f86a403cd6ef3a;hp=2702fdd54477d5cede1cc3535999fb421efa5ffc;hb=64712ca1ad4da7b006e1381c0909b409d24c9995;hpb=b197a5b786af9a49508435b9da27459b8f85ba18

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index 2702fdd..900e836 100644
--- a/firmware/goodfet.c
+++ b/firmware/goodfet.c
@@ -66,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;
@@ -74,9 +77,9 @@ void handle(unsigned char app,
       pluginhandle(app,verb,len);
     }else{
       debugstr("Plugin missing.");
+      debughex(app);
       txdata(app,NOK,0);
     }
-      
     break;
   }
 }
@@ -87,6 +90,9 @@ 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();
 
@@ -97,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();