CVS: msp430-libc/include io.h, 1.16, 1.17 iomacros.h, 1.33, 1.34 msp430x24x.h, 1.2, 1.3 msp430x24x1.h, 1.2, 1.3

Update of /cvsroot/mspgcc/msp430-libc/include
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4426/include

Modified Files:
	io.h iomacros.h msp430x24x.h msp430x24x1.h 
Log Message:
add support for 24x(1)


Index: io.h
===================================================================
RCS file: /cvsroot/mspgcc/msp430-libc/include/io.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -d -r1.16 -r1.17
--- io.h	11 Jul 2007 18:04:34 -0000	1.16
+++ io.h	15 May 2008 00:54:32 -0000	1.17
@@ -86,7 +86,7 @@
 #elif defined(__MSP430_2330__) || defined(__MSP430_2350__) || defined(__MSP430_2370__)
 #include <msp430x23x0.h>
 
-#elif defined(__MSP430_247__) || defined(__MSP430_248__) || defined(__MSP430_249__)
+#elif defined(__MSP430_247__) || defined(__MSP430_248__) || defined(__MSP430_249__) || defined(__MSP430_2410__)
 #include <msp430x24x.h>
 
 #elif defined(__MSP430_2471__) || defined(__MSP430_2481__) || defined(__MSP430_2491__)

Index: iomacros.h
===================================================================
RCS file: /cvsroot/mspgcc/msp430-libc/include/iomacros.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -w -d -r1.33 -r1.34
--- iomacros.h	2 Oct 2007 23:44:55 -0000	1.33
+++ iomacros.h	15 May 2008 00:54:32 -0000	1.34
@@ -216,6 +216,10 @@
 
 #define sfrw(x,x_) sfrw_(x,x_)
 
+#if defined(__MSP430X__)
+#define sfra(x,x_) x=x_
+#endif
+
 /***** USEFUL MACRO DEFINITIONS *********/
 
 /* No operation */

Index: msp430x24x.h
===================================================================
RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x24x.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- msp430x24x.h	29 Dec 2007 17:16:57 -0000	1.2
+++ msp430x24x.h	15 May 2008 00:54:32 -0000	1.3
@@ -35,7 +35,7 @@
 
 #include <msp430/mpy.h>
 #include <msp430/gpio.h>
-#include <msp430/usart.h>
+#include <msp430/usci.h>
 #include <msp430/timera.h>
 #include <msp430/timerb.h>
 #include <msp430/basic_clock.h>
@@ -86,15 +86,15 @@
 #define TAG_EMPTY              (0xFE)    /* Tag for Empty Data Field in Calibration Data */
 
 #ifndef __DisableCalData
-#define TLV_CHECKSUM_          (0x10C0)  /* TLV CHECK SUM */
+#define TLV_CHECKSUM_          0x10C0    /* TLV CHECK SUM */
 sfrw(TLV_CHECKSUM, TLV_CHECKSUM_);
-#define TLV_DCO_30_TAG_        (0x10F6)  /* TLV TAG_DCO30 TAG */
+#define TLV_DCO_30_TAG_        0x10F6    /* TLV TAG_DCO30 TAG */
 sfrb(TLV_DCO_30_TAG, TLV_DCO_30_TAG_);
-#define TLV_DCO_30_LEN_        (0x10F7)  /* TLV TAG_DCO30 LEN */
+#define TLV_DCO_30_LEN_        0x10F7    /* TLV TAG_DCO30 LEN */
 sfrb(TLV_DCO_30_LEN, TLV_DCO_30_LEN_);
-#define TLV_ADC12_1_TAG_       (0x10DA)  /* TLV ADC12_1 TAG */
+#define TLV_ADC12_1_TAG_       0x10DA    /* TLV ADC12_1 TAG */
 sfrb(TLV_ADC12_1_TAG, TLV_ADC12_1_TAG_);
-#define TLV_ADC12_1_LEN_       (0x10DB)  /* TLV ADC12_1 LEN */
+#define TLV_ADC12_1_LEN_       0x10DB    /* TLV ADC12_1 LEN */
 sfrb(TLV_ADC12_1_LEN, TLV_ADC12_1_LEN_);
 #endif
 

Index: msp430x24x1.h
===================================================================
RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x24x1.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- msp430x24x1.h	29 Dec 2007 17:17:48 -0000	1.2
+++ msp430x24x1.h	15 May 2008 00:54:33 -0000	1.3
@@ -34,7 +34,7 @@
 
 #include <msp430/mpy.h>
 #include <msp430/gpio.h>
-#include <msp430/usart.h>
+#include <msp430/usci.h>
 #include <msp430/timera.h>
 #include <msp430/timerb.h>
 #include <msp430/basic_clock.h>
@@ -85,11 +85,11 @@
 #define TAG_EMPTY              (0xFE)    /* Tag for Empty Data Field in Calibration Data */
 
 #ifndef __DisableCalData
-#define TLV_CHECKSUM_          (0x10C0)  /* TLV CHECK SUM */
+#define TLV_CHECKSUM_          0x10C0    /* TLV CHECK SUM */
 sfrw(TLV_CHECKSUM, TLV_CHECKSUM_);
-#define TLV_DCO_30_TAG_        (0x10F6)  /* TLV TAG_DCO30 TAG */
+#define TLV_DCO_30_TAG_        0x10F6    /* TLV TAG_DCO30 TAG */
 sfrb(TLV_DCO_30_TAG, TLV_DCO_30_TAG_);
-#define TLV_DCO_30_LEN_        (0x10F7)  /* TLV TAG_DCO30 LEN */
+#define TLV_DCO_30_LEN_        0x10F7    /* TLV TAG_DCO30 LEN */
 sfrb(TLV_DCO_30_LEN, TLV_DCO_30_LEN_);
 #endif
 


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft 
Defy all challenges. Microsoft(R) Visual Studio 2008. 
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/