X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Fchipcon%2Fchipcon.c;h=c5855949206478ebfd7db0b2e5e0c9356753a709;hp=17905266428684aa3900b62851eba3fce574035d;hb=ea4f451d1fbdc93bb175c7b55a43f3e906219a62;hpb=19289dc659d1dae658295be9a32f9b0dd4ed3034

diff --git a/firmware/apps/chipcon/chipcon.c b/firmware/apps/chipcon/chipcon.c
index 1790526..c585594 100644
--- a/firmware/apps/chipcon/chipcon.c
+++ b/firmware/apps/chipcon/chipcon.c
@@ -20,11 +20,11 @@
 #include <iomacros.h>
 
 
-/* Concerning clock rates,
-   the maximimum clock rates are defined on page 4 of the spec.
-   They vary, but are roughly 30MHz.  Raising this clock rate might
-   allow for clock glitching, but the GoodFET isn't sufficient fast for that.
-   Perhaps a 200MHz ARM or an FPGA in the BadassFET?
+/* Concerning clock rates, the maximimum clock rates are defined on
+   page 4 of the spec.  They vary, but are roughly 30MHz.  Raising
+   this clock rate might allow for clock glitching, but the GoodFET
+   isn't sufficient fast for that.  Perhaps a 200MHz ARM or an FPGA in
+   the BadassFET?
 */
 
 //Pins and I/O
@@ -126,7 +126,9 @@ void cchandle(unsigned char app,
 	       unsigned char verb,
 	       unsigned long len){
   //Always init.  Might help with buggy lines.
-  ccdebuginit();
+  //Might hurt too.
+  //ccdebuginit();
+  long i;
   
   switch(verb){
     //CC_PEEK and CC_POKE will come later.
@@ -226,6 +228,11 @@ void cchandle(unsigned char app,
     cc_write_flash_page(cmddatalong[0]);
     txdata(app,verb,0);
     break;
+  case CC_WIPEFLASHBUFFER:
+    for(i=0xf000;i<0xf800;i++)
+      cc_pokedatabyte(i,0xFF);
+    txdata(app,verb,0);
+    break;
   case CC_MASS_ERASE_FLASH:
   case CC_CLOCK_INIT:
   case CC_PROGRAM_FLASH:
@@ -237,9 +244,10 @@ void cchandle(unsigned char app,
 
 //! Set the Chipcon's Program Counter
 void cc_set_pc(u32 adr){
-  cmddata[0]=0x02;           //GetPC
-  cmddata[1]=(adr>>8)&0xff;  //HIBYTE
-  cmddata[2]=adr&0xff;       //LOBYTE
+  cmddata[0]=0x02;             //SetPC
+  cmddata[1]=((adr>>8)&0xff);  //HIBYTE
+  cmddata[2]=adr&0xff;         //LOBYTE
+  cc_debug_instr(3);
   return;
 }
 
@@ -305,7 +313,7 @@ void cc_write_xdata(u16 adr, u8 *data, u16 len){
 #define LOBYTE_WORDS_PER_FLASH_PAGE 0x00
 #define FLASHPAGE_SIZE 0x800
 
-//2 bytes/word
+//32 bit words
 #define FLASH_WORD_SIZE 0x4
 
 const u8 flash_routine[] = {
@@ -314,12 +322,12 @@ const u8 flash_routine[] = {
   0x00,//#imm=((address >> 8) / FLASH_WORD_SIZE) & 0x7E,
   
   0x75, 0xAC, 0x00,                                          //                 MOV FADDRL, #00; 
-  /* Erase page. *
+  /* Erase page. */
   0x75, 0xAE, 0x01,                                          //                 MOV FLC, #01H; // ERASE 
                                                              //                 ; Wait for flash erase to complete 
   0xE5, 0xAE,                                                // eraseWaitLoop:  MOV A, FLC; 
   0x20, 0xE7, 0xFB,                                          //                 JB ACC_BUSY, eraseWaitLoop; 
-  */
+  /* End erase page. */
                                                              //                 ; Initialize the data pointer 
   0x90, 0xF0, 0x00,                                          //                 MOV DPTR, #0F000H; 
                                                              //                 ; Outer loops 
@@ -344,6 +352,12 @@ const u8 flash_routine[] = {
 //! Copies flash buffer to flash.
 void cc_write_flash_page(u32 adr){
   //Assumes that page has already been written to XDATA 0xF000
+  //debugstr("Flashing 2kb at 0xF000 to given adr.");
+  
+  if(adr&(FLASHPAGE_SIZE-1)){
+    debugstr("Flash page address is not on a multiple of 2kB.  Aborting.");
+    return;
+  }
   
   //Routine comes next
   //WRITE_XDATA_MEMORY(IN: 0xF000 + FLASH_PAGE_SIZE, sizeof(routine), routine);
@@ -353,14 +367,27 @@ void cc_write_flash_page(u32 adr){
   //((address >> 8) / FLASH_WORD_SIZE) & 0x7E
   cc_pokedatabyte(0xF000+FLASHPAGE_SIZE+2,
 		  ((adr>>8)/FLASH_WORD_SIZE)&0x7E);
-  cc_debug(3, //MOV MEMCTR, (bank * 16) + 1;
-	   0x75, 0xc7, 0x51);
+  //debugstr("Wrote flash routine.");
+  
+  
+  //MOV MEMCTR, (bank * 16) + 1;
+  cmddata[0]=0x75;
+  cmddata[1]=0xc7;
+  cmddata[2]=0x51;
+  cc_debug_instr(3);
+  //debugstr("Loaded bank info.");
+  
   cc_set_pc(0xf000+FLASHPAGE_SIZE);//execute code fragment
   cc_resume();
+  //debugstr("Executing.");
+  
+  
   while(!(cc_read_status()&CC_STATUS_CPUHALTED)){
-    P1OUT^=1;//blink LED
+    P1OUT^=1;//blink LED while flashing
   }
   
+  //debugstr("Done flashing.");
+  
   P1OUT&=~1;//clear LED
 }