Major JTAG430 and JTAG430X2 patching.

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

diff --git a/firmware/apps/jtag/jtag430x2.c b/firmware/apps/jtag/jtag430x2.c
index 85f3f19..265dae0 100644 (file)
--- a/firmware/apps/jtag/jtag430x2.c
+++ b/firmware/apps/jtag/jtag430x2.c
@@ -6,41 +6,29 @@
 #include "platform.h"
 #include "command.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(20);//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(10);//5
-  SETTST;
-  msdelay(10);//5
-  SETRST;
-  P5DIR&=~RST;
-  
-  delay(0xFFFF);
-  
-  //Perform a reset and disable watchdog.
-  return jtag430x2_jtagid();
-}
 
 //! Grab the core ID.
 unsigned int jtag430_coreid(){
@@ -185,18 +173,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;
   }
   
@@ -209,6 +198,7 @@ void jtag430x2handle(unsigned char app,
     
     //MSP430 or MSP430X
     if(jtagid==MSP430JTAGID){ 
+      //debugstr("ERROR, using JTAG430X2 instead of JTAG430!");
       jtag430mode=MSP430MODE;
       
       /* So the way this works is that a width of 20 does some
@@ -216,8 +206,8 @@ void jtag430x2handle(unsigned char app,
         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.
@@ -228,6 +218,7 @@ void jtag430x2handle(unsigned char app,
       
       jtag430_resettap();
       txdata(app,verb,1);
+      
       return;
     }else if(jtagid==MSP430X2JTAGID){
       jtag430mode=MSP430X2MODE;
@@ -248,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
+    
+    if(l<2) l=2;
     
-    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);
-      }
+    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;
@@ -286,7 +282,11 @@ 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:
 
@@ -297,7 +297,8 @@ void jtag430x2handle(unsigned char app,
     txdata(app,NOK,0);
     break;
   default:
-    jtaghandle(app,verb,len);
+    (*(jtag_app.handle))(app,verb,len);
   }
   jtag430_resettap();
 }
+