Never a wordsize of 0.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@640 12e2690d-a6be-4b82-a7b7-67c4a43b65c8

diff --git a/firmware/apps/chipcon/chipcon.c b/firmware/apps/chipcon/chipcon.c
index dcaf8a2..4b0e0df 100644 (file)
--- 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.");
     break;
   default:
     //debugstr("Warning: Guessing flash word size.");

-    flash_word_size=0;
+    //flash_word_size=0;

     break;
   case 0x85://CC2430
   case 0x89://CC2431
     break;
   case 0x85://CC2430
   case 0x89://CC2431


@@ -457,8 +457,9 @@ void cc_write_flash_page(u32 adr){
     return;
   }
   
     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);
   }
   
     while(1);
   }
   


@@ -477,8 +478,7 @@ void cc_write_flash_page(u32 adr){
                  flash_word_size);
   
   //debugstr("Wrote flash routine.");
                  flash_word_size);
   
   //debugstr("Wrote flash routine.");

-  
-  
+    

   //MOV MEMCTR, (bank * 16) + 1;
   cmddata[0]=0x75;
   cmddata[1]=0xc7;
   //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)){
   
   
   while(!(cc_read_status()&CC_STATUS_CPUHALTED)){

-    PLEDOUT^=PLEDPIN;//blink LED while flashing
+    PLEDOUT^=PLEDPIN;//blink LED while flashing    

   }
   
   
   }