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

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

Modified Files:
	funclets.c 
Log Message:
- unify result value passing -> use registers, not CCR0

Index: funclets.c
===================================================================
RCS file: /cvsroot/mspgcc/jtag/msp430/funclets.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -d -r1.13 -r1.14
--- funclets.c	28 Dec 2005 18:20:13 -0000	1.13
+++ funclets.c	30 Dec 2005 03:32:35 -0000	1.14
@@ -29,6 +29,7 @@
     WORD blocksize;
     WORD done = 0;
     WORD tries;
+    WORD funclet_result;
     WORD *code = malloc(ramsize);
     if (code == NULL)   return STATUS_ERROR;                            //Out of memory
         
@@ -51,11 +52,17 @@
             }
         }
         if (res != STATUS_OK) break;
-        if (ReadMem(F_WORD, CCR0_ADDR)) {                               //read CCR0, it's used as return value
+        if (STATUS_OK == GetReg(15, &funclet_result)) {
+            if (funclet_result) {                               //read CCR0, it's used as return value
             MSP430_Log(1, "funclets: programFlash: Flash write error in block 0x%04x\n", address);
             res = STATUS_ERROR;
             break;
         }
+        } else {
+            MSP430_Log(1, "funclets: programFlash: failed to read funclet answer\n");
+            res = STATUS_ERROR;
+            break;
+        }
         //~ MSP430_Log(2, "block 0x%04x OK\n", address);
         address += blocksize;                                           //adjust for next block
         done += blocksize;                                              //advance in source buffer



-------------------------------------------------------
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