CVS: msp430-libc/include io.h,1.13,1.14 msp430x20x1.h,1.2,1.3 msp430x20x2.h,1.2,1.3 msp430x20x3.h,1.2,1.3 msp430x22x4.h,1.1,1.2

Steve Underwood <[email protected]>
Newsgroups gmane.comp.hardware.texas-instruments.msp430.gcc.cvs
Message-ID <[email protected]> 
Update of /cvsroot/mspgcc/msp430-libc/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24282/msp430-libc/include

Modified Files:
	io.h msp430x20x1.h msp430x20x2.h msp430x20x3.h msp430x22x4.h 
Log Message:
Cleanup of a few errors


Index: io.h
===================================================================
RCS file: /cvsroot/mspgcc/msp430-libc/include/io.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -d -r1.13 -r1.14
--- io.h	11 Mar 2005 15:49:49 -0000	1.13
+++ io.h	5 Apr 2006 12:06:34 -0000	1.14
@@ -62,9 +62,21 @@
 #elif defined(__MSP430_167__) || defined(__MSP430_168__) || defined(__MSP430_169__) || defined(__MSP430_1610__) || defined(__MSP430_1611__) || defined(__MSP430_1612__)
 #include <msp430x16x.h>
 
+#elif defined(__MSP430_2001__) || defined(__MSP430_2011__)
+#include <msp430x20x1.h>
+
+#elif defined(__MSP430_2002__) || defined(__MSP430_2012__)
+#include <msp430x20x2.h>
+
+#elif defined(__MSP430_2003__) || defined(__MSP430_2013__)
+#include <msp430x20x3.h>
+
 #elif defined(__MSP430_2101__) || defined(__MSP430_2111__) || defined(__MSP430_2121__) || defined(__MSP430_2131__)
 #include <msp430x21x1.h>
 
+#elif defined(__MSP430_2234__) || defined(__MSP430_2254__) || defined(__MSP430_2274__)
+#include <msp430x22x4.h>
+
 #elif defined(__MSP430_311__) || defined(__MSP430_312__) || defined(__MSP430_313__) || defined(__MSP430_314__) || defined(__MSP430_315__)
 #include <msp430x31x.h>
 
@@ -98,6 +110,9 @@
 #elif defined(__MSP430_447__) || defined(__MSP430_448__) || defined(__MSP430_449__)
 #include <msp430x44x.h>
 
+#elif defined(__MSP430_G4616__) || defined(__MSP430_G4617__) || defined(__MSP430_G4618__) || defined(__MSP430_G4619__)
+#include <msp430xG461x.h>
+
 #else
 #warning "Unknown arch! Please check"
 #include <iomacros.h>

Index: msp430x20x1.h
===================================================================
RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x20x1.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- msp430x20x1.h	25 Jan 2006 16:27:31 -0000	1.2
+++ msp430x20x1.h	5 Apr 2006 12:06:34 -0000	1.3
@@ -54,21 +54,21 @@
 #ifndef __DisableCalData
 
 #define CALDCO_16MHZ_         0x10F8    /* DCOCTL  Calibration Data for 16MHz */
-sfrb(CALDCO_16MHZ, CALDCO_16MHZ_)
+sfrb(CALDCO_16MHZ, CALDCO_16MHZ_);
 #define CALBC1_16MHZ_         0x10F9    /* BCSCTL1 Calibration Data for 16MHz */
-sfrb(CALBC1_16MHZ, CALBC1_16MHZ_)
+sfrb(CALBC1_16MHZ, CALBC1_16MHZ_);
 #define CALDCO_12MHZ_         0x10FA    /* DCOCTL  Calibration Data for 12MHz */
-sfrb(CALDCO_12MHZ, CALDCO_12MHZ_)
+sfrb(CALDCO_12MHZ, CALDCO_12MHZ_);
 #define CALBC1_12MHZ_         0x10FB    /* BCSCTL1 Calibration Data for 12MHz */
-sfrb(CALBC1_12MHZ, CALBC1_12MHZ_)
+sfrb(CALBC1_12MHZ, CALBC1_12MHZ_);
 #define CALDCO_8MHZ_          0x10FC    /* DCOCTL  Calibration Data for 8MHz */
-sfrb(CALDCO_8MHZ, CALDCO_8MHZ_)
+sfrb(CALDCO_8MHZ, CALDCO_8MHZ_);
 #define CALBC1_8MHZ_          0x10FD    /* BCSCTL1 Calibration Data for 8MHz */
