X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Fjtag%2Fjtag430x2.c;h=f499de2ce47a7f98dc08faaeb36a53d35460a5b6;hp=965c2626eef287344aaff2bed93d6b53dda390a4;hb=5c029aa0c4f7573d9fa49beefe6e887dee2b25f9;hpb=1283fdb830f9ecd0e27e10ef66927562aff674a7

diff --git a/firmware/apps/jtag/jtag430x2.c b/firmware/apps/jtag/jtag430x2.c
index 965c262..f499de2 100644
--- a/firmware/apps/jtag/jtag430x2.c
+++ b/firmware/apps/jtag/jtag430x2.c
@@ -1,10 +1,6 @@
 /*! \file jtag430x2.c
   \author Travis Goodspeed <travis at radiantmachines.com>
-  
-  This is an implementation of the MSP430X2 JTAG protocol
-  for the GoodFET project at http://goodfet.sf.net/
-  
-  See the license file for details of proper use.
+  \brief MSP430X2 JTAG (20-bit)
 */
 
 #include "platform.h"
@@ -31,12 +27,12 @@ unsigned char jtag430x2_start(){
   
   //Entry sequence from Page 67 of SLAU265A for 4-wire MSP430 JTAG
   CLRRST;
-  delay(10);
+  delay(20);//10
   CLRTST;
 
-  delay(5);
+  delay(10);//5
   SETTST;
-  msdelay(5);
+  msdelay(10);//5
   SETRST;
   P5DIR&=~RST;
   
@@ -94,39 +90,40 @@ void jtag430x2_writemem(unsigned long adr,
 //! Read data from address
 unsigned int jtag430x2_readmem(unsigned long adr){
   unsigned int toret=0;
+  //unsigned int tries=5;
   
-  do{
-    jtag_ir_shift8(IR_CNTRL_SIG_CAPTURE);
-  }while(!(jtag_dr_shift16(0) & 0x0301));
-  
-  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);
+  while(1){
+    do{
+      jtag_ir_shift8(IR_CNTRL_SIG_CAPTURE);
+    }while(!(jtag_dr_shift16(0) & 0x0301));
     
-    SETTCLK;
-    
-    //Cycle a bit.
-    CLRTCLK;
-    SETTCLK;
-  }else{
-    return 0xBABE;
+    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;
+      
+      //Cycle a bit.
+      CLRTCLK;
+      SETTCLK;
+      return toret;
+    }
   }
-  
-  return toret;
+  //return toret;
 }
 
 //! Syncs a POR.
@@ -189,7 +186,7 @@ unsigned int jtag430x2_fusecheck(){
 //! Handles MSP430X2 JTAG commands.  Forwards others to JTAG.
 void jtag430x2handle(unsigned char app,
 		     unsigned char verb,
-		     unsigned char len){
+		     unsigned long len){
   register char blocks;
   
   unsigned int i,val;
@@ -197,20 +194,45 @@ void jtag430x2handle(unsigned char app,
   
   //jtag430_resettap();
   
+  if(verb!=START && jtag430mode==MSP430MODE){
+    jtag430handle(app,verb,len);
+    return;
+  }
+  
   switch(verb){
   case START:
     //Enter JTAG mode.
-    do cmddata[0]=jtag430x2_start();
-    while(cmddata[0]==00 || cmddata[0]==0xFF);
+    //do 
+    cmddata[0]=jtag430x2_start();
+    //while(cmddata[0]==00 || cmddata[0]==0xFF);
     
     //MSP430 or MSP430X
     if(jtagid==MSP430JTAGID){ 
       jtag430mode=MSP430MODE;
-      drwidth=16;
+      
+      /* So the way this works is that a width of 20 does some
+	 backward-compatibility finagling, causing the correct value
+	 to be exchanged for addresses on 16-bit chips as well as the
+	 new MSP430X chips.  (This has only been verified on the
+	 MSP430F2xx family.  TODO verify for others.)
+       */
+
+      drwidth=20;
+      
+      //Perform a reset and disable watchdog.
+      jtag430_por();
+      jtag430_writemem(0x120,0x5a80);//disable watchdog
+      
+      jtag430_haltcpu();
+      
+      jtag430_resettap();
+      txdata(app,verb,1);
+      return;
     }else if(jtagid==MSP430X2JTAGID){
       jtag430mode=MSP430X2MODE;
       drwidth=20;
     }else{
+      debugstr("JTAG version unknown.");
       txdata(app,NOK,1);
       return;
     }
@@ -228,16 +250,8 @@ void jtag430x2handle(unsigned char app,
     blocks=(len>4?cmddata[4]:1);
     at=cmddatalong[0];
     
-    /*
-    cmddataword[0]=jtag430x2_readmem(at);
-    txdata(app,verb,2);
-    break;
-    */
-    
     len=0x80;
-    serial_tx(app);
-    serial_tx(verb);
-    serial_tx(len);
+    txhead(app,verb,len);
     
     while(blocks--){
       for(i=0;i<len;i+=2){
@@ -261,11 +275,7 @@ void jtag430x2handle(unsigned char app,
     cmddatalong[0]=jtag430_deviceid();
     txdata(app,verb,4);
     break;
-  case JTAG430_HALTCPU:
-    //jtag430x2_haltcpu();
-    break;
-  case JTAG430_RELEASECPU:
-  case JTAG430_SETINSTRFETCH:
+
   case JTAG430_WRITEMEM:
   case POKE:
     jtag430x2_writemem(cmddatalong[0],
@@ -273,9 +283,16 @@ void jtag430x2handle(unsigned char app,
     cmddataword[0]=jtag430x2_readmem(cmddatalong[0]);
     txdata(app,verb,2);
     break;
+
+    //unimplemented functions
+  case JTAG430_HALTCPU:  
+  case JTAG430_RELEASECPU:
+  case JTAG430_SETINSTRFETCH:
   case JTAG430_WRITEFLASH:
   case JTAG430_ERASEFLASH:
   case JTAG430_SETPC:
+    txdata(app,NOK,0);
+    break;
   default:
     jtaghandle(app,verb,len);
   }