//! Read data from address
unsigned int jtag430_readmem(unsigned int adr){
unsigned int toret;
+ jtag430_haltcpu();
CLRTCLK;
jtag_ir_shift8(IR_CNTRL_SIG_16BIT);
//Pulse TCLK
jtag430_tclk_flashpulses(35); //35 standard
-
}
//! Configure flash, then write a word.
//FCTL1=0xA500, disabling flash write
jtag430_writemem(0x0128, 0xA500);
- jtag430_releasecpu();
+ //jtag430_releasecpu();
}
//FCTL1=0xA500, disabling flash write
jtag430_writemem(0x0128, 0xA500);
- jtag430_releasecpu();
+ //jtag430_releasecpu();
}
//Perform a reset and disable watchdog.
jtag430_por();
+ jtag430_writemem(0x120,0x5a80);//disable watchdog
+
+ jtag430_haltcpu();
}
//! Set CPU to Instruction Fetch
void jtag430_setinstrfetch(){
+
jtag_ir_shift8(IR_CNTRL_SIG_CAPTURE);
// Wait until instruction fetch state.
//! Handles classic MSP430 JTAG commands. Forwards others to JTAG.
void jtag430handle(unsigned char app,
unsigned char verb,
- unsigned char len){
- register char blocks;
+ unsigned long len){
unsigned long at;
unsigned int i, val;
+ //debugstr("Classic MSP430 handler.");
+
+
+ /* FIXME
+ * Sometimes JTAG doesn't init correctly.
+ * This restarts the connection if the masked-rom
+ * chip ID cannot be read. Should print warning
+ * for testing server.
+ */
+ while((i=jtag430_readmem(0xff0))==0xFFFF){
+ jtag430_start();
+ P1OUT^=1;
+ }
+ P1OUT&=~1;
+
switch(verb){
case START:
//Enter JTAG mode.
case JTAG430_READMEM:
case PEEK:
- /*
- cmddataword[0]=jtag430_readmem(cmddataword[0]);
- txdata(app,verb,2);
- */
- blocks=(len>4?cmddata[4]:1);
at=cmddatalong[0];
- len=0x80;
- serial_tx(app);
- serial_tx(verb);
- serial_tx(len);
+ //Fetch large blocks for bulk fetches,
+ //small blocks for individual peeks.
+ if(len>5)
+ len=(cmddataword[2]);//always even.
+ else
+ len=2;
+ len&=~1;//clue lsbit
- while(blocks--){
- for(i=0;i<len;i+=2){
- jtag430_resettap();
- delay(10);
-
- val=jtag430_readmem(at);
-
- at+=2;
- serial_tx(val&0xFF);
- serial_tx((val&0xFF00)>>8);
- }
+ txhead(app,verb,len);
+ for(i=0;i<len;i+=2){
+ jtag430_resettap();
+ val=jtag430_readmem(at);
+
+ at+=2;
+ serial_tx(val&0xFF);
+ serial_tx((val&0xFF00)>>8);
}
-
-
-
break;
case JTAG430_WRITEMEM:
case POKE:
+ jtag430_haltcpu();
jtag430_writemem(cmddataword[0],cmddataword[2]);
cmddataword[0]=jtag430_readmem(cmddataword[0]);
txdata(app,verb,2);
break;
case JTAG430_WRITEFLASH:
- debugstr("Poking flash memory.");
+ //debugstr("Poking flash memory.");
jtag430_writeflash(cmddataword[0],cmddataword[2]);
+
+ //Try again if failure.
+ if(cmddataword[0]!=jtag430_readmem(cmddataword[0]))
+ jtag430_writeflash(cmddataword[0],cmddataword[2]);
+
+ //Return result.
cmddataword[0]=jtag430_readmem(cmddataword[0]);
+
txdata(app,verb,2);
break;
case JTAG430_ERASEFLASH:
- jtag430_eraseflash(ERASE_MASS,0xFFFE,0xFFFF);
- jtag430_eraseflash(ERASE_MASS,0xFFFE,0xFFFF);
- jtag430_eraseflash(ERASE_MASS,0xFFFE,0xFFFF);
+ jtag430_eraseflash(ERASE_MASS,0xFFFE,0x3000);
txdata(app,verb,0);
break;
case JTAG430_SETPC:
+ jtag430_haltcpu();
jtag430_setpc(cmddataword[0]);
txdata(app,verb,0);
break;
default:
jtaghandle(app,verb,len);
}
- jtag430_resettap();
+ //jtag430_resettap(); //DO NOT UNCOMMENT
}