Merge over into the trunk.

[tinyos-2.x.git] / tos / lib / power / StdControlDeferredPowerManagerC.nc

diff --git a/tos/lib/power/StdControlDeferredPowerManagerC.nc b/tos/lib/power/StdControlDeferredPowerManagerC.nc
index d2f0edabd462c0a0c6437cd55169ec79650d58d9..54a0052931465237d5b749c5eb9fd17606fc9d4f 100644 (file)
--- a/tos/lib/power/StdControlDeferredPowerManagerC.nc
+++ b/tos/lib/power/StdControlDeferredPowerManagerC.nc
@@ -29,6 +29,8 @@
  */
  
 /**
+ * Please refer to TEP 115 for more information about this component and its
+ * intended use.<br><br>
  *
  * This component povides a power management policy for managing the power
  * states of non-virtualized devices.  Non-virtualized devices are shared
@@ -53,20 +55,14 @@
  *                        before shutting down the device once it is free.
  * 
  * @author Kevin Klues (klueska@cs.wustl.edu)
- * @see  Please refer to TEP 115 for more information about this component and its
- *          intended use.
  */
  
 generic configuration StdControlDeferredPowerManagerC(uint32_t delay)
 {
-  provides {
-    interface Init;
-  }
   uses {
     interface StdControl;
 
     interface PowerDownCleanup;
-    interface Init as ArbiterInit;
     interface ResourceController;
     interface ArbiterInfo;
   }
@@ -74,14 +70,11 @@ generic configuration StdControlDeferredPowerManagerC(uint32_t delay)
 implementation {
   components new TimerMilliC(),
              new DeferredPowerManagerP(delay) as PowerManager;
-
-  Init = PowerManager;
  
   PowerManager.StdControl = StdControl;
 
   PowerManager.PowerDownCleanup = PowerDownCleanup;
  
-  PowerManager.ArbiterInit  = ArbiterInit;
   PowerManager.ResourceController = ResourceController;
   PowerManager.ArbiterInfo = ArbiterInfo;