Cleanups for using defs to support msp430's with a single USCI.

diff --git a/tos/chips/msp430/pins/HplMsp430GeneralIOC.nc b/tos/chips/msp430/pins/HplMsp430GeneralIOC.nc
index b174dbf915bb5edecb7d03dc9608ea8e578ac6a5..4b20beee92a55d2a57ab0622354c8b95a8bfb2f0 100644 (file)
--- a/tos/chips/msp430/pins/HplMsp430GeneralIOC.nc
+++ b/tos/chips/msp430/pins/HplMsp430GeneralIOC.nc
@@ -164,7 +164,7 @@ configuration HplMsp430GeneralIOC
 #endif
 
   // Interfaces for USCI0, ports A and B
-#if defined(__MSP430_HAS_USCI_AB0__)
+#if defined(__MSP430_HAS_USCI_AB0__) || defined(__MSP430_HAS_USCI__)
   provides interface HplMsp430GeneralIO as UCA0CLK;
   provides interface HplMsp430GeneralIO as UCA0STE;
   provides interface HplMsp430GeneralIO as UCA0TXD;
@@ -547,7 +547,7 @@ implementation
   URXD1 = P37;
 #endif
 
-#if defined(__MSP430_HAS_USCI_AB0__)
+#if defined(__MSP430_HAS_USCI_AB0__) || defined(__MSP430_HAS_USCI__)
   UCA0CLK = P30;
   UCA0STE = P33;
   UCA0TXD = P34;