X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=firmware%2Fapps%2Fjtag%2Fjtag430.c;h=20055f20d5fc246dfeae7763bb93163b8d29d890;hb=80cbeb3628a63704eed9244ee3d6172182dc106f;hp=95e91a6b59434230574e963c5eb0d386a43b1b81;hpb=8c1f892f78632617a581869ad1483f7444769c2d;p=goodfet diff --git a/firmware/apps/jtag/jtag430.c b/firmware/apps/jtag/jtag430.c index 95e91a6..20055f2 100644 --- a/firmware/apps/jtag/jtag430.c +++ b/firmware/apps/jtag/jtag430.c @@ -70,7 +70,7 @@ unsigned int jtag430_readmem(unsigned int adr){ else jtag_dr_shift16(0x2419);//byte read jtag_ir_shift8(IR_ADDR_16BIT); - jtag_dr_shift16(adr);//address + jtag_dr_shiftadr(adr);//address jtag_ir_shift8(IR_DATA_TO_ADDR); SETTCLK; @@ -89,7 +89,7 @@ void jtag430_writemem(unsigned int adr, unsigned int data){ else jtag_dr_shift16(0x2418);//byte write jtag_ir_shift8(IR_ADDR_16BIT); - jtag_dr_shift16(adr); + jtag_dr_shiftadr(adr); jtag_ir_shift8(IR_DATA_TO_ADDR); jtag_dr_shift16(data); SETTCLK; @@ -102,7 +102,7 @@ void jtag430_writeflashword(unsigned int adr, unsigned int data){ jtag_ir_shift8(IR_CNTRL_SIG_16BIT); jtag_dr_shift16(0x2408);//word write jtag_ir_shift8(IR_ADDR_16BIT); - jtag_dr_shift16(adr); + jtag_dr_shiftadr(adr); jtag_ir_shift8(IR_DATA_TO_ADDR); jtag_dr_shift16(data); SETTCLK; @@ -245,6 +245,7 @@ void jtag430_start(){ SETRST; delay(0xFFFF); + #ifndef SBWREWRITE //Entry sequence from Page 67 of SLAU265A for 4-wire MSP430 JTAG CLRRST; @@ -265,7 +266,7 @@ void jtag430_start(){ jtag430_haltcpu(); } -//! Start normally, not JTAG. +//! Stop JTAG. void jtag430_stop(){ debugstr("Exiting JTAG."); jtagsetup();