Cleaning MSP430X2 client.
[goodfet] / firmware / apps / jtag / jtag430x2.c
index 1acc6e1..16eeb94 100644 (file)
@@ -5,42 +5,30 @@
 
 #include "platform.h"
 #include "command.h"
-#include "jtag.h"
+#include "jtag430.h"
+#include "jtag430x2.h"
 
-unsigned char jtagid;
+void jtag430x2_handle_fn( uint8_t const app,
+                         uint8_t const verb,
+                         uint32_t const len);
 
-//! Get the JTAG ID
-unsigned char jtag430x2_jtagid(){
-  jtag430_resettap();
-  return jtagid=jtag_ir_shift8(IR_BYPASS);
-}
-//! Start JTAG, take pins
-unsigned char jtag430x2_start(){
-  jtagsetup();
+
+// define the jtag430x2 app's app_t
+app_t const jtag430x2_app = {
+  /* app number */
+  JTAG430X2,
   
-  //Known-good starting position.
-  //Might be unnecessary.
-  SETTST;
-  SETRST;
+  /* handle fn */
+  jtag430x2_handle_fn,
   
-  delay(0xFFFF);
+  /* name */
+  "JTAG430X2",
   
-  //Entry sequence from Page 67 of SLAU265A for 4-wire MSP430 JTAG
-  CLRRST;
-  delay(10);//10
-  CLRTST;
+  /* desc */
+  "\tThe JTAG430X2 app extends the basic JTAG app with support\n"
+  "\tfor 20-bit MSP430X2 devices, such as the MSP430F5xx Family.\n"
+};
 
-  delay(5);//5
-  SETTST;
-  msdelay(5);//5
-  SETRST;
-  P5DIR&=~RST;
-  
-  delay(0xFFFF);
-  
-  //Perform a reset and disable watchdog.
-  return jtag430x2_jtagid();
-}
 
 //! Grab the core ID.
 unsigned int jtag430_coreid(){
@@ -83,7 +71,7 @@ void jtag430x2_writemem(unsigned long adr,
     SETTCLK;
     //init state
   }else{
-    while(1) P1OUT^=1; //loop if locked up
+    while(1) PLEDOUT^=PLEDPIN; //loop if locked up
   }
 }
 
@@ -101,11 +89,8 @@ unsigned int jtag430x2_readmem(unsigned long adr){
       // 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_dr_shift16(0x0501);//word read
       
       jtag_ir_shift8(IR_ADDR_16BIT);
       jtag_dr_shift20(adr); //20
@@ -122,6 +107,8 @@ unsigned int jtag430x2_readmem(unsigned long adr){
       SETTCLK;
       return toret;
     }
+    
+    return 0xdead;
   }
   //return toret;
 }
@@ -130,7 +117,7 @@ unsigned int jtag430x2_readmem(unsigned long adr){
 unsigned int jtag430x2_syncpor(){
   jtag_ir_shift8(IR_CNTRL_SIG_16BIT);
   jtag_dr_shift16(0x1501); //JTAG mode
-  while(!(jtag_dr_shift16(0) & 0x200));
+  while(!(jtag_dr_shift16(0) & 0x200));  //0x100 or 0x200?
   return jtag430x2_por();
 }
 
@@ -184,18 +171,19 @@ unsigned int jtag430x2_fusecheck(){
 
 
 //! Handles MSP430X2 JTAG commands.  Forwards others to JTAG.
-void jtag430x2handle(unsigned char app,
-                    unsigned char verb,
-                    unsigned long len){
+void jtag430x2_handle_fn( uint8_t const app,
+                                                 uint8_t const verb,
+                                                 uint32_t const len)
+{
   register char blocks;
   
   unsigned int i,val;
-  unsigned long at;
+  unsigned long at, l;
   
   //jtag430_resettap();
   
   if(verb!=START && jtag430mode==MSP430MODE){
-    jtag430handle(app,verb,len);
+    (*(jtag430_app.handle))(app,verb,len);
     return;
   }
   
@@ -203,24 +191,44 @@ void jtag430x2handle(unsigned char app,
   case START:
     //Enter JTAG mode.
     //do 
-      cmddata[0]=jtag430x2_start();
+    cmddata[0]=jtag430x2_start();
     //while(cmddata[0]==00 || cmddata[0]==0xFF);
     
     //MSP430 or MSP430X
     if(jtagid==MSP430JTAGID){ 
+      //debugstr("ERROR, using JTAG430X2 instead of JTAG430!");
       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;
     }
     
+    
+    
     jtag430x2_fusecheck();
         
     jtag430x2_syncpor();
@@ -231,23 +239,28 @@ void jtag430x2handle(unsigned char app,
     break;
   case JTAG430_READMEM:
   case PEEK:
-    blocks=(len>4?cmddata[4]:1);
     at=cmddatalong[0];
     
-    len=0x80;
-    txhead(app,verb,len);
+    //Fetch large blocks for bulk fetches,
+    //small blocks for individual peeks.
+    if(len>5)
+      l=(cmddataword[2]);//always even.
+    else
+      l=2;
+    l&=~1;//clear lsbit
     
-    while(blocks--){
-      for(i=0;i<len;i+=2){
-       jtag430_resettap();
-       delay(10);
-       
-       val=jtag430x2_readmem(at);
-               
-       at+=2;
-       serial_tx(val&0xFF);
-       serial_tx((val&0xFF00)>>8);
-      }
+    if(l<2) l=2;
+    
+    txhead(app,verb,l);
+    for(i=0;i<l;i+=2){
+      //jtag430_resettap();
+      //delay(10);
+      
+      val=jtag430x2_readmem(at);
+      
+      at+=2;
+      serial_tx(val&0xFF);
+      serial_tx((val&0xFF00)>>8);
     }
     
     break;
@@ -259,7 +272,7 @@ void jtag430x2handle(unsigned char app,
     cmddatalong[0]=jtag430_deviceid();
     txdata(app,verb,4);
     break;
-
+  case JTAG430_WRITEFLASH:
   case JTAG430_WRITEMEM:
   case POKE:
     jtag430x2_writemem(cmddatalong[0],
@@ -269,16 +282,23 @@ void jtag430x2handle(unsigned char app,
     break;
 
     //unimplemented functions
-  case JTAG430_HALTCPU:  
+  case JTAG430_HALTCPU:
+    //jtag430x2_haltcpu();
+    debugstr("Warning, not trying to halt for lack of code.");
+    txdata(app,verb,0);
+    break;
   case JTAG430_RELEASECPU:
   case JTAG430_SETINSTRFETCH:
-  case JTAG430_WRITEFLASH:
+
   case JTAG430_ERASEFLASH:
   case JTAG430_SETPC:
+    debugstr("This function is not yet implemented for MSP430X2.");
+    debughex(verb);
     txdata(app,NOK,0);
     break;
   default:
-    jtaghandle(app,verb,len);
+    (*(jtag_app.handle))(app,verb,len);
   }
   jtag430_resettap();
 }
+