Tue Aug 15 04:51:16 PDT 2006

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/power
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3073/tos/lib/power

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	AsyncDeferredPowerManagerP.nc AsyncPowerManagerP.nc 
	AsyncStdControlDeferredPowerManagerC.nc 
	AsyncStdControlPowerManagerC.nc DeferredPowerManagerP.nc 
	PowerDownCleanup.nc PowerManagerP.nc 
	SplitControlDeferredPowerManagerC.nc 
	SplitControlPowerManagerC.nc 
	StdControlDeferredPowerManagerC.nc StdControlPowerManagerC.nc 
Log Message:
Update to Resource and Power Manager stuff

Index: AsyncDeferredPowerManagerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/power/AsyncDeferredPowerManagerP.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** AsyncDeferredPowerManagerP.nc	19 Jun 2006 11:13:08 -0000	1.1.2.3
--- AsyncDeferredPowerManagerP.nc	15 Aug 2006 11:51:13 -0000	1.1.2.4
***************
*** 30,33 ****
--- 30,35 ----
   
  /**
+  * Please refer to TEP 115 for more information about this component and its
+  * intended use.<br><br>
   *
   * This is the internal implementation of the deffered power management
***************
*** 46,62 ****
   * 
   * @author Kevin Klues (klueska at cs.wustl.edu)
-  * @see  Please refer to TEP 115 for more information about this component and its
-  *          intended use.
   */
   
  generic module AsyncDeferredPowerManagerP(uint32_t delay) {
-   provides {
-     interface Init;
-   }
    uses {
      interface AsyncStdControl;
  
      interface PowerDownCleanup;
-     interface Init as ArbiterInit;
      interface ResourceController;
      interface ArbiterInfo;
--- 48,58 ----
***************
*** 66,116 ****
  implementation {
  
!   norace struct {
!    uint8_t stopping :1;
!    uint8_t requested :1;
!   } f; //for flags
  
!   task void timerTask() { 
!     call TimerMilli.startOneShot(delay); 
    }
  
!   command error_t Init.init() {
!     f.stopping = FALSE;
!     f.requested = FALSE;
!     call ArbiterInit.init();
!     call ResourceController.immediateRequest();
!     return SUCCESS;
    }
  
    async event void ResourceController.requested() {
!     if(f.stopping == FALSE) {
!       call AsyncStdControl.start();
!       call ResourceController.release();
!     }
!     else atomic f.requested = TRUE;
    }
  
!   async event void ResourceController.idle() {
!     if(!(call ArbiterInfo.inUse()))
        post timerTask();
    }
  
    event void TimerMilli.fired() {
!     if(call ResourceController.immediateRequest() == SUCCESS) {
!       f.stopping = TRUE;
        call PowerDownCleanup.cleanup();
        call AsyncStdControl.stop();
      }
-     if(f.requested == TRUE) {
-       call AsyncStdControl.start();
-       call ResourceController.release();
-     }
-     atomic {
-       f.stopping = FALSE;
-       f.requested = FALSE;
-     }    
-   }
- 
-   event void ResourceController.granted() {
    }
  
--- 62,100 ----
  implementation {
  
!   norace bool stopTimer = FALSE;
  
!   task void stopTimerTask() {
!     call TimerMilli.stop();
!     stopTimer = FALSE;
    }
  
!   task void timerTask() {
!     if(stopTimer == FALSE)
!       call TimerMilli.startOneShot(delay);
    }
  
    async event void ResourceController.requested() {
!     stopTimer = TRUE;
!     post stopTimerTask();
!     call AsyncStdControl.start();
!     call ResourceController.release();
    }
  
!   async event void ResourceController.immediateRequested() {
!     stopTimer = TRUE;
!     post stopTimerTask();
!     call AsyncStdControl.start();
!     call ResourceController.release();
!   }
! 
!   async event void ResourceController.granted() {
        post timerTask();
    }
  
    event void TimerMilli.fired() {
!     if(stopTimer == FALSE) {
        call PowerDownCleanup.cleanup();
        call AsyncStdControl.stop();
      }
    }
  

Index: AsyncPowerManagerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/power/AsyncPowerManagerP.nc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** AsyncPowerManagerP.nc	19 Jun 2006 11:13:08 -0000	1.1.2.4
--- AsyncPowerManagerP.nc	15 Aug 2006 11:51:13 -0000	1.1.2.5
***************
*** 30,33 ****
--- 30,35 ----
   
  /**
+  * Please refer to TEP 115 for more information about this component and its
+  * intended use.<br><br>
   *
   * This is the internal implementation of the standard power management
***************
*** 42,99 ****
   * 
   * @author Kevin Klues (klueska at cs.wustl.edu)
-  * @see  Please refer to TEP 115 for more information about this component and its
-  *          intended use.
   */
   
  generic module AsyncPowerManagerP() {
-   provides {
-     interface Init;
-   }
    uses {
      interface AsyncStdControl;
  
      interface PowerDownCleanup;
-     interface Init as ArbiterInit;
      interface ResourceController;
    }
  }
  implementation {
  
-   norace struct {
-     uint8_t stopping :1;
-     uint8_t requested :1;
-   } f; //for flags
-   
-   command error_t Init.init() {
-     call ArbiterInit.init();
-     call ResourceController.immediateRequest();
-     return SUCCESS;
-   }
- 
    async event void ResourceController.requested() {
!     if(f.stopping == FALSE) {
!       call AsyncStdControl.start();
!       call ResourceController.release();
!     }
!     else atomic f.requested = TRUE;    
    }
  
!   async event void ResourceController.idle() {
!     if(call ResourceController.immediateRequest() == SUCCESS) {
!       atomic f.stopping = TRUE;
!       call PowerDownCleanup.cleanup();
!       call AsyncStdControl.stop();
!     }
!     if(f.requested == TRUE) {
!       call AsyncStdControl.start();
!       call ResourceController.release();
!     }
!     atomic {
!       f.stopping = FALSE;
!       f.requested = FALSE;
!     }
!   }
  
!   event void ResourceController.granted() {
    }
  
--- 44,73 ----
   * 
   * @author Kevin Klues (klueska at cs.wustl.edu)
   */
   
  generic module AsyncPowerManagerP() {
    uses {
      interface AsyncStdControl;
  
      interface PowerDownCleanup;
      interface ResourceController;
+     interface ArbiterInfo;
    }
  }
  implementation {
  
    async event void ResourceController.requested() {
!     call AsyncStdControl.start();
!     call ResourceController.release(); 
    }
  
!   async event void ResourceController.immediateRequested() {
!     call AsyncStdControl.start();
!     call ResourceController.release();
!   } 
  
!   async event void ResourceController.granted() {
!     call PowerDownCleanup.cleanup();
!     call AsyncStdControl.stop();
    }
  

Index: AsyncStdControlDeferredPowerManagerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/power/AsyncStdControlDeferredPowerManagerC.nc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** AsyncStdControlDeferredPowerManagerC.nc	19 Jun 2006 11:13:08 -0000	1.1.2.4
--- AsyncStdControlDeferredPowerManagerC.nc	15 Aug 2006 11:51:13 -0000	1.1.2.5
***************
*** 30,33 ****
--- 30,35 ----
   
  /**
+  * 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
***************
*** 54,71 ****
   * 
   * @author Kevin Klues (klueska at cs.wustl.edu)
-  * @see  Please refer to TEP 115 for more information about this component and its
-  *          intended use.
   */
   
  generic configuration AsyncStdControlDeferredPowerManagerC(uint32_t delay)
  {
-   provides {
-     interface Init;
-   }
    uses {
      interface AsyncStdControl;
  
      interface PowerDownCleanup;
-     interface Init as ArbiterInit;
      interface ResourceController;
      interface ArbiterInfo;
--- 56,67 ----
***************
*** 75,86 ****
    components new TimerMilliC(),
               new AsyncDeferredPowerManagerP(delay) as PowerManager;
- 
-   Init = PowerManager;
   
    PowerManager.AsyncStdControl = AsyncStdControl;
- 
    PowerManager.PowerDownCleanup = PowerDownCleanup;
   
-   PowerManager.ArbiterInit  = ArbiterInit;
    PowerManager.ResourceController = ResourceController;
    PowerManager.ArbiterInfo = ArbiterInfo;
--- 71,78 ----

Index: AsyncStdControlPowerManagerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/power/AsyncStdControlPowerManagerC.nc,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** AsyncStdControlPowerManagerC.nc	19 Jun 2006 11:13:08 -0000	1.1.2.5
--- AsyncStdControlPowerManagerC.nc	15 Aug 2006 11:51:13 -0000	1.1.2.6
***************
*** 30,33 ****
--- 30,35 ----
   
  /**
+  * Please refer to TEP 115 for more information about this component and its
+  * intended use.<br><br>
   *
   * This is the internal implementation of the standard power management
***************
*** 51,75 ****
   * 
   * @author Kevin Klues (klueska at cs.wustl.edu)
-  * @see  Please refer to TEP 115 for more information about this component and its
-  *          intended use.
   */
   
  generic configuration AsyncStdControlPowerManagerC()
  {
-   provides {
-     interface Init;
-   }
    uses {
      interface AsyncStdControl;
  
      interface PowerDownCleanup;
-     interface Init as ArbiterInit;
      interface ResourceController;
    }
  }
  implementation {
    components new AsyncPowerManagerP() as PowerManager;
- 
-   Init = PowerManager;
   
    PowerManager.AsyncStdControl = AsyncStdControl;
--- 53,70 ----
   * 
   * @author Kevin Klues (klueska at cs.wustl.edu)
   */
   
  generic configuration AsyncStdControlPowerManagerC()
  {
    uses {
      interface AsyncStdControl;
  
      interface PowerDownCleanup;
      interface ResourceController;
+     interface ArbiterInfo;
    }
  }
  implementation {
    components new AsyncPowerManagerP() as PowerManager;
   
    PowerManager.AsyncStdControl = AsyncStdControl;
***************
*** 77,82 ****
    PowerManager.PowerDownCleanup = PowerDownCleanup;
   
-   PowerManager.ArbiterInit  = ArbiterInit;
    PowerManager.ResourceController = ResourceController;
  }
  
--- 72,77 ----
    PowerManager.PowerDownCleanup = PowerDownCleanup;
   
    PowerManager.ResourceController = ResourceController;
+   PowerManager.ArbiterInfo = ArbiterInfo;
  }
  

Index: DeferredPowerManagerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/power/DeferredPowerManagerP.nc,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** DeferredPowerManagerP.nc	19 Jun 2006 11:13:08 -0000	1.1.2.5
--- DeferredPowerManagerP.nc	15 Aug 2006 11:51:13 -0000	1.1.2.6
***************
*** 30,33 ****
--- 30,35 ----
   
  /**
+  * Please refer to TEP 115 for more information about this component and its
+  * intended use.<br><br>
   *
   * This is the internal implementation of the deffered power management
***************
*** 46,57 ****
   * 
   * @author Kevin Klues (klueska at cs.wustl.edu)
-  * @see  Please refer to TEP 115 for more information about this component and its
-  *          intended use.
   */
   
  generic module DeferredPowerManagerP(uint32_t delay) {
-   provides {
-     interface Init;
-   }
    uses {
      interface StdControl;
--- 48,54 ----
***************
*** 59,63 ****
  
      interface PowerDownCleanup;
-     interface Init as ArbiterInit;
      interface ResourceController;
      interface ArbiterInfo;
--- 56,59 ----
***************
*** 67,95 ****
  implementation {
  
!   norace struct {
!    uint8_t stopping :1;
!    uint8_t requested :1;
!   } f; //for flags
  
!   task void startTask() { 
      call StdControl.start();
      call SplitControl.start();
    }
    task void timerTask() { 
      call TimerMilli.startOneShot(delay); 
    }
  
-   command error_t Init.init() {
-     f.stopping = FALSE;
-     f.requested = FALSE;
-     call ArbiterInit.init();
-     call ResourceController.immediateRequest();
-     return SUCCESS;
-   }
- 
    async event void ResourceController.requested() {
!     if(f.stopping == FALSE)
        post startTask();
!     else atomic f.requested = TRUE;
    }
  
--- 63,90 ----
  implementation {
  
!   norace bool stopping = FALSE;
!   norace bool requested  = FALSE;
!   norace bool stopTimer = FALSE;
  
!   task void startTask() {
!     call TimerMilli.stop();
!     stopTimer = FALSE;
      call StdControl.start();
      call SplitControl.start();
    }
+ 
    task void timerTask() { 
      call TimerMilli.startOneShot(delay); 
    }
  
    async event void ResourceController.requested() {
!     if(stopping == FALSE) {
!       stopTimer = TRUE;
        post startTask();
!     }
!     else atomic requested = TRUE;
!   }
! 
!   async event void ResourceController.immediateRequested() {
    }
  
***************
*** 106,117 ****
    }
  
!   async event void ResourceController.idle() {
!     if(!(call ArbiterInfo.inUse()))
!       post timerTask();
    }
  
    event void TimerMilli.fired() {
!     if(call ResourceController.immediateRequest() == SUCCESS) {
!       f.stopping = TRUE;
        call PowerDownCleanup.cleanup();
        call StdControl.stop();
--- 101,111 ----
    }
  
!   async event void ResourceController.granted() {
!     post timerTask();
    }
  
    event void TimerMilli.fired() {
!     if(stopTimer == FALSE) {
!       stopping = TRUE;
        call PowerDownCleanup.cleanup();
        call StdControl.stop();
***************
*** 121,137 ****
  
    event void SplitControl.stopDone(error_t error) {
!     if(f.requested == TRUE) {
        call StdControl.start();
        call SplitControl.start();
      }
      atomic {
!       f.requested = FALSE;
!       f.stopping = FALSE;
      }
    }
  
-   event void ResourceController.granted() {
-   }
- 
    default command error_t StdControl.stop() {
      return SUCCESS;
--- 115,128 ----
  
    event void SplitControl.stopDone(error_t error) {
!     if(requested == TRUE) {
        call StdControl.start();
        call SplitControl.start();
      }
      atomic {
!       requested = FALSE;
!       stopping = FALSE;
      }
    }
  
    default command error_t StdControl.stop() {
      return SUCCESS;

Index: PowerDownCleanup.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/power/PowerDownCleanup.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** PowerDownCleanup.nc	19 Jun 2006 11:13:08 -0000	1.1.2.3
--- PowerDownCleanup.nc	15 Aug 2006 11:51:13 -0000	1.1.2.4
***************
*** 30,33 ****
--- 30,35 ----
   
  /**
+  * Please refer to TEP 115 for more information about this interface and its
+  * intended use.<br><br>
   *
   * This interface exists to allow a Resource user to cleanup any state
***************
*** 39,44 ****
   *
   * @author Kevin Klues (klueska at cs.wustl.edu)
-  * @see  Please refer to TEP 115 for more information about this component and its
-  *          intended use. 
   */
  
--- 41,44 ----

Index: PowerManagerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/power/PowerManagerP.nc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** PowerManagerP.nc	19 Jun 2006 11:13:08 -0000	1.1.2.4
--- PowerManagerP.nc	15 Aug 2006 11:51:13 -0000	1.1.2.5
***************
*** 30,33 ****
--- 30,35 ----
   
  /**
+  * Please refer to TEP 115 for more information about this component and its
+  * intended use.<br><br>
   *
   * This is the internal implementation of the standard power management
***************
*** 42,53 ****
   * 
   * @author Kevin Klues (klueska at cs.wustl.edu)
-  * @see  Please refer to TEP 115 for more information about this component and its
-  *          intended use.
   */
   
  generic module PowerManagerP() {
-   provides {
-     interface Init;
-   }
    uses {
      interface StdControl;
--- 44,50 ----
***************
*** 55,90 ****
  
      interface PowerDownCleanup;
-     interface Init as ArbiterInit;
      interface ResourceController;
    }
  }
  implementation {
  
!   norace struct {
!    uint8_t stopping :1;
!    uint8_t requested :1;
!   } f; //for flags
  
!   task void startTask() { 
      call StdControl.start();
      call SplitControl.start();
    }
-   task void stopTask() { 
-     call StdControl.stop(); 
-     call SplitControl.stop(); 
-   }
  
!   command error_t Init.init() {
!     f.stopping = FALSE;
!     f.requested = FALSE;
!     call ArbiterInit.init();
!     call ResourceController.immediateRequest();
!     return SUCCESS;
    }
  
    async event void ResourceController.requested() {
!     if(f.stopping == FALSE)
        post startTask();
!     else atomic f.requested = TRUE;
    }
    
--- 52,83 ----
  
      interface PowerDownCleanup;
      interface ResourceController;
+     interface ArbiterInfo;
    }
  }
  implementation {
  
!   norace bool stopping = FALSE;
!   norace bool requested  = FALSE;
  
!   task void startTask() {
      call StdControl.start();
      call SplitControl.start();
    }
  
!   task void stopTask() {
!     call PowerDownCleanup.cleanup();
!     call StdControl.stop();
!     call SplitControl.stop();    
    }
  
    async event void ResourceController.requested() {
!     if(stopping == FALSE) {
        post startTask();
!     }
!     else requested = TRUE;
!   }
! 
!   async event void ResourceController.immediateRequested() {
    }
    
***************
*** 101,126 ****
    }
    
!   async event void ResourceController.idle() {
!     if(call ResourceController.immediateRequest() == SUCCESS) {
!       f.stopping = TRUE;
!       call PowerDownCleanup.cleanup();
!       post stopTask();
!     }
    }
  
    event void SplitControl.stopDone(error_t error) {
!     if(f.requested == TRUE) {
        call StdControl.start();
        call SplitControl.start();
      }
      atomic {
!       f.requested = FALSE;
!       f.stopping = FALSE;
      }
    }
  
-   event void ResourceController.granted() {
-   }
- 
    default command error_t StdControl.stop() {
      return SUCCESS;
--- 94,113 ----
    }
    
!   async event void ResourceController.granted() {
!     atomic stopping = TRUE;
!     post stopTask();
    }
  
    event void SplitControl.stopDone(error_t error) {
!     if(requested == TRUE) {
        call StdControl.start();
        call SplitControl.start();
      }
      atomic {
!       requested = FALSE;
!       stopping = FALSE;
      }
    }
  
    default command error_t StdControl.stop() {
      return SUCCESS;

Index: SplitControlDeferredPowerManagerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/power/SplitControlDeferredPowerManagerC.nc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** SplitControlDeferredPowerManagerC.nc	19 Jun 2006 11:13:08 -0000	1.1.2.4
--- SplitControlDeferredPowerManagerC.nc	15 Aug 2006 11:51:13 -0000	1.1.2.5
***************
*** 30,33 ****
--- 30,35 ----
   
  /**
+  * 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
***************
*** 54,70 ****
   * 
   * @author Kevin Klues (klueska at cs.wustl.edu)
-  * @see  Please refer to TEP 115 for more information about this component and its
-  *          intended use.
   */
   
  generic configuration SplitControlDeferredPowerManagerC(uint32_t delay) {
-   provides {
-     interface Init;
-   }
    uses {
      interface SplitControl;
  
      interface PowerDownCleanup;
-     interface Init as ArbiterInit;
      interface ResourceController;
      interface ArbiterInfo;
--- 56,66 ----
***************
*** 74,79 ****
    components new TimerMilliC(),
               new DeferredPowerManagerP(delay) as PowerManager;
- 
-   Init = PowerManager;
   
    PowerManager.SplitControl = SplitControl;
--- 70,73 ----
***************
*** 81,85 ****
    PowerManager.PowerDownCleanup = PowerDownCleanup;
   
-   PowerManager.ArbiterInit  = ArbiterInit;
    PowerManager.ResourceController = ResourceController;
    PowerManager.ArbiterInfo = ArbiterInfo;
--- 75,78 ----

Index: SplitControlPowerManagerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/power/SplitControlPowerManagerC.nc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** SplitControlPowerManagerC.nc	19 Jun 2006 11:13:08 -0000	1.1.2.4
--- SplitControlPowerManagerC.nc	15 Aug 2006 11:51:13 -0000	1.1.2.5
***************
*** 30,33 ****
--- 30,35 ----
   
  /**
+  * 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
***************
*** 51,74 ****
   * 
   * @author Kevin Klues (klueska at cs.wustl.edu)
-  * @see  Please refer to TEP 115 for more information about this component and its
-  *          intended use.
   */
   
  generic configuration SplitControlPowerManagerC() {
-   provides {
-     interface Init;
-   }
    uses {
      interface SplitControl;
  
      interface PowerDownCleanup;
-     interface Init as ArbiterInit;
      interface ResourceController;
    }
  }
  implementation {
    components  new PowerManagerP() as PowerManager;
- 
-   Init = PowerManager;
   
    PowerManager.SplitControl = SplitControl;
--- 53,69 ----
   * 
   * @author Kevin Klues (klueska at cs.wustl.edu)
   */
   
  generic configuration SplitControlPowerManagerC() {
    uses {
      interface SplitControl;
  
      interface PowerDownCleanup;
      interface ResourceController;
+     interface ArbiterInfo;
    }
  }
  implementation {
    components  new PowerManagerP() as PowerManager;
   
    PowerManager.SplitControl = SplitControl;
***************
*** 76,81 ****
    PowerManager.PowerDownCleanup = PowerDownCleanup;
   
-   PowerManager.ArbiterInit  = ArbiterInit;
    PowerManager.ResourceController = ResourceController;
  }
  
--- 71,76 ----
    PowerManager.PowerDownCleanup = PowerDownCleanup;
   
    PowerManager.ResourceController = ResourceController;
+   PowerManager.ArbiterInfo = ArbiterInfo;
  }
  

Index: StdControlDeferredPowerManagerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/power/StdControlDeferredPowerManagerC.nc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** StdControlDeferredPowerManagerC.nc	19 Jun 2006 11:13:08 -0000	1.1.2.4
--- StdControlDeferredPowerManagerC.nc	15 Aug 2006 11:51:13 -0000	1.1.2.5
***************
*** 30,33 ****
--- 30,35 ----
   
  /**
+  * 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
***************
*** 54,71 ****
   * 
   * @author Kevin Klues (klueska at 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;
--- 56,67 ----
***************
*** 75,80 ****
    components new TimerMilliC(),
               new DeferredPowerManagerP(delay) as PowerManager;
- 
-   Init = PowerManager;
   
    PowerManager.StdControl = StdControl;
--- 71,74 ----
***************
*** 82,86 ****
    PowerManager.PowerDownCleanup = PowerDownCleanup;
   
-   PowerManager.ArbiterInit  = ArbiterInit;
    PowerManager.ResourceController = ResourceController;
    PowerManager.ArbiterInfo = ArbiterInfo;
--- 76,79 ----

Index: StdControlPowerManagerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/power/StdControlPowerManagerC.nc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** StdControlPowerManagerC.nc	19 Jun 2006 11:13:08 -0000	1.1.2.4
--- StdControlPowerManagerC.nc	15 Aug 2006 11:51:13 -0000	1.1.2.5
***************
*** 30,33 ****
--- 30,35 ----
   
  /**
+  * 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
***************
*** 51,75 ****
   * 
   * @author Kevin Klues (klueska at 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;
    }
  }
  implementation {
    components new PowerManagerP() as PowerManager;
- 
-   Init = PowerManager;
   
    PowerManager.StdControl = StdControl;
--- 53,70 ----
   * 
   * @author Kevin Klues (klueska at cs.wustl.edu)
   */
   
  generic configuration StdControlPowerManagerC()
  {
    uses {
      interface StdControl;
  
      interface PowerDownCleanup;
      interface ResourceController;
+     interface ArbiterInfo;
    }
  }
  implementation {
    components new PowerManagerP() as PowerManager;
   
    PowerManager.StdControl = StdControl;
***************
*** 77,82 ****
    PowerManager.PowerDownCleanup = PowerDownCleanup;
   
-   PowerManager.ArbiterInit  = ArbiterInit;
    PowerManager.ResourceController = ResourceController;
  }
  
--- 72,77 ----
    PowerManager.PowerDownCleanup = PowerDownCleanup;
   
    PowerManager.ResourceController = ResourceController;
+   PowerManager.ArbiterInfo = ArbiterInfo;
  }