X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fgoodfet.c;h=6a79c16815496ac951a2c754dfdc17bb837f3a3e;hp=97b40c23f1ed8465610cd47554ea068d4ae985c8;hb=a3d7a436f4ce838f5504204fa5d36f48e389833c;hpb=a2c8cdf4174097b1045f64c8c03673cd0b2a6ebc diff --git a/firmware/goodfet.c b/firmware/goodfet.c index 97b40c2..6a79c16 100644 --- a/firmware/goodfet.c +++ b/firmware/goodfet.c @@ -12,110 +12,118 @@ #include "apps.h" #include "glitch.h" +#define RESET 0x80 // not a real app -- causes firmware to reset +#define DEBUGAPP 0xFF //! Initialize registers and all that jazz. -void init(){ - int i; - WDTCTL = WDTPW + WDTHOLD; // Stop watchdog timer - - //LED out and on. - PLEDDIR |= PLEDPIN; - PLEDOUT &= ~PLEDPIN; - - //Setup clocks, unique to each '430. - msp430_init_dco(); - msp430_init_uart(); - - //DAC should be at full voltage if it exists. +void init() +{ #ifdef DAC12IR - //glitchvoltages(0xfff,0xfff); - ADC12CTL0 = REF2_5V + REFON; // Internal 2.5V ref on - for(i=0;i!=0xFFFF;i++) asm("nop"); - DAC12_0CTL = DAC12IR + DAC12AMP_5 + DAC12ENC; // Int ref gain 1 - DAC12_0DAT = 0xFFF; //Max voltage 0xfff - DAC12_1CTL = DAC12IR + DAC12AMP_5 + DAC12ENC; // Int ref gain 1 - DAC12_1DAT = 0x000; //Min voltage 0x000 + int i; #endif - - /** FIXME - - This part is really ugly. GSEL (P5.7) must be high to select - normal voltage, but a lot of applications light to swing it low - to be a nuissance. To get around this, we assume that anyone - with a glitching FET will also have a DAC, then we set that DAC - to a high voltage. - - At some point, each target must be sanitized to show that it - doesn't clear P5OUT or P5DIR. - */ - P5DIR|=BIT7; P5OUT=BIT7; //Normal Supply - //P5DIR&=~BIT7; //Glitch Supply - - //Enable Interrupts. - //eint(); + + 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(); + msp430_init_uart(); + + + //DAC should be at full voltage if it exists. +#ifdef DAC12IR + //glitchvoltages(0xfff,0xfff); + ADC12CTL0 = REF2_5V + REFON; // Internal 2.5V ref on + //for(i=0;i!=0xFFFF;i++) asm("nop"); //DO NOT UNCOMMENT, break GCC4. + DAC12_0CTL = DAC12IR + DAC12AMP_5 + DAC12ENC; // Int ref gain 1 + DAC12_0DAT = 0xFFF; //Max voltage 0xfff + DAC12_1CTL = DAC12IR + DAC12AMP_5 + DAC12ENC; // Int ref gain 1 + DAC12_1DAT = 0x000; //Min voltage 0x000 +#endif + + /** FIXME + + This part is really ugly. GSEL (P5.7) must be high to select + normal voltage, but a lot of applications like to swing it low + to be a nuissance. To get around this, we assume that anyone + with a glitching FET will also have a DAC, then we set that DAC + to a high voltage. + + At some point, each target must be sanitized to show that it + doesn't clear P5OUT or P5DIR. + */ + P5DIR|=BIT7; P5OUT=BIT7; //Normal Supply + //P5DIR&=~BIT7; //Glitch Supply + + //Enable Interrupts. + //eint(); + + + + #ifdef INITPLATFORM + INITPLATFORM; + #endif } //! Handle a command. -void handle(unsigned char app, - unsigned char verb, - unsigned long len){ +void handle(uint8_t const app, + uint8_t const verb, + uint32_t const len){ + int i; + //debugstr("GoodFET"); - P1OUT&=~1; - switch(app){ - case GLITCH: - glitchhandle(app,verb,len); - break; - case MONITOR: - monitorhandle(app,verb,len); - break; - case SPI: - spihandle(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; - case CHIPCON: - cchandle(app,verb,len); - break; - case JTAG: - jtaghandle(app,verb,len); - break; - case EJTAG: - ejtaghandle(app,verb,len); - break; - case JTAG430: //Also JTAG430X, JTAG430X2 - jtag430x2handle(app,verb,len); - break; - case SMARTCARD: - smartcardhandle(app,verb,len); - break; - case JTAGARM7TDMI: - jtagarm7tdmihandle(app,verb,len); - break; - default: - if(pluginhandle){ - pluginhandle(app,verb,len); - }else{ - debugstr("Plugin missing."); - debughex(app); - txdata(app,NOK,0); + PLEDOUT&=~PLEDPIN; + + // find the app and call the handle fn + for(i = 0; i < num_apps; i++){ + if(apps[i]->app == app){ + // call the app's handle fn + (*(apps[i]->handle))(app, verb, len); + + // exit early + return; } - break; } + + // if we get here, then the desired app is not copiled in + // this firmware + debugstr("App missing."); + debughex(app); + txdata(app, NOK, 0); } + //! Main loop. -int main(void) -{ +int main(void){ volatile unsigned int i; unsigned char app, verb; unsigned long len; @@ -127,17 +135,16 @@ int main(void) txstring(MONITOR,OK,"http://goodfet.sf.net/"); - //Command loop. There's no end! while(1){ //Magic 3 - app=serial_rx(); + app = serial_rx(); // If the app is the reset byte (0x80) increment and loop - if (app == RESET) { + if (app == RESET){ reset_count++; - - if (reset_count > 4) { + + if (reset_count > 4){ // We could trigger the WDT with either: // WDTCTL = 0; // or @@ -147,24 +154,26 @@ int main(void) } continue; - } else { + }else{ reset_count = 0; } - - verb=serial_rx(); + + verb = serial_rx(); //len=serial_rx(); - len=rxword(); + len = rxword(); //Read data, looking for buffer overflow.y - if(len<=CMDDATALEN){ - for(i=0;i