X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fgoodfet.c;h=90e4d0fd7eb5479bab725939f0c4a3324fb2fa97;hp=6a79c16815496ac951a2c754dfdc17bb837f3a3e;hb=8c97f896b9cf1b9b6ddf25420c9d9f04516ddd11;hpb=a3d7a436f4ce838f5504204fa5d36f48e389833c diff --git a/firmware/goodfet.c b/firmware/goodfet.c index 6a79c16..90e4d0f 100644 --- a/firmware/goodfet.c +++ b/firmware/goodfet.c @@ -12,109 +12,64 @@ #include "apps.h" #include "glitch.h" +#if (platform == tilaunchpad) +#include +jmp_buf warmstart; +void coldstart(); +#include "msp430_serial.h" +#endif + #define RESET 0x80 // not a real app -- causes firmware to reset #define DEBUGAPP 0xFF -//! Initialize registers and all that jazz. -void init() -{ -#ifdef DAC12IR - int i; +//! General init function, calls platform-specific one. +void init(){ +#ifdef MSP430 + #define INITCHIP msp430_init(); #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(); - 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 +#ifdef ARDUINO + #define INITCHIP arduino_init(); #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 +#if (platform == donbfet) +# define INITCHIP donbfet_init(); +#endif + +#ifdef INITCHIP +INITCHIP +#else +#warning "No init() routine for this platform!" +#endif + +#ifdef INITPLATFORM + INITPLATFORM +#endif } + //! Handle a command. void handle(uint8_t const app, uint8_t const verb, uint32_t const len){ int i; - + //debugstr("GoodFET"); - PLEDOUT&=~PLEDPIN; - + //led_off(); + // 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; } } - // if we get here, then the desired app is not copiled in + // if we get here, then the desired app is not compiled into // this firmware debugstr("App missing."); debughex(app); @@ -129,11 +84,35 @@ int main(void){ unsigned long len; // MSP reboot count for reset input & reboot function located at 0xFFFE volatile unsigned int reset_count = 0; - void (*reboot_function)(void) = (void *) 0xFFFE; +#if (platform == tilaunchpad) + int ret=0; + //ret = setjmp(warmstart);// needs to be here since context from init() would be gone + warmstart: + if (ret == 0) { + coldstart(); // basic hardware setup, clock to TUSB3410, and enable + } else if (ret == 2) { + dputs("\nalmost BSL only one RTS change\n"); + } else if (ret > 2) { // reset released after more than two tst transisitions + // We could write a BSL, a nice exercise for a Sunday afternoon. + dputs("\nBSL\n"); + //call_BSL(); // once you are done uncomment ;-) + } else { // we come here after DTR high (release reset) + dputs("\nWarmstart\n"); + } +#endif + +#if (platform == donbfet) + extern void donbfet_reboot(void); + void (*reboot_function)(void) = donbfet_reboot; +#else + void (*reboot_function)(void) = (void *) 0xFFFE; +#endif init(); txstring(MONITOR,OK,"http://goodfet.sf.net/"); + //txstring(0xab,0xcd,"http://goodfet.sf.net/"); + //Command loop. There's no end! while(1){ @@ -143,7 +122,7 @@ int main(void){ // 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; @@ -151,29 +130,30 @@ int main(void){ // WDTCTL = WDTPW + WDTCNTCL + WDTSSEL + 0x00; // but instead we'll jump to our reboot function pointer (*reboot_function)(); + debugstr("Rebooting not supported on this platform."); } - + continue; - }else{ + }else { reset_count = 0; } - + verb = serial_rx(); - //len=serial_rx(); len = rxword(); - - //Read data, looking for buffer overflow.y + + //Read data, looking for buffer overflow. if(len <= CMDDATALEN){ - for(i = 0; i < len; i++){ - cmddata[i] = serial_rx(); - } - + for(i = 0; i < len; i++) + { + cmddata[i] = serial_rx(); + } + handle(app,verb,len); - }else{ + }else { //Listen to the blaberring. for(i = 0; i < len; i++) serial_rx(); - + //Reply with an error. debugstr("Buffer length exceeded."); txdata(MONITOR,NOK,0);