Reading seems to work on MSP430X2, but some regions seem to be unpopulated.

[goodfet] / firmware / apps / jtag / jtag430x2.c

diff --git a/firmware/apps/jtag/jtag430x2.c b/firmware/apps/jtag/jtag430x2.c
index 0de9a44..44d4941 100644 (file)
--- a/firmware/apps/jtag/jtag430x2.c
+++ b/firmware/apps/jtag/jtag430x2.c
@@ -21,7 +21,6 @@ unsigned char jtag430x2_jtagid(){
 //! Start JTAG, take pins
 unsigned char jtag430x2_start(){
   jtagsetup();
 //! Start JTAG, take pins
 unsigned char jtag430x2_start(){
   jtagsetup();

-  P1OUT^=1;

   
   //Known-good starting position.
   //Might be unnecessary.
   
   //Known-good starting position.
   //Might be unnecessary.


@@ -34,6 +33,7 @@ unsigned char jtag430x2_start(){
   CLRRST;
   delay(10);
   CLRTST;
   CLRRST;
   delay(10);
   CLRTST;

+

   delay(5);
   SETTST;
   msdelay(5);
   delay(5);
   SETTST;
   msdelay(5);


@@ -46,29 +46,136 @@ unsigned char jtag430x2_start(){
   return jtag430x2_jtagid();
 }
 
   return jtag430x2_jtagid();
 }
 

+unsigned int jtag430_coreid(){
+  jtag_ir_shift8(IR_COREIP_ID);
+  return jtag_dr_shift16(0);
+}
+
+unsigned long jtag430_deviceid(){
+  jtag_ir_shift8(IR_DEVICE_ID);
+  return jtag_dr_shift20(0);
+}
+
+
+//! Write data to address
+unsigned int jtag430x2_writemem(unsigned long adr,
+                               unsigned long data){
+  jtag_ir_shift8(IR_CNTRL_SIG_CAPTURE);
+  if(jtag_ir_shift8(0) & 0x0301){
+    CLRTCLK;
+    jtag_ir_shift8(IR_CNTRL_SIG_16BIT);
+    if(adr>=0x100)
+      jtag_ir_shift8(0x0500);//word mode
+    else
+      jtag_ir_shift8(0x0510);//byte mode
+    jtag_ir_shift8(IR_ADDR_16BIT);
+    jtag_dr_shift20(adr);
+    
+    SETTCLK;
+    
+    jtag_ir_shift8(IR_DATA_TO_ADDR);
+    jtag_ir_shift8(data);//16 word
+
+    CLRTCLK;
+    jtag_ir_shift8(IR_CNTRL_SIG_16BIT);
+    jtag_ir_shift8(0x0501);
+    SETTCLK;
+
+    CLRTCLK;
+    SETTCLK;
+    //init state
+  }else{
+    while(1) P1OUT^=1; //loop if locked up
+  }
+}
+
+//! Read data from address
+unsigned int jtag430x2_readmem(unsigned long adr){
+  unsigned int toret=0;
+
+  jtag_ir_shift8(IR_CNTRL_SIG_CAPTURE);
+  if(jtag_dr_shift16(0) & 0x0301){
+    // Read Memory                                                                                                                                                                 
+    CLRTCLK;
+    jtag_ir_shift8(IR_CNTRL_SIG_16BIT);
+    if(adr>=0x100){
+      jtag_dr_shift16(0x0501);//word read
+    }else{
+      jtag_dr_shift16(0x0511);//byte read
+    }
+    jtag_ir_shift8(IR_ADDR_16BIT);
+    jtag_dr_shift20(adr); //20
+
+    jtag_ir_shift8(IR_DATA_TO_ADDR);
+    SETTCLK;
+    CLRTCLK;
+    toret = jtag_dr_shift16(0x0000);
+    
+    SETTCLK;
+    // one or more cycle, so CPU is driving correct MAB
+
+    CLRTCLK;
+    SETTCLK;
+    // Processor is now again in Init State
+  }else{
+    return 0xDEAD;
+  }
+  
+  return toret;
+}
+

 
 //! Handles classic MSP430 JTAG commands.  Forwards others to JTAG.
 void jtag430x2handle(unsigned char app,
                   unsigned char verb,
                   unsigned char len){
 
 //! Handles classic MSP430 JTAG commands.  Forwards others to JTAG.
 void jtag430x2handle(unsigned char app,
                   unsigned char verb,
                   unsigned char len){

-  
+  jtag430_resettap();

   switch(verb){
   case START:
     //Enter JTAG mode.
     do cmddata[0]=jtag430x2_start();
     while(cmddata[0]==00 || cmddata[0]==0xFF);
     
   switch(verb){
   case START:
     //Enter JTAG mode.
     do cmddata[0]=jtag430x2_start();
     while(cmddata[0]==00 || cmddata[0]==0xFF);
     

+    //MSP430 or MSP430X
+    if(jtagid==MSP430JTAGID){ 
+      jtag430mode=MSP430MODE;
+      drwidth=16;
+    }else if(jtagid==MSP430X2JTAGID){
+      jtag430mode=MSP430X2MODE;
+      drwidth=20;
+    }else{
+      txdata(app,NOK,1);
+      return;
+    }
+    

     //TAP setup, fuse check
     //jtag430_resettap();
     txdata(app,verb,1);
     break;
     //TAP setup, fuse check
     //jtag430_resettap();
     txdata(app,verb,1);
     break;

+  case JTAG430_READMEM:
+  case PEEK:
+    cmddataword[0]=jtag430x2_readmem(cmddataword[0]);
+    //cmddataword[0]=jtag430_readmem(cmddataword[0]);
+    txdata(app,verb,2);
+    break;
+  case JTAG430_COREIP_ID:
+    cmddataword[0]=jtag430_coreid();
+    txdata(app,verb,2);
+    break;
+  case JTAG430_DEVICE_ID:
+    cmddatalong[0]=jtag430_deviceid();
+    txdata(app,verb,4);
+    break;

   case JTAG430_HALTCPU:
   case JTAG430_RELEASECPU:
   case JTAG430_SETINSTRFETCH:
   case JTAG430_HALTCPU:
   case JTAG430_RELEASECPU:
   case JTAG430_SETINSTRFETCH:

-  case JTAG430_READMEM:
-  case PEEK:

   case JTAG430_WRITEMEM:
   case POKE:
   case JTAG430_WRITEMEM:
   case POKE:

+    jtag430x2_writemem(cmddataword[0],
+                      cmddataword[1]);
+    cmddataword[0]=jtag430x2_readmem(cmddataword[0]);
+    txdata(app,verb,2);
+    break;

   case JTAG430_WRITEFLASH:
   case JTAG430_ERASEFLASH:
   case JTAG430_SETPC:
   case JTAG430_WRITEFLASH:
   case JTAG430_ERASEFLASH:
   case JTAG430_SETPC: