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))
)
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){