Moving CCSPI reflexive jamming to its own channel.
[goodfet] / firmware / apps / chipcon / chipcon.c
index c45effc..5785e2e 100644 (file)
 #include "command.h"
 #include "chipcon.h"
 
-#include <signal.h>
-#include <io.h>
-#include <iomacros.h>
+//! Handles a chipcon command.
+void cc_handle_fn( uint8_t const app,
+                                  uint8_t const verb,
+                                  uint32_t const len);
 
+// define the jtag app's app_t
+app_t const chipcon_app = {
+
+       /* app number */
+       CHIPCON,
+
+       /* handle fn */
+       cc_handle_fn,
+
+       /* name */
+       "CHIPCON",
+
+       /* desc */
+       "\tThe CHIPCON app adds support for debugging the chipcon\n"
+       "\t8051 processor.\n"
+};
 
 /* Concerning clock rates, the maximimum clock rates are defined on
    page 4 of the spec.  They vary, but are roughly 30MHz.  Raising
 
 //Pins and I/O
 //MISO and MOSI are the same pin, direction changes.
+
+#if (platform == tilaunchpad)
+/*
+ * The Launchpad has only pins easily available
+ * P5.3 TCK    SCK             (labeled TEST J3-10 J2-17)      DC closest to antenna           (blue)
+ * P5.2 IO     MISO MOSI       (labeled RST  J3-8  J2-16)      DD next to closer to USB                (yellow)
+ * P3.6 txd1   RST             (labeled RXD  J3-6  J1-4)       next to GND, which is closest to USB    (orange)
+ * P3.7 rxd1   RST             (labeled TXD  J3-4  J1-3)       connect to led1 J1-2
+ *
+ * for a permanent marriage between a TI-Launchpad, move RST to pin48 P5.4
+ * (requeries soldering) and use rxd/txd for direct communication with IM-ME dongle.
+ */
+
+#define RST  BIT6      // P3.7
+#include <msp430_serial.h>
+#else  // tilaunchpad
 #define RST  BIT0
+#define dputs(s)
+#endif // ! tilaunchad
+
 #define MOSI BIT2
 #define MISO BIT2
 #define SCK  BIT3
 
+
 //This could be more accurate.
 //Does it ever need to be?
 #define CCSPEED 3
-#define CCDELAY(x) delay(x)
-
-#define SETMOSI P5OUT|=MOSI
-#define CLRMOSI P5OUT&=~MOSI
-#define SETCLK P5OUT|=SCK
-#define CLRCLK P5OUT&=~SCK
-#define READMISO (P5IN&MISO?1:0)
-
-#define CCWRITE P5DIR|=MOSI
-#define CCREAD P5DIR&=~MISO
+//#define CCSPEED 3
+//#define CCDELAY(x) delay(x)
+#define CCDELAY(x)
+
+#define SETMOSI SPIOUT|=MOSI
+#define CLRMOSI SPIOUT&=~MOSI
+#define SETCLK SPIOUT|=SCK
+#define CLRCLK SPIOUT&=~SCK
+#define READMISO (SPIIN&MISO?1:0)
+
+#if (platform == tilaunchpad)
+#  if (SPIDIR != P5DIR)
+#    error "SPIDIR != P5DIR"
+#  endif
+#  if (SPIOUT != P5OUT)
+#    error "SPIOUT != P5OUT"
+#  endif
+#  define SETRST  P3OUT|=RST
+#  define CLRRST  P3OUT&=~RST
+#else
+#  define SETRST  P3OUT|=RST
+#  define CLRRST  P3OUT&=~RST
+#endif
+
+#define CCWRITE SPIDIR|=MOSI
+#define CCREAD SPIDIR&=~MISO
 
 //! Set up the pins for CC mode.  Does not init debugger.
 void ccsetup(){
-  P5OUT|=MOSI+SCK+RST;
-  P5DIR|=MOSI+SCK+RST;
-  //P5DIR&=~MISO;  //MOSI is MISO
+#if (platform == tilaunchpad)
+       dputs("ccsetup");
+  SPIOUT|=MOSI+SCK;
+  SPIDIR|=MOSI+SCK;
+  P3OUT|=RST;
+  P3DIR|=RST;
+       dputs("done ccsetup");
+#else
+  SPIOUT|=MOSI+SCK+RST;
+  SPIDIR|=MOSI+SCK+RST;
+#endif
+  //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.
+#if (platform == tilaunchpad)
+  dputs("ccdebuginit");
+  SPIOUT|=MOSI+SCK;
+  P3OUT|=RST;
+#else
+  SPIOUT|=MOSI+SCK+RST;
+#endif
+
+  delay(30); //So the beginning is ready for glitching.
+
   //Two positive debug clock pulses while !RST is low.
   //Take RST low, pulse twice, then high.
-  P5OUT&=~SCK;
-  P5OUT&=~RST;
-  
-  //pulse twice
-  CCDELAY(CCSPEED);
-  P5OUT|=SCK;  //up
-  CCDELAY(CCSPEED);
-  P5OUT&=~SCK; //down
-  CCDELAY(CCSPEED);
-  P5OUT|=SCK;  //up
-  CCDELAY(CCSPEED);
-  P5OUT&=~SCK; //down
-  
+  SPIOUT&=~SCK;
+  delay(10);
+  CLRRST;
+
+  delay(10);
+
+  //Two rising edges.
+  SPIOUT^=SCK; //up
+  delay(1);
+  SPIOUT^=SCK; //down
+  delay(1);
+  SPIOUT^=SCK; //up
+  delay(1);
+  SPIOUT^=SCK; //Unnecessary.
+  delay(1);
+  //delay(0);
+
   //Raise !RST.
-  P5OUT|=RST;
+  SETRST;
 }
 
 //! Read and write a CC bit.
