projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MSP430F5xx stuff; 1xx support is probably broken right now.
[goodfet]
/
firmware
/
apps
/
jtag
/
jtag430.c
diff --git
a/firmware/apps/jtag/jtag430.c
b/firmware/apps/jtag/jtag430.c
index
d518ca1
..
4b7e557
100644
(file)
--- a/
firmware/apps/jtag/jtag430.c
+++ b/
firmware/apps/jtag/jtag430.c
@@
-51,6
+51,7
@@
unsigned int jtag430_readmem(unsigned int adr){
CLRTCLK;
jtag_ir_shift8(IR_CNTRL_SIG_16BIT);
CLRTCLK;
jtag_ir_shift8(IR_CNTRL_SIG_16BIT);
+
if(adr>0xFF)
jtag_dr_shift16(0x2409);//word read
else
if(adr>0xFF)
jtag_dr_shift16(0x2409);//word read
else
@@
-81,7
+82,6
@@
void jtag430_writemem(unsigned int adr, unsigned int data){
SETTCLK;
}
SETTCLK;
}
-
//! Write data to flash memory. Must be preconfigured.
void jtag430_writeflashword(unsigned int adr, unsigned int data){
/*
//! Write data to flash memory. Must be preconfigured.
void jtag430_writeflashword(unsigned int adr, unsigned int data){
/*
@@
-191,8
+191,9
@@
void jtag430_eraseflash(unsigned int mode, unsigned int adr, unsigned int count)
void jtag430_resettap(){
int i;
// Settle output
void jtag430_resettap(){
int i;
// Settle output
+ SETTDI; //430X2
SETTMS;
SETTMS;
- SETTDI;
+ //SETTDI; //classic
SETTCK;
// Navigate to reset state.
SETTCK;
// Navigate to reset state.
@@
-211,7
+212,7
@@
void jtag430_resettap(){
/* sacred, by spec.
/* sacred, by spec.
- Sometimes this isn't necessary. */
+ Sometimes this isn't necessary.
*/
// fuse check
CLRTMS;
delay(50);
// fuse check
CLRTMS;
delay(50);
@@
-273,6
+274,7
@@
void oldjtag430handle(unsigned char app,
jtag430_start();
//TAP setup, fuse check
jtag430_resettap();
jtag430_start();
//TAP setup, fuse check
jtag430_resettap();
+
txdata(app,verb,0);
break;
case JTAG430_HALTCPU:
txdata(app,verb,0);
break;
case JTAG430_HALTCPU:
@@
-287,7
+289,6
@@
void oldjtag430handle(unsigned char app,
jtag430_setinstrfetch();
txdata(app,verb,0);
break;
jtag430_setinstrfetch();
txdata(app,verb,0);
break;
-
case JTAG430_READMEM:
case PEEK:
case JTAG430_READMEM:
case PEEK:
@@
-296,8
+297,8
@@
void oldjtag430handle(unsigned char app,
break;
case JTAG430_WRITEMEM:
case POKE:
break;
case JTAG430_WRITEMEM:
case POKE:
- jtag430_writemem(cmddata
word[0],cmddataword[1
]);
- cmddataword[0]=jtag430_readmem(cmddata
word
[0]);
+ jtag430_writemem(cmddata
long[0],cmddataword[2
]);
+ cmddataword[0]=jtag430_readmem(cmddata
long
[0]);
txdata(app,verb,2);
break;
case JTAG430_WRITEFLASH:
txdata(app,verb,2);
break;
case JTAG430_WRITEFLASH: