Merge TinyOS 2.1.1 into master.

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

diff --git a/tos/chips/msp430/timer/Msp430ClockC.nc b/tos/chips/msp430/timer/Msp430ClockC.nc
index 5249fbe0ac6ba1f8de65d0e52ae6788ecc08ed22..e2247fad343baefb1ba36174495a74ee717bbca1 100644 (file)
--- a/tos/chips/msp430/timer/Msp430ClockC.nc
+++ b/tos/chips/msp430/timer/Msp430ClockC.nc
@@ -23,16 +23,17 @@
  * @author Cory Sharp <cssharp@eecs.berkeley.edu>
  */
 
-configuration Msp430ClockC
+generic configuration Msp430ClockC(uint16_t TARGET_DCO_KHZ, uint16_t ACLK_KHZ)
 {
   provides interface Init;
   provides interface Msp430ClockInit;
 }
 implementation
 {
-  components Msp430ClockP, Msp430TimerC;
+  components new Msp430ClockP(TARGET_DCO_KHZ, ACLK_KHZ), Msp430TimerC, McuSleepC;
 
   Init = Msp430ClockP;
   Msp430ClockInit = Msp430ClockP;
+  McuSleepC.McuPowerOverride -> Msp430ClockP;
 }