X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Fapps%2Fjtag%2Fjtag430x2.c;h=1a190190ed1c8dc222221a646eea243a999a05d9;hp=432c725b7ef2489a2dedc72252e90bd2803d6ed6;hb=321da65698145ce767c963c89a3f287bc3cff041;hpb=ae09939eb8c62c83f244527e7916cee5f9145e6c

diff --git a/firmware/apps/jtag/jtag430x2.c b/firmware/apps/jtag/jtag430x2.c
index 432c725..1a19019 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);
+  delay(10);//10
   CLRTST;
 
-  delay(5);
+  delay(5);//5
   SETTST;
-  msdelay(5);
+  msdelay(5);//5
   SETRST;
   P5DIR&=~RST;
   
@@ -194,6 +194,11 @@ void jtag430x2handle(unsigned char app,
   
   //jtag430_resettap();
   
+  if(verb!=START && jtag430mode==MSP430MODE){
+    jtag430handle(app,verb,len);
+    return;
+  }
+  
   switch(verb){
   case START:
     //Enter JTAG mode.
@@ -205,6 +210,9 @@ void jtag430x2handle(unsigned char app,
     if(jtagid==MSP430JTAGID){ 
       jtag430mode=MSP430MODE;
       drwidth=16;
+      jtag430_resettap();
+      txdata(app,verb,1);
+      return;
     }else if(jtagid==MSP430X2JTAGID){
       jtag430mode=MSP430X2MODE;
       drwidth=20;