Added goodthopter11 to config.mk.

[goodfet] / firmware / goodfet.c

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index 5f30c77..efe0f8c 100644 (file)
--- 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++){
@@ -58,7 +69,7 @@ void handle(uint8_t const app,
     }
   }
 
-  // if we get here, then the desired app is not copiled in 
+  // if we get here, then the desired app is not compiled into
   // this firmware
   debugstr("App missing.");
   debughex(app);
@@ -67,77 +78,88 @@ void handle(uint8_t const app,
 
 
 //! Main loop.
-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/");
-       #ifdef ECHOTEST
-       while(1) serial0_tx(serial0_rx());
-       #endif
-       
-       //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 == RESET)
-               {
-                       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
-                         #ifdef MSP430
-                               (*reboot_function)();
-                         #else
-                               debugstr("Rebooting not supported on this platform.");
-                         #endif
-                       }
-
-                       continue;
-               } 
-               else 
-               {
-                       reset_count = 0;
-               }
-
-               verb = serial_rx();
-               len = rxword();
-
-               //Read data, looking for buffer overflow.y
-               if(len <= CMDDATALEN)
-               {
-                       for(i = 0; i < len; i++)
-                       {
-                               cmddata[i] = serial_rx();
-                       }
-
-                       handle(app,verb,len);
-               }
-               else
-               {
-                       //Listen to the blaberring.
-                       for(i = 0; i < len; i++)
-                               serial_rx();
-
-                       //Reply with an error.
-                       debugstr("Buffer length exceeded.");
-                       txdata(MONITOR,NOK,0);
-               }
-       }
+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;
+  
+  silent=0; //Don't trust globals.
+  
+#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");
+  }
+#endif
+
+#if (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){
+    //Magic 3
+    app = serial_rx();
+    
+    // If the app is the reset byte (0x80) increment and loop
+    if (app == RESET){
+      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)();
+       debugstr("Rebooting not supported on this platform.");
+      }
+           
+      continue;
+    }else {
+      reset_count = 0;
+    }
+         
+    verb = serial_rx();
+    len = rxword();
+         
+    //Read data, looking for buffer overflow.
+    if(len <= CMDDATALEN){
+      for(i = 0; i < len; i++)
+         cmddata[i] = serial_rx();
+           
+      handle(app,verb,len);
+    }else {
+      //Listen to the blaberring.
+      for(i = 0; i < len; i++)
+       serial_rx();
+           
+      //Reply with an error.
+      debugstr("Buffer length exceeded.");
+      txdata(MONITOR,NOK,0);
+    }
+  }
 }