X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fgoodfet.c;h=a6ccae401655cf1666792487691ca6ca1f946c1a;hp=0d78ea3eda5fe040dcd86a2f3382b4b47ebc08a2;hb=77720e2680a4cda7305339510616cd707df423ba;hpb=b8a16dae1040606e2c6bddb922dd21c28e8fcc52

diff --git a/firmware/goodfet.c b/firmware/goodfet.c
index 0d78ea3..a6ccae4 100644
--- a/firmware/goodfet.c
+++ b/firmware/goodfet.c
@@ -40,14 +40,20 @@ void init(){
    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;
+  
+  
+  //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();
   msp430_init_uart();
-  
+
   //DAC should be at full voltage if it exists.
 #ifdef DAC12IR
   //glitchvoltages(0xfff,0xfff);
@@ -83,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);
@@ -97,13 +103,18 @@ void handle(unsigned char app,
   case NRF:
     nrfhandle(app,verb,len);
     break;
+  case CCSPI:
+    ccspihandle(app,verb,len);
+    break;
   case AVR:
     avrhandle(app,verb,len);
     break;
   case PIC:
     pichandle(app,verb,len);
     break;
-
+	case ADC10:
+		adchandle(app,verb,len);
+		break;
   case I2CAPP:
     i2chandle(app,verb,len);
     break;