X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fgoodfet.c;h=b8d9e3dbe7940936065d98a0c4bb9b4ccbe5c7ff;hp=97b40c23f1ed8465610cd47554ea068d4ae985c8;hb=ea94279f763800d71e86d9bb25d140bf78dfb4ea;hpb=a2c8cdf4174097b1045f64c8c03673cd0b2a6ebc

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index 97b40c2..b8d9e3d 100644
--- a/firmware/goodfet.c
+++ b/firmware/goodfet.c
@@ -15,12 +15,40 @@
 
 //! Initialize registers and all that jazz.
 void init(){
+  #ifdef DAC12IR
   int i;
+  #endif
+  
   WDTCTL = WDTPW + WDTHOLD;                 // Stop watchdog timer
   
   //LED out and on.
   PLEDDIR |= PLEDPIN;
   PLEDOUT &= ~PLEDPIN;
+
+
+  /* P5.0 out and low; this is chosen for the PIC app (in which P5.0
+	 is !MCLR) to ensure that an attached PIC chip, if present, is
+	 immediately driven to reset state. A brief explanation of why this
+	 is important follows.
+
+   At least dsPIC33F and PIC24H --and very likely other 16-bit PIC
+   families-- draw a large amount of current when running, especially
+   when using a fast clock: from 60 mA up to approx. 90 mA.  If the
+   PIC target begins to run before the client can request a new ICSP
+   session, which requires much less current (e.g., less than 2 mA),
+   then the MSP430 chip on the GoodFET will fail to start and the FTDI
+   may have trouble communicating with the client.  The latter likely
+   relates to the FTDI on-chip 3V3 regulator being specified up to
+   only 50 mA. */
+  
+  
+  //P5REN &= ~BIT0; //DO NOT UNCOMMENT.  Breaks GF1x support.
+  
+  //This will have to be cut soon.  Use pulling resistors instead.
+  /*
+  P5DIR |= BIT0;
+  P5OUT &= ~BIT0;
+  */
   
   //Setup clocks, unique to each '430.
   msp430_init_dco();
@@ -61,7 +89,7 @@ void handle(unsigned char app,
 	    unsigned char verb,
 	    unsigned long len){
   //debugstr("GoodFET");
-  P1OUT&=~1;
+  PLEDOUT&=~PLEDPIN;
   switch(app){
   case GLITCH:
     glitchhandle(app,verb,len);
@@ -72,14 +100,19 @@ void handle(unsigned char app,
   case SPI:
     spihandle(app,verb,len);
     break;
+  case NRF:
+    nrfhandle(app,verb,len);
+    break;
+  case CCSPI:
+    ccspihandle(app,verb,len);
+    break;
   case AVR:
     avrhandle(app,verb,len);
     break;
-#ifdef INSTALL_PIC_APP
   case PIC:
     pichandle(app,verb,len);
     break;
-#endif
+
   case I2CAPP:
     i2chandle(app,verb,len);
     break;
@@ -93,7 +126,9 @@ void handle(unsigned char app,
     ejtaghandle(app,verb,len);
     break;
   case JTAG430: //Also JTAG430X, JTAG430X2
+    //Revert this when X2 support returns.
     jtag430x2handle(app,verb,len);
+    //jtag430handle(app,verb,len);
     break;
   case SMARTCARD:
     smartcardhandle(app,verb,len);