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
/
jtag430.c
diff --git
a/firmware/apps/jtag/jtag430.c
b/firmware/apps/jtag/jtag430.c
index
66adb11
..
d0b83cb
100644
(file)
--- a/
firmware/apps/jtag/jtag430.c
+++ b/
firmware/apps/jtag/jtag430.c
@@
-52,6
+52,7
@@
void jtag430_releasecpu(){
//! Read data from address
unsigned int jtag430_readmem(unsigned int adr){
unsigned int toret;
//! Read data from address
unsigned int jtag430_readmem(unsigned int adr){
unsigned int toret;
+ jtag430_haltcpu();
CLRTCLK;
jtag_ir_shift8(IR_CNTRL_SIG_16BIT);
CLRTCLK;
jtag_ir_shift8(IR_CNTRL_SIG_16BIT);
@@
-112,7
+113,6
@@
void jtag430_writeflashword(unsigned int adr, unsigned int data){
//Pulse TCLK
jtag430_tclk_flashpulses(35); //35 standard
//Pulse TCLK
jtag430_tclk_flashpulses(35); //35 standard
-
}
//! Configure flash, then write a word.
}
//! Configure flash, then write a word.
@@
-132,7
+132,7
@@
void jtag430_writeflash(unsigned int adr, unsigned int data){
//FCTL1=0xA500, disabling flash write
jtag430_writemem(0x0128, 0xA500);
//FCTL1=0xA500, disabling flash write
jtag430_writemem(0x0128, 0xA500);
- jtag430_releasecpu();
+
//
jtag430_releasecpu();
}
}
@@
-188,7
+188,7
@@
void jtag430_eraseflash(unsigned int mode, unsigned int adr, unsigned int count)
//FCTL1=0xA500, disabling flash write
jtag430_writemem(0x0128, 0xA500);
//FCTL1=0xA500, disabling flash write
jtag430_writemem(0x0128, 0xA500);
- jtag430_releasecpu();
+
//
jtag430_releasecpu();
}
}
@@
-252,10
+252,14
@@
void jtag430_start(){
//Perform a reset and disable watchdog.
jtag430_por();
//Perform a reset and disable watchdog.
jtag430_por();
+ jtag430_writemem(0x120,0x5a80);//disable watchdog
+
+ jtag430_haltcpu();
}
//! Set CPU to Instruction Fetch
void jtag430_setinstrfetch(){
}
//! Set CPU to Instruction Fetch
void jtag430_setinstrfetch(){
+
jtag_ir_shift8(IR_CNTRL_SIG_CAPTURE);
// Wait until instruction fetch state.
jtag_ir_shift8(IR_CNTRL_SIG_CAPTURE);
// Wait until instruction fetch state.
@@
-271,11
+275,13
@@
void jtag430_setinstrfetch(){
//! Handles classic MSP430 JTAG commands. Forwards others to JTAG.
void jtag430handle(unsigned char app,
unsigned char verb,
//! Handles classic MSP430 JTAG commands. Forwards others to JTAG.
void jtag430handle(unsigned char app,
unsigned char verb,
- unsigned
char
len){
+ unsigned
long
len){
register char blocks;
unsigned long at;
unsigned int i, val;
register char blocks;
unsigned long at;
unsigned int i, val;
+ //debugstr("Classic MSP430 handler.");
+
switch(verb){
case START:
//Enter JTAG mode.
switch(verb){
case START:
//Enter JTAG mode.
@@
-300,53
+306,52
@@
void jtag430handle(unsigned char app,
case JTAG430_READMEM:
case PEEK:
case JTAG430_READMEM:
case PEEK:
- /*
- cmddataword[0]=jtag430_readmem(cmddataword[0]);
- txdata(app,verb,2);
- */
- blocks=(len>4?cmddata[4]:1);
at=cmddatalong[0];
at=cmddatalong[0];
- len=0x80;
- serial_tx(app);
- serial_tx(verb);
- serial_tx(len);
+ //Fetch large blocks for bulk fetches,
+ //small blocks for individual peeks.
+ if(len>5)
+ len=(cmddataword[2]);//always even.
+ else
+ len=2;
+ len&=~1;//clue lsbit
- while(blocks--){
- for(i=0;i<len;i+=2){
- jtag430_resettap();
- delay(10);
-
- val=jtag430_readmem(at);
-
- at+=2;
- serial_tx(val&0xFF);
- serial_tx((val&0xFF00)>>8);
- }
+ txhead(app,verb,len);
+ for(i=0;i<len;i+=2){
+ jtag430_resettap();
+ val=jtag430_readmem(at);
+
+ at+=2;
+ serial_tx(val&0xFF);
+ serial_tx((val&0xFF00)>>8);
}
}
-
-
-
break;
case JTAG430_WRITEMEM:
case POKE:
break;
case JTAG430_WRITEMEM:
case POKE:
+ jtag430_haltcpu();
jtag430_writemem(cmddataword[0],cmddataword[2]);
cmddataword[0]=jtag430_readmem(cmddataword[0]);
txdata(app,verb,2);
break;
case JTAG430_WRITEFLASH:
jtag430_writemem(cmddataword[0],cmddataword[2]);
cmddataword[0]=jtag430_readmem(cmddataword[0]);
txdata(app,verb,2);
break;
case JTAG430_WRITEFLASH:
- debugstr("Poking flash memory.");
+
//
debugstr("Poking flash memory.");
jtag430_writeflash(cmddataword[0],cmddataword[2]);
jtag430_writeflash(cmddataword[0],cmddataword[2]);
+
+ //Try again if failure.
+ if(cmddataword[0]!=jtag430_readmem(cmddataword[0]))
+ jtag430_writeflash(cmddataword[0],cmddataword[2]);
+
+ //Return result.
cmddataword[0]=jtag430_readmem(cmddataword[0]);
cmddataword[0]=jtag430_readmem(cmddataword[0]);
+
txdata(app,verb,2);
break;
case JTAG430_ERASEFLASH:
txdata(app,verb,2);
break;
case JTAG430_ERASEFLASH:
- jtag430_eraseflash(ERASE_MASS,0xFFFE,0xFFFF);
- jtag430_eraseflash(ERASE_MASS,0xFFFE,0xFFFF);
- jtag430_eraseflash(ERASE_MASS,0xFFFE,0xFFFF);
+ jtag430_eraseflash(ERASE_MASS,0xFFFE,0x3000);
txdata(app,verb,0);
break;
case JTAG430_SETPC:
txdata(app,verb,0);
break;
case JTAG430_SETPC:
+ jtag430_haltcpu();
jtag430_setpc(cmddataword[0]);
txdata(app,verb,0);
break;
jtag430_setpc(cmddataword[0]);
txdata(app,verb,0);
break;
@@
-361,5
+366,5
@@
void jtag430handle(unsigned char app,
default:
jtaghandle(app,verb,len);
}
default:
jtaghandle(app,verb,len);
}
- jtag430_resettap();
+ //jtag430_resettap(); //DO NOT UNCOMMENT
}
}