Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / chips / msp430 / McuSleepC.nc

diff --git a/tos/chips/msp430/McuSleepC.nc b/tos/chips/msp430/McuSleepC.nc
index dbe70912c8d3879cddceb49ee2eae600afcb85fe..57c6d393aaefcb522c22cc0738cb56df82d14e24 100644 (file)
--- a/tos/chips/msp430/McuSleepC.nc
+++ b/tos/chips/msp430/McuSleepC.nc
@@ -64,7 +64,7 @@ implementation {
   };
     
   mcu_power_t getPowerState() {
-    mcu_power_t pState = MSP430_POWER_LPM3;
+    mcu_power_t pState = MSP430_POWER_LPM4;
     // TimerA, USART0, USART1 check
     if ((((TACCTL0 & CCIE) ||
          (TACCTL1 & CCIE) ||
@@ -78,7 +78,7 @@ implementation {
 #endif
 #ifdef __MSP430_HAS_I2C__
         // registers end in "nr" to prevent nesC race condition detection
-       || ((U0CTLnr & I2CEN) && (I2CTCTLnr & SSEL1) &&
+        || ((U0CTLnr & I2CEN) && (I2CTCTLnr & SSEL1) &&
             (I2CDCTLnr & I2CBUSY) && (U0CTLnr & SYNC) && (U0CTLnr & I2C))
 #endif
        )