Hi, The recent USCI commits to msp430-libc didn't convert all the target devices over to the new #define scheme. I believe the patch below finishes the conversion.
The previous work changed usci.h so that it'd define the USCI constants if __MSP430_HAS_USCI0__ is declared. Previously __MSP430_HAS_USCI__ needed to be declared for this to happen. This patch adds __MSP430_HAS_USCI0__ to all devices that I believe has USCI0. I did contemplate whether adding this to usci.h would be better than my patch: #ifdef __MSP430_HAS_USCI__ #define __MSP430_HAS_USCI0__ #endif But I don't know if there are some things that have USCI1 and no USCI0... Cheers, Rob Index: include/msp430x22x2.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x22x2.h,v retrieving revision 1.2 diff -u -r1.2 msp430x22x2.h --- include/msp430x22x2.h 18 Jun 2008 00:54:02 -0000 1.2 +++ include/msp430x22x2.h 20 Jun 2009 11:18:04 -0000 @@ -25,6 +25,7 @@ #define __MSP430_HAS_BC2__ #define __MSP430_HAS_FLASH2__ #define __MSP430_HAS_USCI__ +#define __MSP430_HAS_USCI0__ #include <msp430/basic_clock.h> #include <msp430/flash.h> Index: include/msp430x22x4.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x22x4.h,v retrieving revision 1.7 diff -u -r1.7 msp430x22x4.h --- include/msp430x22x4.h 18 Jun 2008 00:54:02 -0000 1.7 +++ include/msp430x22x4.h 20 Jun 2009 11:18:04 -0000 @@ -26,6 +26,7 @@ #define __MSP430_HAS_FLASH2__ #define __MSP430_HAS_OA_2__ #define __MSP430_HAS_USCI__ +#define __MSP430_HAS_USCI0__ #define __msp430_have_opamp_1 #define __msp430_have_opamp_output_select Index: include/msp430x23x.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x23x.h,v retrieving revision 1.1 diff -u -r1.1 msp430x23x.h --- include/msp430x23x.h 18 Jun 2008 00:04:40 -0000 1.1 +++ include/msp430x23x.h 20 Jun 2009 11:18:04 -0000 @@ -26,6 +26,7 @@ #define __MSP430_HAS_BC2__ #define __MSP430_HAS_FLASH2__ #define __MSP430_HAS_USCI__ +#define __MSP430_HAS_USCI0__ #define __MSP430_HAS_CAPLUS__ #define __MSP430_HAS_MPY__ Index: include/msp430x23x0.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x23x0.h,v retrieving revision 1.3 diff -u -r1.3 msp430x23x0.h --- include/msp430x23x0.h 18 Jun 2008 00:54:03 -0000 1.3 +++ include/msp430x23x0.h 20 Jun 2009 11:18:04 -0000 @@ -24,6 +24,7 @@ #define __MSP430_HAS_BC2__ #define __MSP430_HAS_FLASH2__ #define __MSP430_HAS_USCI__ +#define __MSP430_HAS_USCI0__ #define __MSP430_HAS_CAPLUS__ #define __MSP430_HAS_MPY__ Index: include/msp430x241x.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x241x.h,v retrieving revision 1.7 diff -u -r1.7 msp430x241x.h --- include/msp430x241x.h 3 Apr 2009 05:25:33 -0000 1.7 +++ include/msp430x241x.h 20 Jun 2009 11:18:04 -0000 @@ -40,6 +40,7 @@ #define __MSP430_HAS_PORT6_R__ #define __MSP430_HAS_SVS__ #define __MSP430_HAS_USCI__ +#define __MSP430_HAS_USCI0__ #define __MSP430_HAS_USCI1__ #define __MSP430_HAS_USCI_AB0__ #define __MSP430_HAS_USCI_AB1__ Index: include/msp430x24x.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x24x.h,v retrieving revision 1.7 diff -u -r1.7 msp430x24x.h --- include/msp430x24x.h 3 Apr 2009 05:25:33 -0000 1.7 +++ include/msp430x24x.h 20 Jun 2009 11:18:04 -0000 @@ -31,6 +31,7 @@ #define __MSP430_HAS_PORT6_R__ #define __MSP430_HAS_SVS__ #define __MSP430_HAS_USCI__ +#define __MSP430_HAS_USCI0__ #define __MSP430_HAS_USCI1__ #define __MSP430_HAS_USCI_AB0__ #define __MSP430_HAS_USCI_AB1__ Index: include/msp430x24x1.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x24x1.h,v retrieving revision 1.7 diff -u -r1.7 msp430x24x1.h --- include/msp430x24x1.h 3 Apr 2009 05:25:33 -0000 1.7 +++ include/msp430x24x1.h 20 Jun 2009 11:18:04 -0000 @@ -24,6 +24,7 @@ #define __MSP430_HAS_PORT6_R__ #define __MSP430_HAS_SVS__ #define __MSP430_HAS_USCI__ +#define __MSP430_HAS_USCI0__ #define __MSP430_HAS_USCI1__ #define __MSP430_HAS_USCI_AB0__ #define __MSP430_HAS_USCI_AB1__ Index: include/msp430x47xx.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430x47xx.h,v retrieving revision 1.6 diff -u -r1.6 msp430x47xx.h --- include/msp430x47xx.h 4 Jun 2009 21:34:29 -0000 1.6 +++ include/msp430x47xx.h 20 Jun 2009 11:18:04 -0000 @@ -38,6 +38,7 @@ #define __MSP430_HAS_BT_RTC__ #define __MSP430_HAS_LCD_A__ #define __MSP430_HAS_USCI__ +#define __MSP430_HAS_USCI0__ #define __MSP430_HAS_USCI1__ #define __MSP430_HAS_USCI_AB0__ #define __MSP430_HAS_USCI_AB1__ Index: include/msp430xG461x.h =================================================================== RCS file: /cvsroot/mspgcc/msp430-libc/include/msp430xG461x.h,v retrieving revision 1.10 diff -u -r1.10 msp430xG461x.h --- include/msp430xG461x.h 7 Nov 2008 08:28:40 -0000 1.10 +++ include/msp430xG461x.h 20 Jun 2009 11:18:05 -0000 @@ -32,6 +32,7 @@ #define __MSP430_HAS_LCD_A__ #define __MSP430_HAS_UART0__ #define __MSP430_HAS_USCI__ +#define __MSP430_HAS_USCI0__ #define __MSP430_HAS_TA3__ #define __MSP430_HAS_TB7__ #define __MSP430_HAS_FLASH__
