X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Fjtag%2Fjtag430x2.c;h=e49634679000aa620a88d734d0ec5b5a2cd74e51;hp=0de9a448acc2a5483d24fd7e9dfeffe9cdcff0a9;hb=4b2f28239ea1c0f76117e813fc8838f8a368d2bf;hpb=0fb25630e9970a4e6d18e190c484f654490565b0

diff --git a/firmware/apps/jtag/jtag430x2.c b/firmware/apps/jtag/jtag430x2.c
index 0de9a44..e496346 100644
--- 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();
-  P1OUT^=1;
   
   //Known-good starting position.
   //Might be unnecessary.
@@ -34,6 +33,7 @@ unsigned char jtag430x2_start(){
   CLRRST;
   delay(10);
   CLRTST;
+
   delay(5);
   SETTST;
   msdelay(5);
@@ -46,6 +46,52 @@ unsigned char jtag430x2_start(){
   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);
+}
+
+
+//! 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);
+
+    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
+  }
+
+
+  
+  return toret;
+}
+
 
 //! Handles classic MSP430 JTAG commands.  Forwards others to JTAG.
 void jtag430x2handle(unsigned char app,
@@ -58,15 +104,39 @@ void jtag430x2handle(unsigned char app,
     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;
+  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_READMEM:
-  case PEEK:
   case JTAG430_WRITEMEM:
   case POKE:
   case JTAG430_WRITEFLASH: