X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=firmware%2Fapps%2Fchipcon%2Fchipcon.c;h=1f4b3d475da63f70282c7b0559c344c0fd35aca8;hb=f515b7a8aae68363cba997f8581001401e70054b;hp=33b12831aa67475d63e69a0da5155792ad219db9;hpb=d3dd9b72ba6d3335cbae4ef560a25e9f707a4435;p=goodfet

diff --git a/firmware/apps/chipcon/chipcon.c b/firmware/apps/chipcon/chipcon.c
index 33b1283..1f4b3d4 100644
--- 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
-#define CCDELAY(x) delay(x)
+//#define CCDELAY(x) delay(x)
+#define CCDELAY(x) 
 
 #define SETMOSI P5OUT|=MOSI
 #define CLRMOSI P5OUT&=~MOSI
@@ -52,25 +53,27 @@
 void ccsetup(){
   P5OUT|=MOSI+SCK+RST;
   P5DIR|=MOSI+SCK+RST;
-  //P5DIR&=~MISO;  //MOSI is MISO
+  //P5REN=0xFF;
 }
 
 //! Initialize the debugger
 void ccdebuginit(){
+  //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;
   
-  //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;
@@ -145,14 +148,12 @@ void cchandle(unsigned char app,
     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
-    ccsetup();
     ccdebuginit();
     txdata(app,verb,0);
     break;
@@ -283,7 +284,7 @@ void cc_wr_config(unsigned char config){
 void cc_lockchip(){
   register int i;
   
-  debugstr("Locking chip.");
+  //debugstr("Locking chip.");
   cc_wr_config(1);//Select Info Flash 
   if(!(cc_rd_config()&1))
     debugstr("Config forgotten!");
@@ -319,7 +320,6 @@ unsigned char cc_read_status(){
 
 //! Read the CHIP ID bytes.
 unsigned short cc_get_chip_id(){
-  unsigned short toret;
   cmddata[0]=CCCMD_GET_CHIP_ID; //0x68
   cccmd(1);
   ccread(2);
@@ -331,13 +331,13 @@ unsigned short cc_get_chip_id(){
   case 0x81://CC2510
   case 0x91://CC2511
     flash_word_size=0x02;
-    debugstr("2 bytes/flash word");
+    //debugstr("2 bytes/flash word");
     break;
   default:
     debugstr("Warning: Guessing flash word size.");
   case 0x85://CC2430
   case 0x89://CC2431
-    debugstr("4 bytes/flash word");
+    //debugstr("4 bytes/flash word");
     flash_word_size=0x04;
     break;
   }
@@ -466,12 +466,12 @@ void cc_write_flash_page(u32 adr){
   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();
   
-  debugstr("Executing.");
+  //debugstr("Executing.");
   
   
   while(!(cc_read_status()&CC_STATUS_CPUHALTED)){
@@ -479,7 +479,7 @@ void cc_write_flash_page(u32 adr){
   }
   
   
-  debugstr("Done flashing.");
+  //debugstr("Done flashing.");
   
   P1OUT&=~1;//clear LED
 }