X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Fchipcon%2Fchipcon.c;h=73ccd2f9ec23e15353c420378b922288ad60dc59;hp=b8cf041c7e25cf26f7b54446e9932854490fb821;hb=5c029aa0c4f7573d9fa49beefe6e887dee2b25f9;hpb=86e371097237b30f14847f842687ac2a3b0c97bd;ds=sidebyside

diff --git a/firmware/apps/chipcon/chipcon.c b/firmware/apps/chipcon/chipcon.c
index b8cf041..73ccd2f 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,43 @@
 void ccsetup(){
   P5OUT|=MOSI+SCK+RST;
   P5DIR|=MOSI+SCK+RST;
-  //P5DIR&=~MISO;  //MOSI is MISO
+  //P5REN=0xFF;
 }
 
+
+/* 33 cycle critical region
+0000000e <ccdebuginit>:
+   e:	f2 d0 0d 00 	bis.b	#13,	&0x0031	;5 cycles
+  12:	31 00 
+  14:	f2 c2 31 00 	bic.b	#8,	&0x0031	;4 cycles
+  18:	d2 c3 31 00 	bic.b	#1,	&0x0031	;4
+  1c:	f2 e2 31 00 	xor.b	#8,	&0x0031	;4
+  20:	f2 e2 31 00 	xor.b	#8,	&0x0031	;4
+  24:	f2 e2 31 00 	xor.b	#8,	&0x0031	;4
+  28:	f2 e2 31 00 	xor.b	#8,	&0x0031	;4
+  2c:	d2 d3 31 00 	bis.b	#1,	&0x0031	;4
+  30:	30 41       	ret			
+*/
+
+
 //! 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 +164,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 +300,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!");
@@ -329,11 +346,13 @@ unsigned short cc_get_chip_id(){
   case 0x01://CC1110
   case 0x81://CC2510
   case 0x91://CC2511
-    flash_word_size=0x02;
     //debugstr("2 bytes/flash word");
+    flash_word_size=0x02;
     break;
   default:
-    debugstr("Warning: Guessing flash word size.");
+    //debugstr("Warning: Guessing flash word size.");
+    flash_word_size=0;
+    break;
   case 0x85://CC2430
   case 0x89://CC2431
     //debugstr("4 bytes/flash word");
@@ -465,12 +484,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)){
@@ -478,7 +497,7 @@ void cc_write_flash_page(u32 adr){
   }
   
   
-  debugstr("Done flashing.");
+  //debugstr("Done flashing.");
   
   P1OUT&=~1;//clear LED
 }