From: smckown <smckown@4bc1554a-c7f2-4f65-a403-e0be01f0239c>
Date: Sun, 7 Sep 2008 01:19:55 +0000 (+0000)
Subject: Cleanups for using defs to support msp430's with a single USCI.
X-Git-Tag: release/2.1.0-1~85
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=7bc84c0e02c2b8b4dbc0bbef91a902350aebabe6

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 b174dbf9..4b20beee 100644
--- 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;