X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fgoodfet.c;h=b9485aa5b87d233347adb8b8bf56b5428314ef66;hp=d993167b4d6f9e0e22e05223872d2cae8af1a9e8;hb=94fe2500d21c2c329f8a70f654e6fac0faf5730b;hpb=1f226af77a28d66cbe8eff845e4fee3370798ab8

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index d993167..b9485aa 100644
--- a/firmware/goodfet.c
+++ b/firmware/goodfet.c
@@ -1,13 +1,16 @@
-//GOODFET Main File
-//Includes several applications.
+/*! \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 <signal.h>
-#include <io.h>
-#include <iomacros.h>
 
 
 //LED on P1.0
@@ -15,12 +18,13 @@
 
 //! Initialize registers and all that jazz.
 void init(){
-  volatile unsigned int i;
   WDTCTL = WDTPW + WDTHOLD;                 // Stop watchdog timer
   
-  //LED and TX OUT
+  //LED out and on.
   PLEDDIR |= PLEDPIN;
+  PLEDOUT |= PLEDPIN;
   
+  //Setup clocks, unique to each '430.
   msp430_init_dco();
   msp430_init_uart();
   
@@ -28,10 +32,12 @@ void init(){
   //eint();
 }
 
+
 //! Handle a command.
 void handle(unsigned char app,
 	    unsigned char verb,
-	    unsigned char len){
+	    unsigned long len){
+  //debugstr("GoodFET");
   switch(app){
   case MONITOR:
     monitorhandle(app,verb,len);
@@ -39,7 +45,10 @@ void handle(unsigned char app,
   case SPI:
     spihandle(app,verb,len);
     break;
-  case I2C:
+  case AVR:
+    avrhandle(app,verb,len);
+    break;
+  case I2CAPP:
     i2chandle(app,verb,len);
     break;
   case CHIPCON:
@@ -48,11 +57,17 @@ void handle(unsigned char app,
   case JTAG:
     jtaghandle(app,verb,len);
     break;
-  case JTAG430:
-    jtag430handle(app,verb,len);
+  case JTAG430: //Also JTAG430X, JTAG430X2
+    jtag430x2handle(app,verb,len);
     break;
   default:
-    txdata(app,NOK,0);
+    if(pluginhandle){
+      pluginhandle(app,verb,len);
+    }else{
+      debugstr("Plugin missing.");
+      txdata(app,NOK,0);
+    }
+      
     break;
   }
 }
@@ -61,13 +76,11 @@ void handle(unsigned char app,
 int main(void)
 {
   volatile unsigned int i;
-  unsigned char app, verb, len;
+  unsigned char app, verb;
+  unsigned long len;
   
   init();
   
-  
-  //Ready
-  //txdata(MONITOR,OK,0);
   txstring(MONITOR,OK,"http://goodfet.sf.net/");
   
   //Command loop.  There's no end!
@@ -75,13 +88,23 @@ int main(void)
     //Magic 3
     app=serial_rx();
     verb=serial_rx();
-    len=serial_rx();
+    //len=serial_rx();
+    len=rxword();
     
-    //Read data, if any
-    for(i=0;i<len;i++){
-      cmddata[i]=serial_rx();
+    //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);
     }
-    handle(app,verb,len);
   }
 }