X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Fchipcon%2Fchipcon.c;h=6c910e725d4b52e87ec106fda3f8ff4282c7002c;hp=1a4846bdf4e28b480d58f29b6ab4847e49f0e693;hb=d9b3b0d57da47a1736a6af0a10b5fa96a03fe6e0;hpb=7d3404539568650baef6a21c85580ea8e3e097aa diff --git a/firmware/apps/chipcon/chipcon.c b/firmware/apps/chipcon/chipcon.c index 1a4846b..6c910e7 100644 --- a/firmware/apps/chipcon/chipcon.c +++ b/firmware/apps/chipcon/chipcon.c @@ -20,11 +20,11 @@ #include -/* Concerning clock rates, - the maximimum clock rates are defined on page 4 of the spec. - They vary, but are roughly 30MHz. Raising this clock rate might - allow for clock glitching, but the GoodFET isn't sufficient fast for that. - Perhaps a 200MHz ARM or an FPGA in the BadassFET? +/* Concerning clock rates, the maximimum clock rates are defined on + page 4 of the spec. They vary, but are roughly 30MHz. Raising + this clock rate might allow for clock glitching, but the GoodFET + isn't sufficient fast for that. Perhaps a 200MHz ARM or an FPGA in + the BadassFET? */ //Pins and I/O @@ -126,20 +126,33 @@ void cchandle(unsigned char app, unsigned char verb, unsigned long len){ //Always init. Might help with buggy lines. - ccdebuginit(); + //Might hurt too. + //ccdebuginit(); + long i; switch(verb){ //CC_PEEK and CC_POKE will come later. + case PEEK: + cmddata[0]=cc_peekirambyte(cmddata[0]); + txdata(app,verb,1); + break; + case POKE: + cmddata[0]=cc_pokeirambyte(cmddata[0],cmddata[1]); + txdata(app,verb,0); + break; case READ: //Write a command and return 1-byte reply. cccmd(len); - ccread(1); + if(cmddata[0]&0x4) + ccread(1); txdata(app,verb,1); + break; case WRITE: //Write a command with no reply. cccmd(len); txdata(app,verb,0); break; case START://enter debugger + ccsetup(); ccdebuginit(); txdata(app,verb,0); break; @@ -172,6 +185,9 @@ void cchandle(unsigned char app, cc_get_pc(); txdata(app,verb,2); break; + case CC_LOCKCHIP: + cc_lockchip(); + //no break, return status case CC_READ_STATUS: cc_read_status(); txdata(app,verb,1); @@ -200,7 +216,7 @@ void cchandle(unsigned char app, txdata(app,NOK,0);//TODO add me break; case CC_GET_CHIP_ID: - cc_get_chip_id(); + cmddataword[0]=cc_get_chip_id(); txdata(app,verb,2); break; @@ -219,15 +235,36 @@ void cchandle(unsigned char app, txdata(app,verb,1); break; case CC_SET_PC: - case CC_CLOCK_INIT: + cc_set_pc(cmddatalong[0]); + txdata(app,verb,0); + break; case CC_WRITE_FLASH_PAGE: + cc_write_flash_page(cmddatalong[0]); + txdata(app,verb,0); + break; + case CC_WIPEFLASHBUFFER: + for(i=0xf000;i<0xf800;i++) + cc_pokedatabyte(i,0xFF); + txdata(app,verb,0); + break; case CC_MASS_ERASE_FLASH: + case CC_CLOCK_INIT: case CC_PROGRAM_FLASH: + debugstr("This Chipcon command is not yet implemented."); txdata(app,NOK,0);//TODO implement me. break; } } +//! Set the Chipcon's Program Counter +void cc_set_pc(u32 adr){ + cmddata[0]=0x02; //SetPC + cmddata[1]=((adr>>8)&0xff); //HIBYTE + cmddata[2]=adr&0xff; //LOBYTE + cc_debug_instr(3); + return; +} + //! Erase all of a Chipcon's memory. void cc_chip_erase(){ cmddata[0]=CCCMD_CHIP_ERASE; //0x14 @@ -241,6 +278,28 @@ void cc_wr_config(unsigned char config){ cccmd(2); ccread(1); } + +//! Locks the chip. +void cc_lockchip(){ + register int i; + + //debugstr("Locking chip."); + cc_wr_config(1);//Select Info Flash + if(!(cc_rd_config()&1)) + debugstr("Config forgotten!"); + + //Clear config page. + for(i=0;i<2048;i++) + cc_pokedatabyte(0xf000+i,0); + cc_write_flash_page(0); + if(cc_peekcodebyte(0)) + debugstr("Failed to clear info flash byte."); + + cc_wr_config(0); + if(cc_rd_config()&1) + debugstr("Stuck in info flash mode!"); +} + //! Read the configuration byte. unsigned char cc_rd_config(){ cmddata[0]=CCCMD_RD_CONFIG; //0x24 @@ -260,18 +319,170 @@ unsigned char cc_read_status(){ //! Read the CHIP ID bytes. unsigned short cc_get_chip_id(){ - unsigned short toret; cmddata[0]=CCCMD_GET_CHIP_ID; //0x68 cccmd(1); ccread(2); + + + //Find the flash word size. + switch(cmddata[0]){ + case 0x01://CC1110 + case 0x81://CC2510 + case 0x91://CC2511 + flash_word_size=0x02; + //debugstr("2 bytes/flash word"); + break; + default: + debugstr("Warning: Guessing flash word size."); + case 0x85://CC2430 + case 0x89://CC2431 + //debugstr("4 bytes/flash word"); + flash_word_size=0x04; + break; + } //Return the word. - toret=cmddata[1]; - toret=(toret<<8)+cmddata[1]; - return toret; + return cmddataword[0]; +} + +//! Populates flash buffer in xdata. +void cc_write_flash_buffer(u8 *data, u16 len){ + cc_write_xdata(0xf000, data, len); +} +//! Populates flash buffer in xdata. +void cc_write_xdata(u16 adr, u8 *data, u16 len){ + u16 i; + for(i=0; i> 8) / FLASH_WORD_SIZE) & 0x7E, + + //0x75, 0xAB, 0x23, //Set FWT per clock + 0x75, 0xAC, 0x00, // MOV FADDRL, #00; + /* Erase page. */ + 0x75, 0xAE, 0x01, // MOV FLC, #01H; // ERASE + // ; Wait for flash erase to complete + 0xE5, 0xAE, // eraseWaitLoop: MOV A, FLC; + 0x20, 0xE7, 0xFB, // JB ACC_BUSY, eraseWaitLoop; + + /* End erase page. */ + // ; Initialize the data pointer + 0x90, 0xF0, 0x00, // MOV DPTR, #0F000H; + // ; Outer loops + 0x7F, HIBYTE_WORDS_PER_FLASH_PAGE, // MOV R7, #imm; + 0x7E, LOBYTE_WORDS_PER_FLASH_PAGE, // MOV R6, #imm; + 0x75, 0xAE, 0x02, // MOV FLC, #02H; // WRITE + // ; Inner loops + //24: + 0x7D, 0xde /*FLASH_WORD_SIZE*/, // writeLoop: MOV R5, #imm; + 0xE0, // writeWordLoop: MOVX A, @DPTR; + 0xA3, // INC DPTR; + 0xF5, 0xAF, // MOV FWDATA, A; + 0xDD, 0xFA, // DJNZ R5, writeWordLoop; + // ; Wait for completion + 0xE5, 0xAE, // writeWaitLoop: MOV A, FLC; + 0x20, 0xE6, 0xFB, // JB ACC_SWBSY, writeWaitLoop; + 0xDE, 0xF1, // DJNZ R6, writeLoop; + 0xDF, 0xEF, // DJNZ R7, writeLoop; + // ; Done, fake a breakpoint + 0xA5 // DB 0xA5; +}; + + +//! Copies flash buffer to flash. +void cc_write_flash_page(u32 adr){ + //Assumes that page has already been written to XDATA 0xF000 + //debugstr("Flashing 2kb at 0xF000 to given adr."); + + if(adr&(MINFLASHPAGE_SIZE-1)){ + debugstr("Flash page address is not on a page boundary. Aborting."); + return; + } + + if(flash_word_size==0){ + debugstr("Flash word size is wrong."); + while(1); + } + + //Routine comes next + //WRITE_XDATA_MEMORY(IN: 0xF000 + FLASH_PAGE_SIZE, sizeof(routine), routine); + cc_write_xdata(0xF000+MAXFLASHPAGE_SIZE, + (u8*) flash_routine, sizeof(flash_routine)); + //Patch routine's third byte with + //((address >> 8) / FLASH_WORD_SIZE) & 0x7E + cc_pokedatabyte(0xF000+MAXFLASHPAGE_SIZE+2, + ((adr>>8)/flash_word_size)&0x7E); + //Patch routine to define FLASH_WORD_SIZE + if(flash_routine[25]!=0xde) + debugstr("Ugly patching code failing in chipcon.c"); + cc_pokedatabyte(0xF000+MAXFLASHPAGE_SIZE+25, + flash_word_size); + + //debugstr("Wrote flash routine."); + + + //MOV MEMCTR, (bank * 16) + 1; + cmddata[0]=0x75; + cmddata[1]=0xc7; + cmddata[2]=0x51; + cc_debug_instr(3); + debugstr("Loaded bank info."); + + cc_set_pc(0xf000+MAXFLASHPAGE_SIZE);//execute code fragment + cc_resume(); + + debugstr("Executing."); + + + while(!(cc_read_status()&CC_STATUS_CPUHALTED)){ + P1OUT^=1;//blink LED while flashing + } + + + debugstr("Done flashing."); + + P1OUT&=~1;//clear LED +} + //! Read the PC unsigned short cc_get_pc(){ cmddata[0]=CCCMD_GET_PC; //0x28 @@ -335,11 +546,11 @@ unsigned char cc_debug(unsigned char len, unsigned char cmd=CCCMD_DEBUG_INSTR+(len&0x3);//0x54+len CCWRITE; cctrans8(cmd); - if(len--) + if(len>0) cctrans8(a); - if(len--) + if(len>1) cctrans8(b); - if(len--) + if(len>2) cctrans8(c); CCREAD; return cctrans8(0x00); @@ -400,21 +611,31 @@ for (n = 0; n < count; n++) { unsigned char cc_peekdatabyte(unsigned int adr){ unsigned char hb=(adr&0xFF00)>>8, - lb=adr&0xFF, - toret; - + lb=adr&0xFF; + //MOV DPTR, adr cc_debug(3, 0x90, hb, lb); //MOVX A, @DPTR //Must be 2, perhaps for clocking? - toret=cc_debug(3, 0xE0, 0, 0); - return toret; - - /* -DEBUG_INSTR(IN: 0x90, HIBYTE(address), LOBYTE(address), OUT: Discard); -for (n = 0; n < count; n++) { - DEBUG_INSTR(IN: 0xE0, OUT: outputArray[n]); - DEBUG_INSTR(IN: 0xA3, OUT: Discard); + return cc_debug(3, 0xE0, 0, 0); } - */ + + +//! Fetch a byte of IRAM. +u8 cc_peekirambyte(u8 adr){ + //CLR A + cc_debug(2, 0xE4, 0, 0); + //MOV A, #iram + return cc_debug(3, 0xE5, adr, 0); +} + +//! Write a byte of IRAM. +u8 cc_pokeirambyte(u8 adr, u8 val){ + //CLR A + cc_debug(2, 0xE4, 0, 0); + //MOV #iram, #val + return cc_debug(3, 0x75, adr, val); + //return cc_debug(3, 0x75, val, adr); } + +