projects
/
goodfet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Major glitching fix.
[goodfet]
/
firmware
/
apps
/
chipcon
/
chipcon.c
diff --git
a/firmware/apps/chipcon/chipcon.c
b/firmware/apps/chipcon/chipcon.c
index
c2c2a27
..
1f4b3d4
100644
(file)
--- a/
firmware/apps/chipcon/chipcon.c
+++ b/
firmware/apps/chipcon/chipcon.c
@@
-37,7
+37,8
@@
//This could be more accurate.
//Does it ever need to be?
#define CCSPEED 3
//This could be more accurate.
//Does it ever need to be?
#define CCSPEED 3
-#define CCDELAY(x) delay(x)
+//#define CCDELAY(x) delay(x)
+#define CCDELAY(x)
#define SETMOSI P5OUT|=MOSI
#define CLRMOSI P5OUT&=~MOSI
#define SETMOSI P5OUT|=MOSI
#define CLRMOSI P5OUT&=~MOSI
@@
-52,30
+53,27
@@
void ccsetup(){
P5OUT|=MOSI+SCK+RST;
P5DIR|=MOSI+SCK+RST;
void ccsetup(){
P5OUT|=MOSI+SCK+RST;
P5DIR|=MOSI+SCK+RST;
- //P5DIR&=~MISO; //MOSI is MISO
-
//P5REN=0xFF;
//P5REN=0xFF;
-
}
//! Initialize the debugger
void ccdebuginit(){
}
//! Initialize the debugger
void ccdebuginit(){
- delay(30); //So the beginning is ready for glitching.
+ //Port output BUT NOT DIRECTION is set at start.
+ P5OUT|=MOSI+SCK+RST;
+
+ //delay(30); //So the beginning is ready for glitching.
//Two positive debug clock pulses while !RST is low.
//Take RST low, pulse twice, then high.
P5OUT&=~SCK;
P5OUT&=~RST;
//Two positive debug clock pulses while !RST is low.
//Take RST low, pulse twice, then high.
P5OUT&=~SCK;
P5OUT&=~RST;
- //pulse twice
- CCDELAY(CCSPEED);
- P5OUT|=SCK; //up
- CCDELAY(CCSPEED);
- P5OUT&=~SCK; //down
- CCDELAY(CCSPEED);
- P5OUT|=SCK; //up
- CCDELAY(CCSPEED);
- P5OUT&=~SCK; //down
+ //Two rising edges.
+ P5OUT^=SCK; //up
+ P5OUT^=SCK; //down
+ P5OUT^=SCK; //up
+ P5OUT^=SCK; //Unnecessary.
+
//Raise !RST.
P5OUT|=RST;
//Raise !RST.
P5OUT|=RST;
@@
-150,14
+148,12
@@
void cchandle(unsigned char app,
if(cmddata[0]&0x4)
ccread(1);
txdata(app,verb,1);
if(cmddata[0]&0x4)
ccread(1);
txdata(app,verb,1);
-
break;
case WRITE: //Write a command with no reply.
cccmd(len);
txdata(app,verb,0);
break;
case START://enter debugger
break;
case WRITE: //Write a command with no reply.
cccmd(len);
txdata(app,verb,0);
break;
case START://enter debugger
- ccsetup();
ccdebuginit();
txdata(app,verb,0);
break;
ccdebuginit();
txdata(app,verb,0);
break;
@@
-470,12
+466,12
@@
void cc_write_flash_page(u32 adr){
cmddata[1]=0xc7;
cmddata[2]=0x51;
cc_debug_instr(3);
cmddata[1]=0xc7;
cmddata[2]=0x51;
cc_debug_instr(3);
- debugstr("Loaded bank info.");
+
//
debugstr("Loaded bank info.");
cc_set_pc(0xf000+MAXFLASHPAGE_SIZE);//execute code fragment
cc_resume();
cc_set_pc(0xf000+MAXFLASHPAGE_SIZE);//execute code fragment
cc_resume();
- debugstr("Executing.");
+
//
debugstr("Executing.");
while(!(cc_read_status()&CC_STATUS_CPUHALTED)){
while(!(cc_read_status()&CC_STATUS_CPUHALTED)){
@@
-483,7
+479,7
@@
void cc_write_flash_page(u32 adr){
}
}
- debugstr("Done flashing.");
+
//
debugstr("Done flashing.");
P1OUT&=~1;//clear LED
}
P1OUT&=~1;//clear LED
}