#include "platform.h"
#include "command.h"
-#include "jtag.h"
+#include "jtag430.h"
unsigned char jtagid;
SETTCLK;
//init state
}else{
- while(1) P1OUT^=1; //loop if locked up
+ while(1) PLEDOUT^=PLEDPIN; //loop if locked up
}
}
//unsigned int tries=5;
while(1){
- do{
- jtag_ir_shift8(IR_CNTRL_SIG_CAPTURE);
- }while(!(jtag_dr_shift16(0) & 0x0301));
+ //do{
+ jtag_ir_shift8(IR_CNTRL_SIG_CAPTURE);
+ //}while(!(jtag_dr_shift16(0) & 0x0301));
if(jtag_dr_shift16(0) & 0x0301){
// Read Memory
CLRTCLK;
jtag_ir_shift8(IR_CNTRL_SIG_16BIT);
- if(adr>=0x100){
- jtag_dr_shift16(0x0501);//word read
- }else{
- jtag_dr_shift16(0x0511);//byte read
- }
+
+ //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
//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();
cmddatalong[0]=jtag430_deviceid();
txdata(app,verb,4);
break;
-
+ case JTAG430_WRITEFLASH:
case JTAG430_WRITEMEM:
case POKE:
jtag430x2_writemem(cmddatalong[0],
case JTAG430_HALTCPU:
case JTAG430_RELEASECPU:
case JTAG430_SETINSTRFETCH:
- case JTAG430_WRITEFLASH:
+
case JTAG430_ERASEFLASH:
case JTAG430_SETPC:
+ debugstr("This function is not yet implemented for MSP430X2.");
+ debughex(verb);
txdata(app,NOK,0);
break;
default: