X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fgoodfet.c;h=c310c0c8e2dfbd54c9eaaf3bb6d3c31c3c4f8de3;hp=8ce61087de417c42ae3c6c7b029dad5c09f05647;hb=fa5713a93ff59ebdd126f5b7914a96b5030b32fb;hpb=9fff819ee3088834ef10c050bcdc0bc5f93dcd2a

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index 8ce6108..c310c0c 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"
@@ -14,15 +20,14 @@
 void init(){
   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();
   
-  
-  
-  
   //Enable Interrupts.
   //eint();
 }
@@ -31,6 +36,7 @@ void init(){
 void handle(unsigned char app,
 	    unsigned char verb,
 	    unsigned char len){
+  //debugstr("GoodFET");
   switch(app){
   case MONITOR:
     monitorhandle(app,verb,len);
@@ -38,7 +44,7 @@ void handle(unsigned char app,
   case SPI:
     spihandle(app,verb,len);
     break;
-  case I2C:
+  case I2CAPP:
     i2chandle(app,verb,len);
     break;
   case CHIPCON:
@@ -47,11 +53,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;
   }
 }
@@ -64,19 +74,6 @@ int main(void)
   
   init();
   
-  
-  //Ready
-  //txdata(MONITOR,OK,0);
-  //while (1){
-  //  txdata(0xFF,0xff,0x0);
-  //  delay(1000);
-  //}
-  //delay(0xffff);
-  //while(*((int*)0x1001));
-  
-  //while(1)
-  //  txdata(0xFF,0xFF,0);
-  
   txstring(MONITOR,OK,"http://goodfet.sf.net/");
   
   //Command loop.  There's no end!