Support for debugging strings, closer to a clean MSP430X2 implementation.

[goodfet] / firmware / apps / jtag / jtag430x2.c

diff --git a/firmware/apps/jtag/jtag430x2.c b/firmware/apps/jtag/jtag430x2.c
index 965c262..b508f0b 100644 (file)
--- a/firmware/apps/jtag/jtag430x2.c
+++ b/firmware/apps/jtag/jtag430x2.c
@@ -94,39 +94,40 @@ 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;
   
-  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
-    }
+  while(1){
+    do{
+      jtag_ir_shift8(IR_CNTRL_SIG_CAPTURE);
+    }while(!(jtag_dr_shift16(0) & 0x0301));
     
-    jtag_ir_shift8(IR_ADDR_16BIT);
-    jtag_dr_shift20(adr); //20
-
-    jtag_ir_shift8(IR_DATA_TO_ADDR);
-    SETTCLK;
-    CLRTCLK;
-    toret = jtag_dr_shift16(0x0000);
-    
-    SETTCLK;
-    
-    //Cycle a bit.
-    CLRTCLK;
-    SETTCLK;
-  }else{
-    return 0xBABE;
+    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
+      }
+      
+      jtag_ir_shift8(IR_ADDR_16BIT);
+      jtag_dr_shift20(adr); //20
+      
+      jtag_ir_shift8(IR_DATA_TO_ADDR);
+      SETTCLK;
+      CLRTCLK;
+      toret = jtag_dr_shift16(0x0000);
+      
+      SETTCLK;
+      
+      //Cycle a bit.
+      CLRTCLK;
+      SETTCLK;
+      return toret;
+    }
   }
-  
-  return toret;
+  //return toret;
 }
 
 //! Syncs a POR.