X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fgoodfet.c;h=90e4d0fd7eb5479bab725939f0c4a3324fb2fa97;hp=594d7db1b2414e92271fda22803a642458a4946f;hb=8c97f896b9cf1b9b6ddf25420c9d9f04516ddd11;hpb=3bf98a899ca8003835b69d949d299369a5d7a4f7

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index 594d7db..90e4d0f 100644
--- a/firmware/goodfet.c
+++ b/firmware/goodfet.c
@@ -1,86 +1,163 @@
-//GOODFET Main File
-//Includes several applications.
-
-#include "platform.h"
-#include "command.h"
-#include "apps.h"
-
-#include <signal.h>
-#include <io.h>
-#include <iomacros.h>
-
-
-//LED on P1.0
-//IO on P5
-
-//! Initialize registers and all that jazz.
-void init(){
-  WDTCTL = WDTPW + WDTHOLD;                 // Stop watchdog timer
-  
-  //LED and TX OUT
-  PLEDDIR |= PLEDPIN;
-  
-  msp430_init_dco();
-  msp430_init_uart();
-  
-  //Enable Interrupts.
-  //eint();
-}
-
-//! Handle a command.
-void handle(unsigned char app,
-	    unsigned char verb,
-	    unsigned char len){
-  switch(app){
-  case MONITOR:
-    monitorhandle(app,verb,len);
-    break;
-  case SPI:
-    spihandle(app,verb,len);
-    break;
-  case I2C:
-    i2chandle(app,verb,len);
-    break;
-  case CHIPCON:
-    cchandle(app,verb,len);
-    break;
-  case JTAG:
-    jtaghandle(app,verb,len);
-    break;
-  case JTAG430:
-    jtag430handle(app,verb,len);
-    break;
-  default:
-    txdata(app,NOK,0);
-    break;
-  }
-}
-
-//! Main loop.
-int main(void)
-{
-  volatile unsigned int i;
-  unsigned char app, verb, len;
-  
-  init();
-  
-  
-  //Ready
-  //txdata(MONITOR,OK,0);
-  txstring(MONITOR,OK,"http://goodfet.sf.net/");
-  
-  //Command loop.  There's no end!
-  while(1){
-    //Magic 3
-    app=serial_rx();
-    verb=serial_rx();
-    len=serial_rx();
-    
-    //Read data, if any
-    for(i=0;i<len;i++){
-      cmddata[i]=serial_rx();
-    }
-    handle(app,verb,len);
-  }
-}
-
+/*! \file goodfet.c
+  \author Travis Goodspeed
+  \brief Main module.
+  
+  This is the main module of the GoodFET, which calls the initialization
+  routines and delegates commands to the various applications.
+*/
+
+
+#include "platform.h"
+#include "command.h"
+#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
+  #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
+
+#ifdef INITPLATFORM
+  INITPLATFORM
+#endif
+}
+
+
+
+//! Handle a command.
+void handle(uint8_t const app,
+	    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 compiled into
+  // this firmware
+  debugstr("App missing.");
+  debughex(app);
+  txdata(app, NOK, 0);
+}
+
+
+//! 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;
+#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);
+    }
+  }
+}
+