X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=firmware%2Fapps%2Fjtag%2Fjtag430x2.c;h=4df9629ed0ec33e83245117475d2741ad4ecb14a;hb=ca48f48a3e03dfdac7dc8bf5a6375797146e22fb;hp=1acc6e12051953e7c5f7393d39c293b13e9bea64;hpb=f4a6b415e762bcdc560f3ea655851d16f483ea5a;p=goodfet

diff --git a/firmware/apps/jtag/jtag430x2.c b/firmware/apps/jtag/jtag430x2.c
index 1acc6e1..4df9629 100644
--- a/firmware/apps/jtag/jtag430x2.c
+++ b/firmware/apps/jtag/jtag430x2.c
@@ -5,7 +5,31 @@
 
 #include "platform.h"
 #include "command.h"
-#include "jtag.h"
+#include "jtag430.h"
+#include "jtag430x2.h"
+
+void jtag430x2_handle_fn( uint8_t const app,
+						  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"
+};
+
 
 unsigned char jtagid;
 
@@ -27,12 +51,12 @@ unsigned char jtag430x2_start(){
   
   //Entry sequence from Page 67 of SLAU265A for 4-wire MSP430 JTAG
   CLRRST;
-  delay(10);//10
+  delay(20);//10
   CLRTST;
 
-  delay(5);//5
+  delay(10);//5
   SETTST;
-  msdelay(5);//5
+  msdelay(10);//5
   SETRST;
   P5DIR&=~RST;
   
@@ -83,7 +107,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
   }
 }
 
@@ -93,19 +117,20 @@ unsigned int jtag430x2_readmem(unsigned long adr){
   //unsigned int tries=5;
   
   while(1){
-    do{
-      jtag_ir_shift8(IR_CNTRL_SIG_CAPTURE);
-    }while(!(jtag_dr_shift16(0) & 0x0301));
+    //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
-      }
+      
+      //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
@@ -184,18 +209,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,13 +229,28 @@ 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){ 
       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;
@@ -217,6 +258,7 @@ void jtag430x2handle(unsigned char app,
       jtag430mode=MSP430X2MODE;
       drwidth=20;
     }else{
+      debugstr("JTAG version unknown.");
       txdata(app,NOK,1);
       return;
     }
@@ -234,11 +276,11 @@ void jtag430x2handle(unsigned char app,
     blocks=(len>4?cmddata[4]:1);
     at=cmddatalong[0];
     
-    len=0x80;
-    txhead(app,verb,len);
+    l=0x80;
+    txhead(app,verb,l);
     
     while(blocks--){
-      for(i=0;i<len;i+=2){
+      for(i=0;i<l;i+=2){
 	jtag430_resettap();
 	delay(10);
 	
@@ -259,7 +301,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],
@@ -272,13 +314,16 @@ void jtag430x2handle(unsigned char app,
   case JTAG430_HALTCPU:  
   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();
 }
+