X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=firmware%2Fapps%2Fjtag%2Fjtag430x2.c;h=ad2801fa10c9c4d0cba46eb4b0379ccd99897619;hb=83a29da6187d81430105b48abee72b7a59084369;hp=d0043ac7fbb3d66766b7832f67ddb7b5b1745c48;hpb=84de7aa6b2ef9e83c7d36c3b2fed78933113c38a;p=goodfet

diff --git a/firmware/apps/jtag/jtag430x2.c b/firmware/apps/jtag/jtag430x2.c
index d0043ac..ad2801f 100644
--- a/firmware/apps/jtag/jtag430x2.c
+++ b/firmware/apps/jtag/jtag430x2.c
@@ -27,12 +27,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;
   
@@ -186,7 +186,7 @@ unsigned int jtag430x2_fusecheck(){
 //! Handles MSP430X2 JTAG commands.  Forwards others to JTAG.
 void jtag430x2handle(unsigned char app,
 		     unsigned char verb,
-		     unsigned char len){
+		     unsigned long len){
   register char blocks;
   
   unsigned int i,val;
@@ -203,13 +203,20 @@ 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;
+      
+      //Perform a reset and disable watchdog.
+      jtag430_por();
+      jtag430_writemem(0x120,0x5a80);//disable watchdog
+      
+      jtag430_haltcpu();
+      
       jtag430_resettap();
       txdata(app,verb,1);
       return;