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

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index d993167..d09683c 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();
   
@@ -39,7 +43,7 @@ void handle(unsigned char app,
   case SPI:
     spihandle(app,verb,len);
     break;
-  case I2C:
+  case I2CAPP:
     i2chandle(app,verb,len);
     break;
   case CHIPCON:
@@ -48,11 +52,15 @@ 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:
+    #ifdef HANDLEOTHER
+    HANDLEOTHER(app,verb,len);
+    #else
     txdata(app,NOK,0);
+    #endif
     break;
   }
 }
@@ -65,9 +73,6 @@ int main(void)
   
   init();
   
-  
-  //Ready
-  //txdata(MONITOR,OK,0);
   txstring(MONITOR,OK,"http://goodfet.sf.net/");
   
   //Command loop.  There's no end!