X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fgoodfet.c;h=b9485aa5b87d233347adb8b8bf56b5428314ef66;hp=00dd921ad7e21cca776f35312f9542f54c75d3d0;hb=94fe2500d21c2c329f8a70f654e6fac0faf5730b;hpb=0fb25630e9970a4e6d18e190c484f654490565b0;ds=sidebyside

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index 00dd921..b9485aa 100644
--- a/firmware/goodfet.c
+++ b/firmware/goodfet.c
@@ -1,5 +1,11 @@
-//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"
@@ -26,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);
@@ -37,6 +45,9 @@ void handle(unsigned char app,
   case SPI:
     spihandle(app,verb,len);
     break;
+  case AVR:
+    avrhandle(app,verb,len);
+    break;
   case I2CAPP:
     i2chandle(app,verb,len);
     break;
@@ -50,11 +61,13 @@ void handle(unsigned char app,
     jtag430x2handle(app,verb,len);
     break;
   default:
-    #ifdef HANDLEOTHER
-    HANDLEOTHER(app,verb,len);
-    #else
-    txdata(app,NOK,0);
-    #endif
+    if(pluginhandle){
+      pluginhandle(app,verb,len);
+    }else{
+      debugstr("Plugin missing.");
+      txdata(app,NOK,0);
+    }
+      
     break;
   }
 }
@@ -63,7 +76,8 @@ 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();
   
@@ -74,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);
   }
 }