projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Linking script to support MSP430F2619.
[goodfet]
/
firmware
/
apps
/
jtag
/
jtag430x2.c
diff --git
a/firmware/apps/jtag/jtag430x2.c
b/firmware/apps/jtag/jtag430x2.c
index
fb22cee
..
ad2801f
100644
(file)
--- a/
firmware/apps/jtag/jtag430x2.c
+++ b/
firmware/apps/jtag/jtag430x2.c
@@
-27,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(
20);//10
CLRTST;
CLRTST;
- delay(
5);
+ delay(
10);//5
SETTST;
SETTST;
- msdelay(
5);
+ msdelay(
10);//5
SETRST;
P5DIR&=~RST;
SETRST;
P5DIR&=~RST;
@@
-186,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;
@@
-203,13
+203,23
@@
void jtag430x2handle(unsigned char app,
case START:
//Enter JTAG mode.
//do
case START:
//Enter JTAG mode.
//do
-
cmddata[0]=jtag430x2_start();
+ cmddata[0]=jtag430x2_start();
//while(cmddata[0]==00 || cmddata[0]==0xFF);
//MSP430 or MSP430X
if(jtagid==MSP430JTAGID){
jtag430mode=MSP430MODE;
drwidth=16;
//while(cmddata[0]==00 || cmddata[0]==0xFF);
//MSP430 or MSP430X
if(jtagid==MSP430JTAGID){
jtag430mode=MSP430MODE;
drwidth=16;
+
+ //Perform a reset and disable watchdog.
+ jtag430_por();
+ jtag430_writemem(0x120,0x5a80);//disable watchdog
+
+ jtag430_haltcpu();
+
+ jtag430_resettap();
+ txdata(app,verb,1);
+ return;
}else if(jtagid==MSP430X2JTAGID){
jtag430mode=MSP430X2MODE;
drwidth=20;
}else if(jtagid==MSP430X2JTAGID){
jtag430mode=MSP430X2MODE;
drwidth=20;
@@
-231,16
+241,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){