X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fgoodfet.c;h=0d78ea3eda5fe040dcd86a2f3382b4b47ebc08a2;hp=39c87532710e4f4b97014742b44f208cd28bbb86;hb=dd259c9289deb11e84be93647c144192e5ba10b6;hpb=23875462d82ae4a5b55c4e966e23d5196657378c

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index 39c8753..0d78ea3 100644
--- a/firmware/goodfet.c
+++ b/firmware/goodfet.c
@@ -15,12 +15,34 @@
 
 //! 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. */
+	P5DIR |= BIT0;
+	P5REN &= ~BIT0;
+	P5OUT &= ~BIT0;
   
   //Setup clocks, unique to each '430.
   msp430_init_dco();
@@ -72,14 +94,16 @@ void handle(unsigned char app,
   case SPI:
     spihandle(app,verb,len);
     break;
+  case NRF:
+    nrfhandle(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 +117,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);
@@ -124,7 +150,7 @@ int main(void)
   void (*reboot_function)(void) = (void *) 0xFFFE;
   
   init();
-
+  
   txstring(MONITOR,OK,"http://goodfet.sf.net/");
   
   
@@ -132,25 +158,25 @@ int main(void)
   while(1){
     //Magic 3
     app=serial_rx();
+    
+    // If the app is the reset byte (0x80) increment and loop
+    if (app == RESET) {
+      reset_count++;
 
-	// If the app is the reset byte (0x80) increment and loop
-	if (app == RESET) {
-		reset_count++;
-
-		if (reset_count > 4) {
-			// We could trigger the WDT with either:
-			// WDTCTL = 0;
-			// or
-			// WDTCTL = WDTPW + WDTCNTCL + WDTSSEL + 0x00;
-			// but instead we'll jump to our reboot function pointer
-			(*reboot_function)();
-		}
-
-		continue;
-	} else {
-		reset_count = 0;
-	}
-
+      if (reset_count > 4) {
+	// We could trigger the WDT with either:
+	// WDTCTL = 0;
+	// or
+	// WDTCTL = WDTPW + WDTCNTCL + WDTSSEL + 0x00;
+	// but instead we'll jump to our reboot function pointer
+	(*reboot_function)();
+      }
+      
+      continue;
+    } else {
+      reset_count = 0;
+    }
+    
     verb=serial_rx();
     //len=serial_rx();
     len=rxword();