!GEN is now 1 by default.

[goodfet] / firmware / apps / chipcon / chipcon.c

diff --git a/firmware/apps/chipcon/chipcon.c b/firmware/apps/chipcon/chipcon.c
index 00e3226..b8cf041 100644 (file)
--- a/firmware/apps/chipcon/chipcon.c
+++ b/firmware/apps/chipcon/chipcon.c
@@ -319,7 +319,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);
@@ -334,12 +333,11 @@ unsigned short cc_get_chip_id(){
     //debugstr("2 bytes/flash word");
     break;
   default:
-    flash_word_size=0x04;
-    break;
-    //debugstr("Warning: Guessing flash word size.");
+    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;
   }
   
@@ -440,6 +438,11 @@ void cc_write_flash_page(u32 adr){
     return;
   }
   
+  if(flash_word_size==0){
+    debugstr("Flash word size is wrong.");
+    while(1);
+  }
+  
   //Routine comes next
   //WRITE_XDATA_MEMORY(IN: 0xF000 + FLASH_PAGE_SIZE, sizeof(routine), routine);
   cc_write_xdata(0xF000+MAXFLASHPAGE_SIZE,