projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MSP430X2 support is sufficient to read memory!
[goodfet]
/
firmware
/
apps
/
jtag
/
jtag.c
diff --git
a/firmware/apps/jtag/jtag.c
b/firmware/apps/jtag/jtag.c
index
4dc7021
..
af420c7
100644
(file)
--- a/
firmware/apps/jtag/jtag.c
+++ b/
firmware/apps/jtag/jtag.c
@@
-55,11
+55,19
@@
unsigned char jtagtrans8(unsigned char byte){
unsigned long jtagtransn(unsigned long word,
unsigned int bitcount){
unsigned int bit;
unsigned long jtagtransn(unsigned long word,
unsigned int bitcount){
unsigned int bit;
+ //0x8000
+ unsigned long high;
+
+ if(bitcount==20)
+ high=0x80000;
+ if(bitcount==16)
+ high= 0x8000;
+
SAVETCLK;
for (bit = 0; bit < bitcount; bit++) {
/* write MOSI on trailing edge of previous clock */
SAVETCLK;
for (bit = 0; bit < bitcount; bit++) {
/* write MOSI on trailing edge of previous clock */
- if (word &
0x8000
)
+ if (word &
high
)
{SETMOSI;}
else
{CLRMOSI;}
{SETMOSI;}
else
{CLRMOSI;}
@@
-73,6
+81,11
@@
unsigned long jtagtransn(unsigned long word,
/* read MISO on trailing edge */
word |= READMISO;
}
/* read MISO on trailing edge */
word |= READMISO;
}
+
+ if(bitcount==20){
+ word = ((word << 16) | (word >> 4)) & 0x000FFFFF;
+ }
+
RESTORETCLK;
// exit state
RESTORETCLK;
// exit state
@@
-129,7
+142,7
@@
void jtag_stop(){
unsigned int drwidth=20;
//! Shift all bits of the DR.
unsigned int drwidth=20;
//! Shift all bits of the DR.
-unsigned long jtag_dr_shift(unsigned long in){
+unsigned long jtag_dr_shift
20
(unsigned long in){
// idle
SETTMS;
CLRTCK;
// idle
SETTMS;
CLRTCK;
@@
-143,14
+156,26
@@
unsigned long jtag_dr_shift(unsigned long in){
SETTCK;
// shift DR, then idle
SETTCK;
// shift DR, then idle
- return(jtagtransn(in,
drwidth
));
+ return(jtagtransn(in,
20
));
}
//! Shift 16 bits of the DR.
unsigned int jtag_dr_shift16(unsigned int in){
}
//! Shift 16 bits of the DR.
unsigned int jtag_dr_shift16(unsigned int in){
- //This name is deprecated, kept around to find 16-bit dependent code.
- return jtag_dr_shift(in);
+ // idle
+ SETTMS;
+ CLRTCK;
+ SETTCK;
+ // select DR
+ CLRTMS;
+ CLRTCK;
+ SETTCK;
+ // capture IR
+ CLRTCK;
+ SETTCK;
+
+ // shift DR, then idle
+ return(jtagtransn(in,16));
}
}