X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=firmware%2Fapps%2Fjtag%2Fjtag430x2.c;h=bdba2cbea33e3479e47c0df1d524a0efd964d53c;hb=002c3c7923311e13f0ff2fcdfb292aa1c94ebe89;hp=d0f5709348f497d69af6a90803cfdb843b94bb4d;hpb=d39e9b08dc3f689a6b6a53f73c0943385e053542;p=goodfet

diff --git a/firmware/apps/jtag/jtag430x2.c b/firmware/apps/jtag/jtag430x2.c
index d0f5709..bdba2cb 100644
--- a/firmware/apps/jtag/jtag430x2.c
+++ b/firmware/apps/jtag/jtag430x2.c
@@ -1,10 +1,6 @@
 /*! \file jtag430x2.c
   \author Travis Goodspeed <travis at radiantmachines.com>
-  
-  This is an implementation of the MSP430X2 JTAG protocol
-  for the GoodFET project at http://goodfet.sf.net/
-  
-  See the license file for details of proper use.
+  \brief MSP430X2 JTAG (20-bit)
 */
 
 #include "platform.h"
@@ -31,12 +27,12 @@ unsigned char jtag430x2_start(){
   
   //Entry sequence from Page 67 of SLAU265A for 4-wire MSP430 JTAG
   CLRRST;
-  delay(10);
+  delay(20);//10
   CLRTST;
 
-  delay(5);
+  delay(10);//5
   SETTST;
-  msdelay(5);
+  msdelay(10);//5
   SETRST;
   P5DIR&=~RST;
   
@@ -94,7 +90,7 @@ void jtag430x2_writemem(unsigned long adr,
 //! Read data from address
 unsigned int jtag430x2_readmem(unsigned long adr){
   unsigned int toret=0;
-  unsigned int tries=5;
+  //unsigned int tries=5;
   
   while(1){
     do{
@@ -190,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;
@@ -198,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.
@@ -209,6 +210,16 @@ void jtag430x2handle(unsigned char app,
     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;
     }else if(jtagid==MSP430X2JTAGID){
       jtag430mode=MSP430X2MODE;
       drwidth=20;
@@ -230,16 +241,8 @@ void jtag430x2handle(unsigned char app,
     blocks=(len>4?cmddata[4]:1);
     at=cmddatalong[0];
     
-    /*
-    cmddataword[0]=jtag430x2_readmem(at);
-    txdata(app,verb,2);
-    break;
-    */
-    
     len=0x80;
-    serial_tx(app);
-    serial_tx(verb);
-    serial_tx(len);
+    txhead(app,verb,len);
     
     while(blocks--){
       for(i=0;i<len;i+=2){