@@ -81,7 +174,7 @@ unsigned char cctrans8(unsigned char byte){
   unsigned int bit;
   //This function came from the SPI Wikipedia article.
   //Minor alterations.
-  
+
   for (bit = 0; bit < 8; bit++) {
     /* write MOSI on trailing edge of previous clock */
     if (byte & 0x80)
@@ -89,19 +182,19 @@ unsigned char cctrans8(unsigned char byte){
     else
       CLRMOSI;
     byte <<= 1;
+
     /* half a clock cycle before leading/rising edge */
-    CCDELAY(CCSPEED/2);
+    CCDELAY(CCSPEED>>2);
     SETCLK;
+
     /* half a clock cycle before trailing/falling edge */
-    CCDELAY(CCSPEED/2);
+    CCDELAY(CCSPEED>>2);
+
     /* read MISO on trailing edge */
     byte |= READMISO;
     CLRCLK;
   }
-  
+
   return byte;
 }
 
@@ -121,15 +214,17 @@ void ccread(unsigned char len){
     cmddata[i]=cctrans8(0);
 }
 
-//! Handles a monitor command.
-void cchandle(unsigned char app,
-              unsigned char verb,
-              unsigned long len){
+//! Handles a chipcon command.
+void cc_handle_fn( uint8_t const app,
+                                  uint8_t const verb,
+                                  uint32_t const len)
+{
   //Always init.  Might help with buggy lines.
   //Might hurt too.
   //ccdebuginit();
   long i;
-  
+  int blocklen, blockadr;
+
   switch(verb){
     //CC_PEEK and CC_POKE will come later.
   case PEEK:
@@ -145,31 +240,30 @@ void cchandle(unsigned char app,
     if(cmddata[0]&0x4)
       ccread(1);
     txdata(app,verb,1);
-    
     break;
   case WRITE: //Write a command with no reply.
     cccmd(len);
     txdata(app,verb,0);
     break;
   case START://enter debugger
-    ccsetup();
     ccdebuginit();
     txdata(app,verb,0);
     break;
   case STOP://exit debugger
     //Take RST low, then high.
-    P5OUT&=~RST;
+    CLRRST;
     CCDELAY(CCSPEED);
-    P5OUT|=RST;
+    SETRST;
     txdata(app,verb,0);
     break;
   case SETUP:
     ccsetup();
     txdata(app,verb,0);
     break;
-    
+
   //Micro commands!
   case CC_CHIP_ERASE:
+  case CC_MASS_ERASE_FLASH:
     cc_chip_erase();
     txdata(app,verb,1);
     break;
@@ -213,7 +307,7 @@ void cchandle(unsigned char app,
     txdata(app,verb,1);
     break;
   case CC_STEP_REPLACE:
-    txdata(app,NOK,0);//TODO add me
+    txdata(app,NOK,0);//Don't add this; it's non-standard.
     break;
   case CC_GET_CHIP_ID:
     cmddataword[0]=cc_get_chip_id();
@@ -227,9 +321,18 @@ void cchandle(unsigned char app,
     txdata(app,verb,1);
     break;
   case CC_READ_XDATA_MEMORY:
-    cmddata[0]=cc_peekdatabyte(cmddataword[0]);
-    txdata(app,verb,1);
+    //Read the length.
+    blocklen=1;
+    if(len>2)
+      blocklen=cmddataword[1];
+    blockadr=cmddataword[0];
+
+    //Return that many bytes.
+    for(i=0;i<blocklen;i++)
+      cmddata[i]=cc_peekdatabyte(blockadr+i);
+    txdata(app,verb,blocklen);
     break;
+
   case CC_WRITE_XDATA_MEMORY:
     cmddata[0]=cc_pokedatabyte(cmddataword[0], cmddata[2]);
     txdata(app,verb,1);
@@ -247,9 +350,10 @@ void cchandle(unsigned char app,
       cc_pokedatabyte(i,0xFF);
     txdata(app,verb,0);
     break;
-  case CC_MASS_ERASE_FLASH:
+
   case CC_CLOCK_INIT:
   case CC_PROGRAM_FLASH:
+  default:
     debugstr("This Chipcon command is not yet implemented.");
     txdata(app,NOK,0);//TODO implement me.
     break;
@@ -282,20 +386,20 @@ void cc_wr_config(unsigned char config){
 //! Locks the chip.
 void cc_lockchip(){
   register int i;
-  
-  debugstr("Locking chip.");
-  cc_wr_config(1);//Select Info Flash 
+
+  //debugstr("Locking chip.");
+  cc_wr_config(1);//Select Info Flash
   if(!(cc_rd_config()&1))
     debugstr("Config forgotten!");
-  
+
   //Clear config page.
   for(i=0;i<2048;i++)
     cc_pokedatabyte(0xf000+i,0);
   cc_write_flash_page(0);
   if(cc_peekcodebyte(0))
     debugstr("Failed to clear info flash byte.");
-  
-  cc_wr_config(0);  
+
+  cc_wr_config(0);
   if(cc_rd_config()&1)
     debugstr("Stuck in info flash mode!");
 }
@@ -319,29 +423,31 @@ 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);
 
-  
+
   //Find the flash word size.
   switch(cmddata[0]){
   case 0x01://CC1110
+  case 0x11://CC1111
   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");
     flash_word_size=0x04;
     break;
   }
-  
+
   //Return the word.
   return cmddataword[0];
 }
@@ -393,39 +499,39 @@ u8 flash_word_size = 0; //0x02;
 
 const u8 flash_routine[] = {
   //0:
-  //MOV FADDRH, #imm; 
+  //MOV FADDRH, #imm;
   0x75, 0xAD,
   0x00,//#imm=((address >> 8) / FLASH_WORD_SIZE) & 0x7E,
-  
+
   //0x75, 0xAB, 0x23, //Set FWT per clock
-  0x75, 0xAC, 0x00,                                          //                 MOV FADDRL, #00; 
+  0x75, 0xAC, 0x00,                                          //                 MOV FADDRL, #00;
   /* 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; 
-  
+  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 
-  0x7F, HIBYTE_WORDS_PER_FLASH_PAGE,                         //                 MOV R7, #imm; 
-  0x7E, LOBYTE_WORDS_PER_FLASH_PAGE,                         //                 MOV R6, #imm; 
-  0x75, 0xAE, 0x02,                                          //                 MOV FLC, #02H; // WRITE 
-                                                             //                     ; Inner loops 
+                                                             //                 ; Initialize the data pointer
+  0x90, 0xF0, 0x00,                                          //                 MOV DPTR, #0F000H;
+                                                             //                 ; Outer loops
+  0x7F, HIBYTE_WORDS_PER_FLASH_PAGE,                         //                 MOV R7, #imm;
+  0x7E, LOBYTE_WORDS_PER_FLASH_PAGE,                         //                 MOV R6, #imm;
+  0x75, 0xAE, 0x02,                                          //                 MOV FLC, #02H; // WRITE
+                                                             //                     ; Inner loops
   //24:
-  0x7D, 0xde /*FLASH_WORD_SIZE*/,                                     // writeLoop:          MOV R5, #imm; 
-  0xE0,                                                      // writeWordLoop:          MOVX A, @DPTR; 
-  0xA3,                                                      //                         INC DPTR; 
-  0xF5, 0xAF,                                                //                         MOV FWDATA, A;  
-  0xDD, 0xFA,                                                //                     DJNZ R5, writeWordLoop; 
-                                                             //                     ; Wait for completion 
-  0xE5, 0xAE,                                                // writeWaitLoop:      MOV A, FLC; 
-  0x20, 0xE6, 0xFB,                                          //                     JB ACC_SWBSY, writeWaitLoop; 
-  0xDE, 0xF1,                                                //                 DJNZ R6, writeLoop; 
-  0xDF, 0xEF,                                                //                 DJNZ R7, writeLoop; 
-                                                             //                 ; Done, fake a breakpoint 
-  0xA5                                                       //                 DB 0xA5; 
+  0x7D, 0xde /*FLASH_WORD_SIZE*/,                                     // writeLoop:          MOV R5, #imm;
+  0xE0,                                                      // writeWordLoop:          MOVX A, @DPTR;
+  0xA3,                                                      //                         INC DPTR;
+  0xF5, 0xAF,                                                //                         MOV FWDATA, A;
+  0xDD, 0xFA,                                                //                     DJNZ R5, writeWordLoop;
+                                                             //                     ; Wait for completion
+  0xE5, 0xAE,                                                // writeWaitLoop:      MOV A, FLC;
+  0x20, 0xE6, 0xFB,                                          //                     JB ACC_SWBSY, writeWaitLoop;
+  0xDE, 0xF1,                                                //                 DJNZ R6, writeLoop;
+  0xDF, 0xEF,                                                //                 DJNZ R7, writeLoop;
+                                                             //                 ; Done, fake a breakpoint
+  0xA5                                                       //                 DB 0xA5;
 };
 
 
@@ -433,17 +539,18 @@ const u8 flash_routine[] = {
 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&(MINFLASHPAGE_SIZE-1)){
     debugstr("Flash page address is not on a page boundary.  Aborting.");
     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);
   }
-  
+
   //Routine comes next
   //WRITE_XDATA_MEMORY(IN: 0xF000 + FLASH_PAGE_SIZE, sizeof(routine), routine);
   cc_write_xdata(0xF000+MAXFLASHPAGE_SIZE,
@@ -457,31 +564,30 @@ void cc_write_flash_page(u32 adr){
     debugstr("Ugly patching code failing in chipcon.c");
   cc_pokedatabyte(0xF000+MAXFLASHPAGE_SIZE+25,
                  flash_word_size);
-  
+
   //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.");
-  
+  //debugstr("Loaded bank info.");
+
   cc_set_pc(0xf000+MAXFLASHPAGE_SIZE);//execute code fragment
   cc_resume();
-  
-  debugstr("Executing.");
-  
-  
+
+  //debugstr("Executing.");
+
+
   while(!(cc_read_status()&CC_STATUS_CPUHALTED)){
-    P1OUT^=1;//blink LED while flashing
+    led_toggle();//blink LED while flashing
   }
-  
-  
-  debugstr("Done flashing.");
-  
-  P1OUT&=~1;//clear LED
+
+
+  //debugstr("Done flashing.");
+
+  led_off();
 }
 
 //! Read the PC
@@ -489,7 +595,7 @@ unsigned short cc_get_pc(){
   cmddata[0]=CCCMD_GET_PC; //0x28
   cccmd(1);
   ccread(2);
-  
+
   //Return the word.
   return cmddataword[0];
 }
@@ -565,12 +671,12 @@ unsigned char cc_peekcodebyte(unsigned long adr){
     hb=(adr>>8)&0x7F,
     toret=0;
   adr&=0x7FFF;
-  
+
   //MOV MEMCTR, (bank*16)+1
   cc_debug(3, 0x75, 0xC7, (bank<<4) + 1);
   //MOV DPTR, address
   cc_debug(3, 0x90, hb, lb);
-  
+
   //for each byte
   //CLR A
   cc_debug(2, 0xE4, 0, 0);
@@ -578,7 +684,7 @@ unsigned char cc_peekcodebyte(unsigned long adr){
   toret=cc_debug(3, 0x93, 0, 0);
   //INC DPTR
   //cc_debug(1, 0xA3, 0, 0);
-  
+
   return toret;
 }
 
@@ -589,14 +695,14 @@ unsigned char cc_pokedatabyte(unsigned int adr,
   unsigned char
     hb=(adr&0xFF00)>>8,
     lb=adr&0xFF;
-  
+
   //MOV DPTR, adr
   cc_debug(3, 0x90, hb, lb);
   //MOV A, val
   cc_debug(2, 0x74, val, 0);
   //MOVX @DPTR, A
   cc_debug(1, 0xF0, 0, 0);
-  
+
   return 0;
   /*
 DEBUG_INSTR(IN: 0x90, HIBYTE(address), LOBYTE(address), OUT: Discard);
@@ -613,7 +719,7 @@ unsigned char cc_peekdatabyte(unsigned int adr){
   unsigned char
     hb=(adr&0xFF00)>>8,
     lb=adr&0xFF;
-  
+
   //MOV DPTR, adr
   cc_debug(3, 0x90, hb, lb);
   //MOVX A, @DPTR