X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fgoodfet.c;h=6bb0f3e6338cce773bf7ab97bab97c6c0dab8304;hp=5d33b39981c10d119e9aff75b5d07753ab893ad6;hb=18cee49968e2982cccb0e1c4a579244fd5d51fb1;hpb=0fdf6e0b883ba3f7661e555145a3601609729e89

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index 5d33b39..6bb0f3e 100644
--- a/firmware/goodfet.c
+++ b/firmware/goodfet.c
@@ -12,13 +12,32 @@
 #include "apps.h"
 #include "glitch.h"
 
+#if (platform == tilaunchpad)
+#include <setjmp.h>
+jmp_buf warmstart;
+void coldstart();
+#include "msp430_serial.h"
+#endif
+
 #define RESET 0x80      // not a real app -- causes firmware to reset
 #define DEBUGAPP 0xFF
 
 //! General init function, calls platform-specific one.
 void init(){
 #ifdef MSP430
-  msp430_init();
+  #define INITCHIP msp430_init();
+#endif
+
+#ifdef ARDUINO
+  #define INITCHIP arduino_init();
+#endif
+
+#if (platform == donbfet)
+# define INITCHIP donbfet_init();
+#endif
+
+#ifdef INITCHIP
+INITCHIP
 #else
 #warning "No init() routine for this platform!"
 #endif
@@ -32,32 +51,29 @@ void init(){
 
 //! Handle a command.
 void handle(uint8_t const app,
-			uint8_t const verb,
-			uint32_t const len)
-{
-	int i;
-
-	//debugstr("GoodFET");
-	PLEDOUT&=~PLEDPIN;
-
-	// find the app and call the handle fn
-	for(i = 0; i < num_apps; i++)
-	{
-		if(apps[i]->app == app)
-		{
-			// call the app's handle fn
-			(*(apps[i]->handle))(app, verb, len);
-
-			// exit early
-			return;
-		}
-	}
-
-	// if we get here, then the desired app is not copiled in 
-	// this firmware
-	debugstr("App missing.");
-	debughex(app);
-	txdata(app, NOK, 0);
+	    uint8_t const verb,
+	    uint32_t const len){
+  int i;
+  
+  //debugstr("GoodFET");
+  //led_off();
+  
+  // find the app and call the handle fn
+  for(i = 0; i < num_apps; i++){
+    if(apps[i]->app == app){
+      // call the app's handle fn
+      (*(apps[i]->handle))(app, verb, len);
+
+      // exit early
+      return;
+    }
+  }
+
+  // if we get here, then the desired app is not copiled in 
+  // this firmware
+  debugstr("App missing.");
+  debughex(app);
+  txdata(app, NOK, 0);
 }
 
 
@@ -69,12 +85,34 @@ int main(void)
 	unsigned long len;
 	// MSP reboot count for reset input & reboot function located at 0xFFFE
 	volatile unsigned int reset_count = 0;
+#if (platform == tilaunchpad)
+	int ret=0;
+
+	//ret = setjmp(warmstart);// needs to be here since context from init() would be gone
+ warmstart:
+	if (ret == 0) {	
+		coldstart();	// basic hardware setup, clock to TUSB3410, and enable
+	} else if (ret == 2) {
+		dputs("\nalmost BSL only one RTS change\n");
+	} else if (ret > 2) {	// reset released after more than two tst transisitions
+		// We could write a BSL, a nice exercise for a Sunday afternoon.
+		dputs("\nBSL\n");
+		//call_BSL();	// once you are done uncomment ;-)
+	} else {		// we come here after DTR high (release reset)
+		dputs("\nWarmstart\n");
+	}
+#elif (platform == donbfet)
+	extern void donbfet_reboot(void);
+	void (*reboot_function)(void) = donbfet_reboot;
+#else
 	void (*reboot_function)(void) = (void *) 0xFFFE;
-
+#endif
 	init();
-  
+	
 	txstring(MONITOR,OK,"http://goodfet.sf.net/");
-  
+	//txstring(0xab,0xcd,"http://goodfet.sf.net/");
+	
+	
 	//Command loop.  There's no end!
 	while(1)
 	{
@@ -93,7 +131,24 @@ int main(void)
 				// or
 				// WDTCTL = WDTPW + WDTCNTCL + WDTSSEL + 0x00;
 				// but instead we'll jump to our reboot function pointer
+#ifdef MSP430
+# if (platform == tilaunchpad)
+				// do we really need this, we do not want to reset the TUSB3410 
+				dputs("reset_count>4\n");
+				
+				//longjmp(warmstart,111);
+				goto warmstart;
+				
+# else
+				(*reboot_function)();
+# endif
+#else /* !MSP430 */
+# if (platform == donbfet)
 				(*reboot_function)();
+# else
+				debugstr("Rebooting not supported on this platform.");
+# endif
+#endif
 			}
 
 			continue;
@@ -104,10 +159,9 @@ int main(void)
 		}
 
 		verb = serial_rx();
-		//len=serial_rx();
 		len = rxword();
 
-		//Read data, looking for buffer overflow.y
+		//Read data, looking for buffer overflow.
 		if(len <= CMDDATALEN)
 		{
 			for(i = 0; i < len; i++)