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 685484e..265dae0 100644 (file)
--- a/firmware/apps/jtag/jtag430x2.c
+++ b/firmware/apps/jtag/jtag430x2.c
@@ -9,25 +9,24 @@
 #include "jtag430x2.h"
 
 void jtag430x2_handle_fn( uint8_t const app,
-                                                 uint8_t const verb,
-                                                 uint32_t const len);
+                         uint8_t const verb,
+                         uint32_t const len);
 
 
 // define the jtag430x2 app's app_t
 app_t const jtag430x2_app = {
-
-       /* app number */
-       JTAG430X2,
-
-       /* handle fn */
-       jtag430x2_handle_fn,
-
-       /* name */
-       "JTAG430X2",
-
-       /* desc */
-       "\tThe JTAG430X2 app extends the basic JTAG app with support\n"
-       "\tfor 20-bit MSP430 devices.\n"
+  /* app number */
+  JTAG430X2,
+  
+  /* handle fn */
+  jtag430x2_handle_fn,
+  
+  /* name */
+  "JTAG430X2",
+  
+  /* desc */
+  "\tThe JTAG430X2 app extends the basic JTAG app with support\n"
+  "\tfor 20-bit MSP430X2 devices, such as the MSP430F5xx Family.\n"
 };
 
 
@@ -199,7 +198,27 @@ void jtag430x2_handle_fn( uint8_t const app,
     
     //MSP430 or MSP430X
     if(jtagid==MSP430JTAGID){ 
-      debugstr("ERROR, using JTAG430X2 instead of JTAG430!");
+      //debugstr("ERROR, using JTAG430X2 instead of JTAG430!");
+      jtag430mode=MSP430MODE;
+      
+      /* 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;
@@ -220,23 +239,28 @@ void jtag430x2_handle_fn( uint8_t const app,
     break;
   case JTAG430_READMEM:
   case PEEK:
-    blocks=(len>4?cmddata[4]:1);
     at=cmddatalong[0];
     
-    l=0x80;
-    txhead(app,verb,l);
+    //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<l;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;
@@ -258,7 +282,11 @@ void jtag430x2_handle_fn( uint8_t const 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: