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

diff --git a/firmware/apps/chipcon/chipcon.c b/firmware/apps/chipcon/chipcon.c
index 1f4b3d4..4b0e0df 100644
--- a/firmware/apps/chipcon/chipcon.c
+++ b/firmware/apps/chipcon/chipcon.c
@@ -56,6 +56,22 @@ void ccsetup(){
   //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.
@@ -330,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");
@@ -439,8 +457,9 @@ void cc_write_flash_page(u32 adr){
     return;
   }
   
-  if(flash_word_size==0){
-    debugstr("Flash word size is wrong.");
+  if(flash_word_size!=2 && flash_word_size!=4){
+    debugstr("Flash word size is wrong, aborting write to");
+    debughex(adr);
     while(1);
   }
   
@@ -459,8 +478,7 @@ void cc_write_flash_page(u32 adr){
 		  flash_word_size);
   
   //debugstr("Wrote flash routine.");
-  
-  
+    
   //MOV MEMCTR, (bank * 16) + 1;
   cmddata[0]=0x75;
   cmddata[1]=0xc7;
@@ -475,13 +493,13 @@ void cc_write_flash_page(u32 adr){
   
   
   while(!(cc_read_status()&CC_STATUS_CPUHALTED)){
-    P1OUT^=1;//blink LED while flashing
+    PLEDOUT^=PLEDPIN;//blink LED while flashing    
   }
   
   
   //debugstr("Done flashing.");
   
-  P1OUT&=~1;//clear LED
+  PLEDOUT&=~PLEDPIN;//clear LED
 }
 
 //! Read the PC