CVS: jtag/msp430 funclets.c,1.14,1.15

Update of /cvsroot/mspgcc/jtag/msp430
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6857/jtag/msp430

Modified Files:
	funclets.c 
Log Message:
- improve behaviour on F12x devices (funclets could not always be stopped successfully after a timeout)

Index: funclets.c
===================================================================
RCS file: /cvsroot/mspgcc/jtag/msp430/funclets.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -d -r1.14 -r1.15
--- funclets.c	30 Dec 2005 03:32:35 -0000	1.14
+++ funclets.c	4 Jan 2006 11:13:46 -0000	1.15
@@ -240,6 +240,7 @@
         HIL_JTAG_DR(0x2401, F_WORD);                    // Set device into JTAG mode + read
         //~ //HIL_JTAG_DR(CNTRL_SIG_TCE1 | CNTRL_SIG_CPU | (cntrlSig & 0xff), F_WORD);
         
+        HIL_JTAG_IR(IR_CNTRL_SIG_CAPTURE);
         for (i = 50; i > 0; i--) {
             cntrlSig = HIL_JTAG_DR(0x0000, F_WORD);
             MSP430_Log(6, "funclets: JTAG CNTRL: 0x%04x\n", cntrlSig);
@@ -427,12 +428,12 @@
             }
         }
         HIL_StopTimer();
-        // if runtime out parameter is given, exit iwth success, the caller can
+        // if runtime out parameter is given, exit with success, the caller can
         // test the runtime to see if its OK for him. Otherways fail.
         if (runtime != NULL) {
             *runtime = runtime_internal;
             MSP430_Log(3, "funclets: executeCodeSafe: timeout (%ums)\n", runtime_internal); //DEBUG
-            return STATUS_OK;
+            return syncCPU();               // Resume control of the CPU. Read/Write will be set.
         } else {
             MSP430_Log(1, "funclets: executeCodeSafe: wait failed (%ums)\n", runtime_internal); //DEBUG
             return STATUS_ERROR;
@@ -558,7 +559,7 @@
         if (runtime != NULL) {
             *runtime = runtime_internal;
             MSP430_Log(3, "funclets: executeCode: timeout (%ums)\n", runtime_internal); //DEBUG
-            return STATUS_OK;
+            return syncCPU();               // Resume control of the CPU. Read/Write will be set.
         } else {
             MSP430_Log(1, "funclets: executeCode: wait failed (%ums)\n", runtime_internal); //DEBUG
             return STATUS_ERROR;



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click