X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Fjtag%2Fjtag430x2.c;h=1acc6e12051953e7c5f7393d39c293b13e9bea64;hp=5cafafeaddedba6384e32c2299188a1cc3937033;hb=f4a6b415e762bcdc560f3ea655851d16f483ea5a;hpb=dd37f96a4f842ea15233b8d0efd4ec001ad5de9c diff --git a/firmware/apps/jtag/jtag430x2.c b/firmware/apps/jtag/jtag430x2.c index 5cafafe..1acc6e1 100644 --- a/firmware/apps/jtag/jtag430x2.c +++ b/firmware/apps/jtag/jtag430x2.c @@ -1,10 +1,6 @@ /*! \file jtag430x2.c \author Travis Goodspeed - - This is an implementation of the MSP430X2 JTAG protocol - for the GoodFET project at http://goodfet.sf.net/ - - See the license file for details of proper use. + \brief MSP430X2 JTAG (20-bit) */ #include "platform.h" @@ -31,12 +27,12 @@ unsigned char jtag430x2_start(){ //Entry sequence from Page 67 of SLAU265A for 4-wire MSP430 JTAG CLRRST; - delay(10); + delay(10);//10 CLRTST; - delay(5); + delay(5);//5 SETTST; - msdelay(5); + msdelay(5);//5 SETRST; P5DIR&=~RST; @@ -46,91 +42,177 @@ unsigned char jtag430x2_start(){ return jtag430x2_jtagid(); } +//! Grab the core ID. unsigned int jtag430_coreid(){ jtag_ir_shift8(IR_COREIP_ID); return jtag_dr_shift16(0); } +//! Grab the device ID. unsigned long jtag430_deviceid(){ jtag_ir_shift8(IR_DEVICE_ID); return jtag_dr_shift20(0); } -//! Set the program counter. -void jtag430x2_setpc(unsigned long pc){ - //From SLAU265. - - unsigned short Mova; - unsigned short Pc_l; - - Mova = 0x0080; - Mova += (unsigned short)((pc>>8) & 0x00000F00); - Pc_l = (unsigned short)((pc & 0xFFFF)); - // Check Full-Emulation-State at the beginning +//! Write data to address +void jtag430x2_writemem(unsigned long adr, + unsigned int data){ jtag_ir_shift8(IR_CNTRL_SIG_CAPTURE); if(jtag_dr_shift16(0) & 0x0301){ - // MOVA #imm20, PC + CLRTCLK; + jtag_ir_shift8(IR_CNTRL_SIG_16BIT); + if(adr>=0x100) + jtag_dr_shift16(0x0500);//word mode + else + jtag_dr_shift16(0x0510);//byte mode + jtag_ir_shift8(IR_ADDR_16BIT); + jtag_dr_shift20(adr); + + SETTCLK; + + jtag_ir_shift8(IR_DATA_TO_ADDR); + jtag_dr_shift16(data);//16 word + + CLRTCLK; + jtag_ir_shift8(IR_CNTRL_SIG_16BIT); + jtag_dr_shift16(0x0501); + SETTCLK; + + CLRTCLK; + SETTCLK; + //init state + }else{ + while(1) P1OUT^=1; //loop if locked up + } +} + +//! Read data from address +unsigned int jtag430x2_readmem(unsigned long adr){ + unsigned int toret=0; + //unsigned int tries=5; + + while(1){ + do{ + jtag_ir_shift8(IR_CNTRL_SIG_CAPTURE); + }while(!(jtag_dr_shift16(0) & 0x0301)); + + if(jtag_dr_shift16(0) & 0x0301){ + // Read Memory CLRTCLK; - // take over bus control during clock LOW phase - jtag_ir_shift8(IR_DATA_16BIT); - SETTCLK; - jtag_dr_shift16(Mova); jtag_ir_shift8(IR_CNTRL_SIG_16BIT); - jtag_dr_shift16(0x1400); - jtag_ir_shift8(IR_DATA_16BIT); - CLRTCLK; + if(adr>=0x100){ + jtag_dr_shift16(0x0501);//word read + }else{ + jtag_dr_shift16(0x0511);//byte read + } + + jtag_ir_shift8(IR_ADDR_16BIT); + jtag_dr_shift20(adr); //20 + + jtag_ir_shift8(IR_DATA_TO_ADDR); SETTCLK; - jtag_dr_shift16(Pc_l); CLRTCLK; + toret = jtag_dr_shift16(0x0000); + SETTCLK; - jtag_dr_shift16(0x4303); + + //Cycle a bit. CLRTCLK; - jtag_ir_shift8(IR_ADDR_CAPTURE); - jtag_dr_shift20(0x00000); - }else{ - while(1) P1OUT^=1; //Lock LED if locked up. + SETTCLK; + return toret; + } } + //return toret; } +//! Syncs a POR. +unsigned int jtag430x2_syncpor(){ + jtag_ir_shift8(IR_CNTRL_SIG_16BIT); + jtag_dr_shift16(0x1501); //JTAG mode + while(!(jtag_dr_shift16(0) & 0x200)); + return jtag430x2_por(); +} -//! Read data from address -unsigned int jtag430x2_readmem(unsigned int adr){ - unsigned int toret; +//! Executes an MSP430X2 POR +unsigned int jtag430x2_por(){ + unsigned int i = 0; - jtag430x2_setpc(adr); + // tick + CLRTCLK; SETTCLK; + jtag_ir_shift8(IR_CNTRL_SIG_16BIT); + jtag_dr_shift16(0x0C01); + jtag_dr_shift16(0x0401); + + //cycle + for (i = 0; i < 10; i++){ + CLRTCLK; + SETTCLK; + } + jtag_dr_shift16(0x0501); - jtag_ir_shift8(IR_ADDR_CAPTURE); - - jtag_ir_shift8(IR_DATA_QUICK); - - SETTCLK; + + // tick CLRTCLK; - toret = jtag_dr_shift16(0);//read - + SETTCLK; + + + // Disable WDT + jtag430x2_writemem(0x015C, 0x5A80); + + // check state jtag_ir_shift8(IR_CNTRL_SIG_CAPTURE); + if(jtag_dr_shift16(0) & 0x0301) + return(1);//ok - return toret; + return 0;//error +} + + +//! Check the fuse. +unsigned int jtag430x2_fusecheck(){ + int i; + for(i=0;i<3;i++){ + jtag_ir_shift8(IR_CNTRL_SIG_CAPTURE); + if(jtag_dr_shift16(0xAAAA)==0x5555) + return 1;//blown + } + return 0;//unblown } -//! Handles classic MSP430 JTAG commands. Forwards others to JTAG. +//! Handles MSP430X2 JTAG commands. Forwards others to JTAG. void jtag430x2handle(unsigned char app, - unsigned char verb, - unsigned char len){ + unsigned char verb, + unsigned long len){ + register char blocks; + + unsigned int i,val; + unsigned long at; + + //jtag430_resettap(); + + if(verb!=START && jtag430mode==MSP430MODE){ + jtag430handle(app,verb,len); + return; + } switch(verb){ case START: //Enter JTAG mode. - do cmddata[0]=jtag430x2_start(); - while(cmddata[0]==00 || cmddata[0]==0xFF); + //do + cmddata[0]=jtag430x2_start(); + //while(cmddata[0]==00 || cmddata[0]==0xFF); //MSP430 or MSP430X if(jtagid==MSP430JTAGID){ jtag430mode=MSP430MODE; drwidth=16; + jtag430_resettap(); + txdata(app,verb,1); + return; }else if(jtagid==MSP430X2JTAGID){ jtag430mode=MSP430X2MODE; drwidth=20; @@ -139,15 +221,35 @@ void jtag430x2handle(unsigned char app, return; } - //TAP setup, fuse check - //jtag430_resettap(); + jtag430x2_fusecheck(); + + jtag430x2_syncpor(); + + jtag430_resettap(); + txdata(app,verb,1); break; case JTAG430_READMEM: case PEEK: - cmddataword[0]=jtag430x2_readmem(cmddataword[0]); - //cmddataword[0]=jtag430_readmem(cmddataword[0]); - txdata(app,verb,2); + blocks=(len>4?cmddata[4]:1); + at=cmddatalong[0]; + + len=0x80; + txhead(app,verb,len); + + while(blocks--){ + for(i=0;i>8); + } + } + break; case JTAG430_COREIP_ID: cmddataword[0]=jtag430_coreid(); @@ -157,14 +259,24 @@ void jtag430x2handle(unsigned char app, cmddatalong[0]=jtag430_deviceid(); txdata(app,verb,4); break; - case JTAG430_HALTCPU: - case JTAG430_RELEASECPU: - case JTAG430_SETINSTRFETCH: + case JTAG430_WRITEMEM: case POKE: + jtag430x2_writemem(cmddatalong[0], + cmddataword[2]); + cmddataword[0]=jtag430x2_readmem(cmddatalong[0]); + txdata(app,verb,2); + break; + + //unimplemented functions + case JTAG430_HALTCPU: + case JTAG430_RELEASECPU: + case JTAG430_SETINSTRFETCH: case JTAG430_WRITEFLASH: case JTAG430_ERASEFLASH: case JTAG430_SETPC: + txdata(app,NOK,0); + break; default: jtaghandle(app,verb,len); }