CVS: jtag/msp430 MSP430mspgcc.c,1.8,1.9 makefile,1.5,1.6

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

Modified Files:
	MSP430mspgcc.c makefile 
Log Message:
fix flash segment erase for address 0xfe00

Index: MSP430mspgcc.c
===================================================================
RCS file: /cvsroot/mspgcc/jtag/msp430/MSP430mspgcc.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -d -r1.8 -r1.9
--- MSP430mspgcc.c	26 Nov 2003 01:29:14 -0000	1.8
+++ MSP430mspgcc.c	20 Aug 2004 00:00:05 -0000	1.9
@@ -349,10 +349,10 @@
     switch (type) {
         case ERASE_SEGMENT:
         {
-            WORD segmentAddr;
+            LONG segmentAddr;
             WORD segmentSize;
             // Erase each of the segments.
-            for (segmentAddr = address; segmentAddr < address + length; segmentAddr += segmentSize) {
+            for (segmentAddr = address; segmentAddr < (address + length); segmentAddr += segmentSize) {
                 if ((result = eraseFlash(ERASE_SEGMENT, (WORD) segmentAddr)) != STATUS_OK) {
                     break;
                 }
@@ -360,14 +360,12 @@
                 // The segment size is dependent upon the adress.
                 if (segmentAddr < 0x1100) {
                     segmentSize = INFO_SEGMENT_SIZE;            // Information memory.
-                    continue;
-                }
-                if (segmentAddr < 0x1200) {
+                } else if (segmentAddr < 0x1200) {
                     segmentSize = FIRST_60K_SEGMENT_SIZE;       // The first segment of 60K devices is short.
-                    continue;
-                }
+                } else {
                 segmentSize = MAIN_SEGMENT_SIZE;                // Main memory.
             }
+            }
             if (result != STATUS_ERROR) {
                 //check the entire length for erasure.
                 result = VerifyPSA(address, length/2, 0);

Index: makefile
===================================================================
RCS file: /cvsroot/mspgcc/jtag/msp430/makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -d -r1.5 -r1.6
--- makefile	1 Mar 2004 02:33:20 -0000	1.5
+++ makefile	20 Aug 2004 00:00:05 -0000	1.6
@@ -11,7 +11,7 @@
 
 #simple Windows detection over the environment
 ifdef WINDIR
-    LNOPTS   = -mno-cygwin -mdll -static -s MSP430mspgcc.def
+    LNOPTS   = -mno-cygwin -mdll -static -s MSP430mspgcc.def -Wl,--enable-stdcall-fixup
     CFLAGS  += -mno-cygwin -mdll
     dependency_libs = -L../hardware_access -lHIL
     targets = MSP430mspgcc.dll libMSP430mspgcc.a



-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285