//Entry sequence from Page 67 of SLAU265A for 4-wire MSP430 JTAG
CLRRST;
- delay(10);//10
+ delay(20);//10
CLRTST;
- delay(5);//5
+ delay(10);//5
SETTST;
- msdelay(5);//5
+ msdelay(10);//5
SETRST;
P5DIR&=~RST;
case START:
//Enter JTAG mode.
//do
- cmddata[0]=jtag430x2_start();
+ cmddata[0]=jtag430x2_start();
//while(cmddata[0]==00 || cmddata[0]==0xFF);
//MSP430 or MSP430X
if(jtagid==MSP430JTAGID){
jtag430mode=MSP430MODE;
- drwidth=16;
+
+ /* So the way this works is that a width of 20 does some
+ backward-compatibility finagling, causing the correct value
+ to be exchanged for addresses on 16-bit chips as well as the
+ new MSP430X chips. (This has only been verified on the
+ MSP430F2xx family. TODO verify for others.)
+ */
+
+ drwidth=20;
+
+ //Perform a reset and disable watchdog.
+ jtag430_por();
+ jtag430_writemem(0x120,0x5a80);//disable watchdog
+
+ jtag430_haltcpu();
+
jtag430_resettap();
txdata(app,verb,1);
return;
jtag430mode=MSP430X2MODE;
drwidth=20;
}else{
+ debugstr("JTAG version unknown.");
txdata(app,NOK,1);
return;
}