[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/msp430/timer Msp430ClockC.nc, 1.4, 1.5 Msp430ClockP.nc, 1.7, 1.8

[Phil Levis]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/timer
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32681/timer

Modified Files:
	Msp430ClockC.nc Msp430ClockP.nc 
Log Message:
MSP430 low power state defaults to LPM4, timer system overrides to
LPM3.


Index: Msp430ClockC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/timer/Msp430ClockC.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Msp430ClockC.nc	13 Mar 2007 17:57:46 -0000	1.4
--- Msp430ClockC.nc	7 Jul 2009 18:53:40 -0000	1.5
***************
*** 31,38 ****
  implementation
  {
!   components Msp430ClockP, Msp430TimerC;
  
    Init = Msp430ClockP;
    Msp430ClockInit = Msp430ClockP;
  }
  
--- 31,39 ----
  implementation
  {
!   components Msp430ClockP, Msp430TimerC, McuSleepC;
  
    Init = Msp430ClockP;
    Msp430ClockInit = Msp430ClockP;
+   McuSleepC.McuPowerOverride -> Msp430ClockP;
  }
  

Index: Msp430ClockP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/timer/Msp430ClockP.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Msp430ClockP.nc	24 Jun 2008 05:32:31 -0000	1.7
--- Msp430ClockP.nc	7 Jul 2009 18:53:40 -0000	1.8
***************
*** 34,37 ****
--- 34,38 ----
    provides interface Init;
    provides interface Msp430ClockInit;
+   provides interface McuPowerOverride;
  }
  implementation
***************
*** 49,52 ****
--- 50,56 ----
    };
  
+   async command mcu_power_t McuPowerOverride.lowestState() {
+     return MSP430_POWER_LPM3;
+   }
  
    command void Msp430ClockInit.defaultSetupDcoCalibrate()