From: smckown <smckown@4bc1554a-c7f2-4f65-a403-e0be01f0239c>
Date: Thu, 4 Sep 2008 22:03:11 +0000 (+0000)
Subject: Make McuSleepC smarter about newer msp430 processors.
X-Git-Tag: patchset/2.1.1-4.5~23
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=18412f7cf0633454a1041c223a5c6cebeadc31c1

Make McuSleepC smarter about newer msp430 processors.
---

diff --git a/tos/chips/msp430/McuSleepC.nc b/tos/chips/msp430/McuSleepC.nc
index 3d47fc5d..57c6d393 100644
--- a/tos/chips/msp430/McuSleepC.nc
+++ b/tos/chips/msp430/McuSleepC.nc
@@ -69,10 +69,14 @@ implementation {
     if ((((TACCTL0 & CCIE) ||
 	  (TACCTL1 & CCIE) ||
 	  (TACCTL2 & CCIE)) &&
-	 ((TACTL & TASSEL_3) == TASSEL_2)) ||
-	((ME1 & (UTXE0 | URXE0)) && (U0TCTL & SSEL1)) ||
-	((ME2 & (UTXE1 | URXE1)) && (U1TCTL & SSEL1))
-#ifdef __msp430_have_usart0_with_i2c
+	 ((TACTL & TASSEL_3) == TASSEL_2))
+#ifdef __MSP430_HAS_UART0__
+	|| ((ME1 & (UTXE0 | URXE0)) && (U0TCTL & SSEL1))
+#endif
+#ifdef __MSP430_HAS_UART1__
+	|| ((ME2 & (UTXE1 | URXE1)) && (U1TCTL & SSEL1))
+#endif
+#ifdef __MSP430_HAS_I2C__
 	 // registers end in "nr" to prevent nesC race condition detection
 	 || ((U0CTLnr & I2CEN) && (I2CTCTLnr & SSEL1) &&
 	     (I2CDCTLnr & I2CBUSY) && (U0CTLnr & SYNC) && (U0CTLnr & I2C))
@@ -80,7 +84,7 @@ implementation {
 	)
       pState = MSP430_POWER_LPM1;
     
-#ifdef __msp430_have_adc12
+#ifdef __MSP430_HAS_ADC12__
     // ADC12 check, pre-condition: pState != MSP430_POWER_ACTIVE
     if (ADC12CTL0 & ADC12ON){
       if (ADC12CTL1 & ADC12SSEL_2){