X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=firmware%2Fgoodfet.c;h=d09683cbda345a1d7267385e6b497b7db0ae0d51;hb=6c9b0c0ee024ae117e2b99698fab53556a25eda1;hp=8cd782eb50350536faf58943d98f869d6bd721f1;hpb=c5a56b2284ba0cd554cb44ed221eb91489607b9e;p=goodfet

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index 8cd782e..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
@@ -17,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();
 }
@@ -41,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:
@@ -50,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;
   }
 }
@@ -67,17 +73,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!