/*! \file jtag430x2.c
\author Travis Goodspeed <travis at radiantmachines.com>
-
- 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"
//Entry sequence from Page 67 of SLAU265A for 4-wire MSP430 JTAG
CLRRST;
- delay(10);
+ delay(20);//10
CLRTST;
- delay(5);
+ delay(10);//5
SETTST;
- msdelay(5);
+ msdelay(10);//5
SETRST;
P5DIR&=~RST;
SETTCLK;
//init state
}else{
- while(1) P1OUT^=1; //loop if locked up
+ while(1) PLEDOUT^=PLEDPIN; //loop if locked up
}
}
//! Read data from address
unsigned int jtag430x2_readmem(unsigned long adr){
unsigned int toret=0;
- unsigned int tries=5;
+ //unsigned int tries=5;
while(1){
do{
//! Handles MSP430X2 JTAG commands. Forwards others to JTAG.
void jtag430x2handle(unsigned char app,
unsigned char verb,
- unsigned char len){
+ unsigned long len){
register char blocks;
unsigned int i,val;
//jtag430_resettap();
+ if(verb!=START && jtag430mode==MSP430MODE){
+ jtag430handle(app,verb,len);
+ return;
+ }
+
switch(verb){
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;
}else if(jtagid==MSP430X2JTAGID){
jtag430mode=MSP430X2MODE;
drwidth=20;
}else{
+ debugstr("JTAG version unknown.");
txdata(app,NOK,1);
return;
}
blocks=(len>4?cmddata[4]:1);
at=cmddatalong[0];
- /*
- cmddataword[0]=jtag430x2_readmem(at);
- txdata(app,verb,2);
- break;
- */
-
len=0x80;
- serial_tx(app);
- serial_tx(verb);
- serial_tx(len);
+ txhead(app,verb,len);
while(blocks--){
for(i=0;i<len;i+=2){