X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fgoodfet.c;h=4ed467e9231beadbff88c9454a3cd8d5e2bbc032;hp=5f30c77cf2669a8b9946b35599b8b109bd493fde;hb=92ea7762796ae5588a43d41f32515238ade44d79;hpb=5b89da5a9d7864784dbe4942d856f751c3758c1c

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index 5f30c77..4ed467e 100644
--- a/firmware/goodfet.c
+++ b/firmware/goodfet.c
@@ -12,6 +12,13 @@
 #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
 
@@ -25,6 +32,10 @@ void init(){
   #define INITCHIP arduino_init();
 #endif
 
+#if (platform == donbfet)
+# define INITCHIP donbfet_init();
+#endif
+
 #ifdef INITCHIP
 INITCHIP
 #else
@@ -45,7 +56,7 @@ void handle(uint8_t const app,
   int i;
   
   //debugstr("GoodFET");
-  PLEDOUT&=~PLEDPIN;
+  //led_off();
   
   // find the app and call the handle fn
   for(i = 0; i < num_apps; i++){
@@ -74,14 +85,33 @@ 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/");
-	#ifdef ECHOTEST
-	while(1) serial0_tx(serial0_rx());
-	#endif
+	//txstring(0xab,0xcd,"http://goodfet.sf.net/");
+	
 	
 	//Command loop.  There's no end!
 	while(1)
@@ -101,11 +131,24 @@ int main(void)
 				// or
 				// WDTCTL = WDTPW + WDTCNTCL + WDTSSEL + 0x00;
 				// but instead we'll jump to our reboot function pointer
-			  #ifdef MSP430
+#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)();
-			  #else
+# endif
+#else /* !MSP430 */
+# if (platform == donbfet)
+				(*reboot_function)();
+# else
 				debugstr("Rebooting not supported on this platform.");
-			  #endif
+# endif
+#endif
 			}
 
 			continue;
@@ -114,11 +157,11 @@ int main(void)
 		{
 			reset_count = 0;
 		}
-
+		
 		verb = 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++)