projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dropped ugly 'blocks' kludge for a 16-bit length field.
[goodfet]
/
firmware
/
apps
/
jtag
/
jtag430x2.c
diff --git
a/firmware/apps/jtag/jtag430x2.c
b/firmware/apps/jtag/jtag430x2.c
index
b508f0b
..
1acc6e1
100644
(file)
--- a/
firmware/apps/jtag/jtag430x2.c
+++ b/
firmware/apps/jtag/jtag430x2.c
@@
-1,10
+1,6
@@
/*! \file jtag430x2.c
\author Travis Goodspeed <travis at radiantmachines.com>
/*! \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"
*/
#include "platform.h"
@@
-31,12
+27,12
@@
unsigned char jtag430x2_start(){
//Entry sequence from Page 67 of SLAU265A for 4-wire MSP430 JTAG
CLRRST;
//Entry sequence from Page 67 of SLAU265A for 4-wire MSP430 JTAG
CLRRST;
- delay(10);
+ delay(10);
//10
CLRTST;
CLRTST;
- delay(5);
+ delay(5);
//5
SETTST;
SETTST;
- msdelay(5);
+ msdelay(5);
//5
SETRST;
P5DIR&=~RST;
SETRST;
P5DIR&=~RST;
@@
-94,7
+90,7
@@
void jtag430x2_writemem(unsigned long adr,
//! Read data from address
unsigned int jtag430x2_readmem(unsigned long adr){
unsigned int toret=0;
//! 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{
while(1){
do{
@@
-190,7
+186,7
@@
unsigned int jtag430x2_fusecheck(){
//! Handles MSP430X2 JTAG commands. Forwards others to JTAG.
void jtag430x2handle(unsigned char app,
unsigned char verb,
//! 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;
register char blocks;
unsigned int i,val;
@@
-198,16
+194,25
@@
void jtag430x2handle(unsigned char app,
//jtag430_resettap();
//jtag430_resettap();
+ if(verb!=START && jtag430mode==MSP430MODE){
+ jtag430handle(app,verb,len);
+ return;
+ }
+
switch(verb){
case START:
//Enter JTAG mode.
switch(verb){
case START:
//Enter JTAG mode.
- do cmddata[0]=jtag430x2_start();
- while(cmddata[0]==00 || cmddata[0]==0xFF);
+ //do
+ cmddata[0]=jtag430x2_start();
+ //while(cmddata[0]==00 || cmddata[0]==0xFF);
//MSP430 or MSP430X
if(jtagid==MSP430JTAGID){
jtag430mode=MSP430MODE;
drwidth=16;
//MSP430 or MSP430X
if(jtagid==MSP430JTAGID){
jtag430mode=MSP430MODE;
drwidth=16;
+ jtag430_resettap();
+ txdata(app,verb,1);
+ return;
}else if(jtagid==MSP430X2JTAGID){
jtag430mode=MSP430X2MODE;
drwidth=20;
}else if(jtagid==MSP430X2JTAGID){
jtag430mode=MSP430X2MODE;
drwidth=20;
@@
-229,16
+234,8
@@
void jtag430x2handle(unsigned char app,
blocks=(len>4?cmddata[4]:1);
at=cmddatalong[0];
blocks=(len>4?cmddata[4]:1);
at=cmddatalong[0];
- /*
- cmddataword[0]=jtag430x2_readmem(at);
- txdata(app,verb,2);
- break;
- */
-
len=0x80;
len=0x80;
- serial_tx(app);
- serial_tx(verb);
- serial_tx(len);
+ txhead(app,verb,len);
while(blocks--){
for(i=0;i<len;i+=2){
while(blocks--){
for(i=0;i<len;i+=2){
@@
-262,11
+259,7
@@
void jtag430x2handle(unsigned char app,
cmddatalong[0]=jtag430_deviceid();
txdata(app,verb,4);
break;
cmddatalong[0]=jtag430_deviceid();
txdata(app,verb,4);
break;
- case JTAG430_HALTCPU:
- //jtag430x2_haltcpu();
- break;
- case JTAG430_RELEASECPU:
- case JTAG430_SETINSTRFETCH:
+
case JTAG430_WRITEMEM:
case POKE:
jtag430x2_writemem(cmddatalong[0],
case JTAG430_WRITEMEM:
case POKE:
jtag430x2_writemem(cmddatalong[0],
@@
-274,9
+267,16
@@
void jtag430x2handle(unsigned char app,
cmddataword[0]=jtag430x2_readmem(cmddatalong[0]);
txdata(app,verb,2);
break;
cmddataword[0]=jtag430x2_readmem(cmddatalong[0]);
txdata(app,verb,2);
break;
+
+ //unimplemented functions
+ case JTAG430_HALTCPU:
+ case JTAG430_RELEASECPU:
+ case JTAG430_SETINSTRFETCH:
case JTAG430_WRITEFLASH:
case JTAG430_ERASEFLASH:
case JTAG430_SETPC:
case JTAG430_WRITEFLASH:
case JTAG430_ERASEFLASH:
case JTAG430_SETPC:
+ txdata(app,NOK,0);
+ break;
default:
jtaghandle(app,verb,len);
}
default:
jtaghandle(app,verb,len);
}