X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=firmware%2Fapps%2Fjtag%2Fjtag430x2.c;h=685484e4515655c7230e9f0d6e066c28f41974a5;hb=75c003d3ea88663bef3bd54535a228a1d814518f;hp=f499de2ce47a7f98dc08faaeb36a53d35460a5b6;hpb=b1ae86eaae79309b8993c505d85b915dcac546b9;p=goodfet

diff --git a/firmware/apps/jtag/jtag430x2.c b/firmware/apps/jtag/jtag430x2.c
index f499de2..685484e 100644
--- a/firmware/apps/jtag/jtag430x2.c
+++ b/firmware/apps/jtag/jtag430x2.c
@@ -5,42 +5,31 @@
 
 #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();
-  
-  //Known-good starting position.
-  //Might be unnecessary.
-  SETTST;
-  SETRST;
-  
-  delay(0xFFFF);
-  
-  //Entry sequence from Page 67 of SLAU265A for 4-wire MSP430 JTAG
-  CLRRST;
-  delay(20);//10
-  CLRTST;
 
-  delay(10);//5
-  SETTST;
-  msdelay(10);//5
-  SETRST;
-  P5DIR&=~RST;
-  
-  delay(0xFFFF);
-  
-  //Perform a reset and disable watchdog.
-  return jtag430x2_jtagid();
-}
+// 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"
+};
+
 
 //! Grab the core ID.
 unsigned int jtag430_coreid(){
@@ -83,7 +72,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 +82,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 +174,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;
   }
   
@@ -208,25 +199,7 @@ void jtag430x2handle(unsigned char app,
     
     //MSP430 or MSP430X
     if(jtagid==MSP430JTAGID){ 
-      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);
+      debugstr("ERROR, using JTAG430X2 instead of JTAG430!");
       return;
     }else if(jtagid==MSP430X2JTAGID){
       jtag430mode=MSP430X2MODE;
@@ -250,11 +223,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);
 	
@@ -275,7 +248,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],
@@ -288,13 +261,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();
 }
+