-sfrb(CALBC1_8MHZ, CALBC1_8MHZ_)
+sfrb(CALBC1_8MHZ, CALBC1_8MHZ_);
 #define CALDCO_1MHZ_          0x10FE    /* DCOCTL  Calibration Data for 1MHz */
-sfrb(CALDCO_1MHZ, CALDCO_1MHZ_)
+sfrb(CALDCO_1MHZ, CALDCO_1MHZ_);
 #define CALBC1_1MHZ_          0x10FF    /* BCSCTL1 Calibration Data for 1MHz */
-sfrb(CALBC1_1MHZ, CALBC1_1MHZ_)
+sfrb(CALBC1_1MHZ, CALBC1_1MHZ_);
 
 #endif /* #ifndef __DisableCalData */
 

Index: msp430x20x2.h
===================================================================
RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x20x2.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- msp430x20x2.h	25 Jan 2006 16:27:31 -0000	1.2
+++ msp430x20x2.h	5 Apr 2006 12:06:34 -0000	1.3
@@ -55,21 +55,21 @@
 #ifndef __DisableCalData
 
 #define CALDCO_16MHZ_         0x10F8    /* DCOCTL  Calibration Data for 16MHz */
-sfrb(CALDCO_16MHZ, CALDCO_16MHZ_)
+sfrb(CALDCO_16MHZ, CALDCO_16MHZ_);
 #define CALBC1_16MHZ_         0x10F9    /* BCSCTL1 Calibration Data for 16MHz */
-sfrb(CALBC1_16MHZ, CALBC1_16MHZ_)
+sfrb(CALBC1_16MHZ, CALBC1_16MHZ_);
 #define CALDCO_12MHZ_         0x10FA    /* DCOCTL  Calibration Data for 12MHz */
-sfrb(CALDCO_12MHZ, CALDCO_12MHZ_)
+sfrb(CALDCO_12MHZ, CALDCO_12MHZ_);
 #define CALBC1_12MHZ_         0x10FB    /* BCSCTL1 Calibration Data for 12MHz */
-sfrb(CALBC1_12MHZ, CALBC1_12MHZ_)
+sfrb(CALBC1_12MHZ, CALBC1_12MHZ_);
 #define CALDCO_8MHZ_          0x10FC    /* DCOCTL  Calibration Data for 8MHz */
-sfrb(CALDCO_8MHZ, CALDCO_8MHZ_)
+sfrb(CALDCO_8MHZ, CALDCO_8MHZ_);
 #define CALBC1_8MHZ_          0x10FD    /* BCSCTL1 Calibration Data for 8MHz */
-sfrb(CALBC1_8MHZ, CALBC1_8MHZ_)
+sfrb(CALBC1_8MHZ, CALBC1_8MHZ_);
 #define CALDCO_1MHZ_          0x10FE    /* DCOCTL  Calibration Data for 1MHz */
-sfrb(CALDCO_1MHZ, CALDCO_1MHZ_)
+sfrb(CALDCO_1MHZ, CALDCO_1MHZ_);
 #define CALBC1_1MHZ_          0x10FF    /* BCSCTL1 Calibration Data for 1MHz */
-sfrb(CALBC1_1MHZ, CALBC1_1MHZ_)
+sfrb(CALBC1_1MHZ, CALBC1_1MHZ_);
 
 #endif /* #ifndef __DisableCalData */
 

Index: msp430x20x3.h
===================================================================
RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x20x3.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- msp430x20x3.h	25 Jan 2006 16:27:31 -0000	1.2
+++ msp430x20x3.h	5 Apr 2006 12:06:34 -0000	1.3
@@ -55,21 +55,21 @@
 #ifndef __DisableCalData
 
 #define CALDCO_16MHZ_         0x10F8    /* DCOCTL  Calibration Data for 16MHz */
-sfrb(CALDCO_16MHZ, CALDCO_16MHZ_)
+sfrb(CALDCO_16MHZ, CALDCO_16MHZ_);
 #define CALBC1_16MHZ_         0x10F9    /* BCSCTL1 Calibration Data for 16MHz */
-sfrb(CALBC1_16MHZ, CALBC1_16MHZ_)
+sfrb(CALBC1_16MHZ, CALBC1_16MHZ_);
 #define CALDCO_12MHZ_         0x10FA    /* DCOCTL  Calibration Data for 12MHz */
