Merge over into the trunk.

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

diff --git a/tos/lib/power/StdControlPowerManagerC.nc b/tos/lib/power/StdControlPowerManagerC.nc
index 66a6a2f2446c73d627dd78d7a5d089d703ecfe2b..663fbcd5b016d31bd95e822ffdfd0980996d0dba 100644 (file)
--- a/tos/lib/power/StdControlPowerManagerC.nc
+++ b/tos/lib/power/StdControlPowerManagerC.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
@@ -50,33 +52,26 @@
  * <code>SplitControlPowerManagerC</code> component respectively.
  * 
  * @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 StdControlPowerManagerC()
 {
-  provides {
-    interface Init;
-  }
   uses {
     interface StdControl;
 
     interface PowerDownCleanup;
-    interface Init as ArbiterInit;
     interface ResourceController;
+    interface ArbiterInfo;
   }
 }
 implementation {
   components new PowerManagerP() as PowerManager;
-
-  Init = PowerManager;
  
   PowerManager.StdControl = StdControl;
 
   PowerManager.PowerDownCleanup = PowerDownCleanup;
  
-  PowerManager.ArbiterInit  = ArbiterInit;
   PowerManager.ResourceController = ResourceController;
+  PowerManager.ArbiterInfo = ArbiterInfo;
 }