goodfet.msp430 selftest is working!

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@599 12e2690d-a6be-4b82-a7b7-67c4a43b65c8

diff --git a/client/goodfet.msp430 b/client/goodfet.msp430
index a250341..23f4d1e 100755 (executable)
--- a/client/goodfet.msp430
+++ b/client/goodfet.msp430
@@ -75,8 +75,7 @@ if(sys.argv[1]=="selftest"):
     entry=client.peek16(0xFFC0);
     print "Calling self-test at 0x%04x." %entry;
     client.MSP430setPC(entry);
     entry=client.peek16(0xFFC0);
     print "Calling self-test at 0x%04x." %entry;
     client.MSP430setPC(entry);

-    print "PC=%04x" % client.MSP430getreg(0);
-    client.MSP430releasecpu();
+    #client.MSP430releasecpu();

     
     import time;
     time.sleep(30)
     
     import time;
     time.sleep(30)

diff --git a/firmware/apps/jtag/jtag430.c b/firmware/apps/jtag/jtag430.c
index a35a40b..5a8da9a 100644 (file)
--- a/firmware/apps/jtag/jtag430.c
+++ b/firmware/apps/jtag/jtag430.c
@@ -51,9 +51,14 @@ void jtag430_haltcpu(){
 //! Release the CPU
 void jtag430_releasecpu(){
   CLRTCLK;
 //! Release the CPU
 void jtag430_releasecpu(){
   CLRTCLK;

+  debugstr("Releasing target MSP430.");
+  
+  /*

   jtag_ir_shift8(IR_CNTRL_SIG_16BIT);
   jtag_ir_shift8(IR_CNTRL_SIG_16BIT);

-  jtag_dr_shift16(0x2401);
-  jtag_ir_shift8(IR_ADDR_CAPTURE);
+  jtag_dr_shift16(0x2C01); //Apply reset.
+  jtag_dr_shift16(0x2401); //Release reset.
+  */
+  jtag_ir_shift8(IR_CNTRL_SIG_RELEASE);

   SETTCLK;
 }
 
   SETTCLK;
 }
 


@@ -324,6 +329,7 @@ void jtag430handle(unsigned char app,
    * for testing server.
    */
   while((i=jtag430_readmem(0xff0))==0xFFFF){
    * for testing server.
    */
   while((i=jtag430_readmem(0xff0))==0xFFFF){

+    debugstr("Reconnecting to target MSP430.");

     jtag430_start();
     P1OUT^=1;
   }
     jtag430_start();
     P1OUT^=1;
   }


@@ -428,7 +434,10 @@ void jtag430handle(unsigned char app,
     break;
   case JTAG430_SETPC:
     jtag430_haltcpu();
     break;
   case JTAG430_SETPC:
     jtag430_haltcpu();

+    debughex("Setting PC.");
+    debughex(cmddataword[0]);

     jtag430_setpc(cmddataword[0]);
     jtag430_setpc(cmddataword[0]);

+    jtag430_releasecpu();

     txdata(app,verb,0);
     break;
   case JTAG430_SETREG:
     txdata(app,verb,0);
     break;
   case JTAG430_SETREG: