From: scipio <scipio>
Date: Tue, 7 Jul 2009 18:53:40 +0000 (+0000)
Subject: MSP430 low power state defaults to LPM4, timer system overrides to
X-Git-Tag: rc_6_tinyos_2_1_1~366
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=4239469aad3e8deb3ec56e2b19ba14e39abb3936

MSP430 low power state defaults to LPM4, timer system overrides to
LPM3.
---

diff --git a/tos/chips/msp430/McuSleepC.nc b/tos/chips/msp430/McuSleepC.nc
index 504e9add..3d47fc5d 100644
--- 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) ||
diff --git a/tos/chips/msp430/timer/Msp430ClockC.nc b/tos/chips/msp430/timer/Msp430ClockC.nc
index 5249fbe0..7feab6ab 100644
--- a/tos/chips/msp430/timer/Msp430ClockC.nc
+++ b/tos/chips/msp430/timer/Msp430ClockC.nc
@@ -30,9 +30,10 @@ configuration Msp430ClockC
 }
 implementation
 {
-  components Msp430ClockP, Msp430TimerC;
+  components Msp430ClockP, Msp430TimerC, McuSleepC;
 
   Init = Msp430ClockP;
   Msp430ClockInit = Msp430ClockP;
+  McuSleepC.McuPowerOverride -> Msp430ClockP;
 }
 
diff --git a/tos/chips/msp430/timer/Msp430ClockP.nc b/tos/chips/msp430/timer/Msp430ClockP.nc
index 55aaba33..689175de 100644
--- a/tos/chips/msp430/timer/Msp430ClockP.nc
+++ b/tos/chips/msp430/timer/Msp430ClockP.nc
@@ -33,6 +33,7 @@ module Msp430ClockP @safe()
 {
   provides interface Init;
   provides interface Msp430ClockInit;
+  provides interface McuPowerOverride;
 }
 implementation
 {
@@ -48,6 +49,9 @@ implementation
     TARGET_DCO_DELTA = (TARGET_DCO_KHZ / ACLK_KHZ) * ACLK_CALIB_PERIOD,
   };
 
+  async command mcu_power_t McuPowerOverride.lowestState() {
+    return MSP430_POWER_LPM3;
+  }
 
   command void Msp430ClockInit.defaultSetupDcoCalibrate()
   {