-sfrb(CALDCO_12MHZ, CALDCO_12MHZ_)
+sfrb(CALDCO_12MHZ, CALDCO_12MHZ_);
 #define CALBC1_12MHZ_         0x10FB    /* BCSCTL1 Calibration Data for 12MHz */
-sfrb(CALBC1_12MHZ, CALBC1_12MHZ_)
+sfrb(CALBC1_12MHZ, CALBC1_12MHZ_);
 #define CALDCO_8MHZ_          0x10FC    /* DCOCTL  Calibration Data for 8MHz */
-sfrb(CALDCO_8MHZ, CALDCO_8MHZ_)
+sfrb(CALDCO_8MHZ, CALDCO_8MHZ_);
 #define CALBC1_8MHZ_          0x10FD    /* BCSCTL1 Calibration Data for 8MHz */
-sfrb(CALBC1_8MHZ, CALBC1_8MHZ_)
+sfrb(CALBC1_8MHZ, CALBC1_8MHZ_);
 #define CALDCO_1MHZ_          0x10FE    /* DCOCTL  Calibration Data for 1MHz */
-sfrb(CALDCO_1MHZ, CALDCO_1MHZ_)
+sfrb(CALDCO_1MHZ, CALDCO_1MHZ_);
 #define CALBC1_1MHZ_          0x10FF    /* BCSCTL1 Calibration Data for 1MHz */
-sfrb(CALBC1_1MHZ, CALBC1_1MHZ_)
+sfrb(CALBC1_1MHZ, CALBC1_1MHZ_);
 
 #endif /* #ifndef __DisableCalData */
 

Index: msp430x22x4.h
===================================================================
RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x22x4.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- msp430x22x4.h	25 Jan 2006 16:27:31 -0000	1.1
+++ msp430x22x4.h	5 Apr 2006 12:06:34 -0000	1.2
@@ -78,21 +78,21 @@
 #ifndef __DisableCalData
 
 #define CALDCO_16MHZ_         0x10F8    /* DCOCTL  Calibration Data for 16MHz */
-sfrb(CALDCO_16MHZ, CALDCO_16MHZ_)
+sfrb(CALDCO_16MHZ, CALDCO_16MHZ_);
 #define CALBC1_16MHZ_         0x10F9    /* BCSCTL1 Calibration Data for 16MHz */
-sfrb(CALBC1_16MHZ, CALBC1_16MHZ_)
+sfrb(CALBC1_16MHZ, CALBC1_16MHZ_);
 #define CALDCO_12MHZ_         0x10FA    /* DCOCTL  Calibration Data for 12MHz */
-sfrb(CALDCO_12MHZ, CALDCO_12MHZ_)
+sfrb(CALDCO_12MHZ, CALDCO_12MHZ_);
 #define CALBC1_12MHZ_         0x10FB    /* BCSCTL1 Calibration Data for 12MHz */
-sfrb(CALBC1_12MHZ, CALBC1_12MHZ_)
+sfrb(CALBC1_12MHZ, CALBC1_12MHZ_);
 #define CALDCO_8MHZ_          0x10FC    /* DCOCTL  Calibration Data for 8MHz */
-sfrb(CALDCO_8MHZ, CALDCO_8MHZ_)
+sfrb(CALDCO_8MHZ, CALDCO_8MHZ_);
 #define CALBC1_8MHZ_          0x10FD    /* BCSCTL1 Calibration Data for 8MHz */
-sfrb(CALBC1_8MHZ, CALBC1_8MHZ_)
+sfrb(CALBC1_8MHZ, CALBC1_8MHZ_);
 #define CALDCO_1MHZ_          0x10FE    /* DCOCTL  Calibration Data for 1MHz */
-sfrb(CALDCO_1MHZ, CALDCO_1MHZ_)
+sfrb(CALDCO_1MHZ, CALDCO_1MHZ_);
 #define CALBC1_1MHZ_          0x10FF    /* BCSCTL1 Calibration Data for 1MHz */
-sfrb(CALBC1_1MHZ, CALBC1_1MHZ_)
+sfrb(CALBC1_1MHZ, CALBC1_1MHZ_);
 
 #endif /* #ifndef __DisableCalData */
 #define PORT1_VECTOR        4       /* 0xFFE4 Port 1 */



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.