X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Fchipcon%2Fchipcon.c;h=4b0e0df711de1f7aa99b59c3c6c2613d6c3b7bf4;hp=dcaf8a2af2ded4500121b1ea97dc59ab0a32df84;hb=3ad65af0d988ff3ae71ef71e4e6ba1e889f1e65e;hpb=8eed366711c123dbd740b0bc0d5ca0e0c0d770e8

diff --git a/firmware/apps/chipcon/chipcon.c b/firmware/apps/chipcon/chipcon.c
index dcaf8a2..4b0e0df 100644
--- a/firmware/apps/chipcon/chipcon.c
+++ b/firmware/apps/chipcon/chipcon.c
@@ -351,7 +351,7 @@ unsigned short cc_get_chip_id(){
     break;
   default:
     //debugstr("Warning: Guessing flash word size.");
-    flash_word_size=0;
+    //flash_word_size=0;
     break;
   case 0x85://CC2430
   case 0x89://CC2431
@@ -457,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);
   }
   
@@ -477,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;
@@ -493,7 +493,7 @@ void cc_write_flash_page(u32 adr){
   
   
   while(!(cc_read_status()&CC_STATUS_CPUHALTED)){
-    PLEDOUT^=PLEDPIN;//blink LED while flashing
+    PLEDOUT^=PLEDPIN;//blink LED while flashing    
   }