[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/power AsyncDeferredPowerManagerP.nc, 1.1.2.2, 1.1.2.2.6.1 AsyncPowerManagerP.nc, 1.1.2.3, 1.1.2.3.2.1 AsyncStdControlDeferredPowerManagerC.nc, 1.1.2.3, 1.1.2.3.6.1 AsyncStdControlPowerManagerC.nc, 1.1.2.4, 1.1.2.4.2.1 DeferredPowerManagerP.nc, 1.1.2.4, 1.1.2.4.6.1 PowerManagerP.nc, 1.1.2.3, 1.1.2.3.2.1 SplitControlDeferredPowerManagerC.nc, 1.1.2.3, 1.1.2.3.6.1 SplitControlPowerManagerC.nc, 1.1.2.3, 1.1.2.3.2.1 StdControlDeferredPowerManagerC.nc, 1.1.2.3, 1.1.2.3.6.1 StdControlPowerManagerC.nc, 1.1.2.3, 1.1.2.3.2.1

Kevin Klues klueska at users.sourceforge.net
Mon May 15 11:23:17 PDT 2006 

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

Modified Files:
      Tag: tos-2-resource-pm-eval-cand
	AsyncDeferredPowerManagerP.nc AsyncPowerManagerP.nc 
	AsyncStdControlDeferredPowerManagerC.nc 
	AsyncStdControlPowerManagerC.nc DeferredPowerManagerP.nc 
	PowerManagerP.nc SplitControlDeferredPowerManagerC.nc 
	SplitControlPowerManagerC.nc 
	StdControlDeferredPowerManagerC.nc StdControlPowerManagerC.nc 
Log Message:
Updates to power managers to reflect changes to arbiters

Index: AsyncDeferredPowerManagerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/power/Attic/AsyncDeferredPowerManagerP.nc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.2.6.1
diff -C2 -d -r1.1.2.2 -r1.1.2.2.6.1
*** AsyncDeferredPowerManagerP.nc	27 Jan 2006 02:38:04 -0000	1.1.2.2
--- AsyncDeferredPowerManagerP.nc	15 May 2006 18:23:14 -0000	1.1.2.2.6.1
***************
*** 58,62 ****
  
      interface PowerDownCleanup;
-     interface Init as ArbiterInit;
      interface ResourceController;
      interface ArbiterInfo;
--- 58,61 ----
***************
*** 78,87 ****
      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();
--- 77,85 ----
      f.stopping = FALSE;
      f.requested = FALSE;
      call ResourceController.immediateRequest();
      return SUCCESS;
    }
  
!   event void ResourceController.requested() {
      if(f.stopping == FALSE) {
        call AsyncStdControl.start();
***************
*** 91,95 ****
    }
  
!   async event void ResourceController.idle() {
      if(!(call ArbiterInfo.inUse()))
        post timerTask();
--- 89,93 ----
    }
  
!   event void ResourceController.idle() {
      if(!(call ArbiterInfo.inUse()))
        post timerTask();

Index: AsyncPowerManagerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/power/Attic/AsyncPowerManagerP.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.3.2.1
diff -C2 -d -r1.1.2.3 -r1.1.2.3.2.1
*** AsyncPowerManagerP.nc	10 Mar 2006 02:19:23 -0000	1.1.2.3
--- AsyncPowerManagerP.nc	15 May 2006 18:23:15 -0000	1.1.2.3.2.1
***************
*** 54,59 ****
  
      interface PowerDownCleanup;
-     interface Init as ArbiterInit;
      interface ResourceController;
    }
  }
--- 54,59 ----
  
      interface PowerDownCleanup;
      interface ResourceController;
+     interface ArbiterInfo;
    }
  }
***************
*** 66,75 ****
    
    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();
--- 66,74 ----
    
    command error_t Init.init() {
      call ResourceController.immediateRequest();
      return SUCCESS;
    }
  
!   event void ResourceController.requested() {
      if(f.stopping == FALSE) {
        call AsyncStdControl.start();
***************
*** 79,83 ****
    }
  
!   async event void ResourceController.idle() {
      if(call ResourceController.immediateRequest() == SUCCESS) {
        atomic f.stopping = TRUE;
--- 78,82 ----
    }
  
!   event void ResourceController.idle() {
      if(call ResourceController.immediateRequest() == SUCCESS) {
        atomic f.stopping = TRUE;

Index: AsyncStdControlDeferredPowerManagerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/power/Attic/AsyncStdControlDeferredPowerManagerC.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.3.6.1
diff -C2 -d -r1.1.2.3 -r1.1.2.3.6.1
*** AsyncStdControlDeferredPowerManagerC.nc	27 Jan 2006 02:38:05 -0000	1.1.2.3
--- AsyncStdControlDeferredPowerManagerC.nc	15 May 2006 18:23:15 -0000	1.1.2.3.6.1
***************
*** 67,71 ****
  
      interface PowerDownCleanup;
-     interface Init as ArbiterInit;
      interface ResourceController;
      interface ArbiterInfo;
--- 67,70 ----
***************
*** 82,86 ****
    PowerManager.PowerDownCleanup = PowerDownCleanup;
   
-   PowerManager.ArbiterInit  = ArbiterInit;
    PowerManager.ResourceController = ResourceController;
    PowerManager.ArbiterInfo = ArbiterInfo;
--- 81,84 ----

Index: AsyncStdControlPowerManagerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/power/Attic/AsyncStdControlPowerManagerC.nc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.4.2.1
diff -C2 -d -r1.1.2.4 -r1.1.2.4.2.1
*** AsyncStdControlPowerManagerC.nc	15 Mar 2006 16:40:32 -0000	1.1.2.4
--- AsyncStdControlPowerManagerC.nc	15 May 2006 18:23:15 -0000	1.1.2.4.2.1
***************
*** 64,69 ****
  
      interface PowerDownCleanup;
-     interface Init as ArbiterInit;
      interface ResourceController;
    }
  }
--- 64,69 ----
  
      interface PowerDownCleanup;
      interface ResourceController;
+     interface ArbiterInfo;
    }
  }
***************
*** 77,82 ****
    PowerManager.PowerDownCleanup = PowerDownCleanup;
   
-   PowerManager.ArbiterInit  = ArbiterInit;
    PowerManager.ResourceController = ResourceController;
  }
  
--- 77,82 ----
    PowerManager.PowerDownCleanup = PowerDownCleanup;
   
    PowerManager.ResourceController = ResourceController;
+   PowerManager.ArbiterInfo = ArbiterInfo;
  }
  

Index: DeferredPowerManagerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/power/Attic/DeferredPowerManagerP.nc,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.4.6.1
diff -C2 -d -r1.1.2.4 -r1.1.2.4.6.1
*** DeferredPowerManagerP.nc	27 Jan 2006 02:38:05 -0000	1.1.2.4
--- DeferredPowerManagerP.nc	15 May 2006 18:23:15 -0000	1.1.2.4.6.1
***************
*** 59,63 ****
  
      interface PowerDownCleanup;
-     interface Init as ArbiterInit;
      interface ResourceController;
      interface ArbiterInfo;
--- 59,62 ----
***************
*** 83,92 ****
      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();
--- 82,90 ----
      f.stopping = FALSE;
      f.requested = FALSE;
      call ResourceController.immediateRequest();
      return SUCCESS;
    }
  
!   event void ResourceController.requested() {
      if(f.stopping == FALSE)
        post startTask();
***************
*** 106,110 ****
    }
  
!   async event void ResourceController.idle() {
      if(!(call ArbiterInfo.inUse()))
        post timerTask();
--- 104,108 ----
    }
  
!   event void ResourceController.idle() {
      if(!(call ArbiterInfo.inUse()))
        post timerTask();

Index: PowerManagerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/power/Attic/PowerManagerP.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.3.2.1
diff -C2 -d -r1.1.2.3 -r1.1.2.3.2.1
*** PowerManagerP.nc	10 Mar 2006 02:19:23 -0000	1.1.2.3
--- PowerManagerP.nc	15 May 2006 18:23:15 -0000	1.1.2.3.2.1
***************
*** 55,60 ****
  
      interface PowerDownCleanup;
-     interface Init as ArbiterInit;
      interface ResourceController;
    }
  }
--- 55,60 ----
  
      interface PowerDownCleanup;
      interface ResourceController;
+     interface ArbiterInfo;
    }
  }
***************
*** 78,87 ****
      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();
--- 78,86 ----
      f.stopping = FALSE;
      f.requested = FALSE;
      call ResourceController.immediateRequest();
      return SUCCESS;
    }
  
!   event void ResourceController.requested() {
      if(f.stopping == FALSE)
        post startTask();
***************
*** 101,105 ****
    }
    
!   async event void ResourceController.idle() {
      if(call ResourceController.immediateRequest() == SUCCESS) {
        f.stopping = TRUE;
--- 100,104 ----
    }
    
!   event void ResourceController.idle() {
      if(call ResourceController.immediateRequest() == SUCCESS) {
        f.stopping = TRUE;

Index: SplitControlDeferredPowerManagerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/power/Attic/SplitControlDeferredPowerManagerC.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.3.6.1
diff -C2 -d -r1.1.2.3 -r1.1.2.3.6.1
*** SplitControlDeferredPowerManagerC.nc	27 Jan 2006 02:38:05 -0000	1.1.2.3
--- SplitControlDeferredPowerManagerC.nc	15 May 2006 18:23:15 -0000	1.1.2.3.6.1
***************
*** 66,70 ****
  
      interface PowerDownCleanup;
-     interface Init as ArbiterInit;
      interface ResourceController;
      interface ArbiterInfo;
--- 66,69 ----
***************
*** 81,85 ****
    PowerManager.PowerDownCleanup = PowerDownCleanup;
   
-   PowerManager.ArbiterInit  = ArbiterInit;
    PowerManager.ResourceController = ResourceController;
    PowerManager.ArbiterInfo = ArbiterInfo;
--- 80,83 ----

Index: SplitControlPowerManagerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/power/Attic/SplitControlPowerManagerC.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.3.2.1
diff -C2 -d -r1.1.2.3 -r1.1.2.3.2.1
*** SplitControlPowerManagerC.nc	10 Mar 2006 02:19:23 -0000	1.1.2.3
--- SplitControlPowerManagerC.nc	15 May 2006 18:23:15 -0000	1.1.2.3.2.1
***************
*** 63,68 ****
  
      interface PowerDownCleanup;
-     interface Init as ArbiterInit;
      interface ResourceController;
    }
  }
--- 63,68 ----
  
      interface PowerDownCleanup;
      interface ResourceController;
+     interface ArbiterInfo;
    }
  }
***************
*** 76,81 ****
    PowerManager.PowerDownCleanup = PowerDownCleanup;
   
-   PowerManager.ArbiterInit  = ArbiterInit;
    PowerManager.ResourceController = ResourceController;
  }
  
--- 76,81 ----
    PowerManager.PowerDownCleanup = PowerDownCleanup;
   
    PowerManager.ResourceController = ResourceController;
+   PowerManager.ArbiterInfo = ArbiterInfo;
  }
  

Index: StdControlDeferredPowerManagerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/power/Attic/StdControlDeferredPowerManagerC.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.3.6.1
diff -C2 -d -r1.1.2.3 -r1.1.2.3.6.1
*** StdControlDeferredPowerManagerC.nc	27 Jan 2006 02:38:05 -0000	1.1.2.3
--- StdControlDeferredPowerManagerC.nc	15 May 2006 18:23:15 -0000	1.1.2.3.6.1
***************
*** 67,71 ****
  
      interface PowerDownCleanup;
-     interface Init as ArbiterInit;
      interface ResourceController;
      interface ArbiterInfo;
--- 67,70 ----
***************
*** 82,86 ****
    PowerManager.PowerDownCleanup = PowerDownCleanup;
   
-   PowerManager.ArbiterInit  = ArbiterInit;
    PowerManager.ResourceController = ResourceController;
    PowerManager.ArbiterInfo = ArbiterInfo;
--- 81,84 ----

Index: StdControlPowerManagerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/power/Attic/StdControlPowerManagerC.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.3.2.1
diff -C2 -d -r1.1.2.3 -r1.1.2.3.2.1
*** StdControlPowerManagerC.nc	10 Mar 2006 02:19:23 -0000	1.1.2.3
--- StdControlPowerManagerC.nc	15 May 2006 18:23:15 -0000	1.1.2.3.2.1
***************
*** 64,69 ****
  
      interface PowerDownCleanup;
-     interface Init as ArbiterInit;
      interface ResourceController;
    }
  }
--- 64,69 ----
  
      interface PowerDownCleanup;
      interface ResourceController;
+     interface ArbiterInfo;
    }
  }
***************
*** 77,82 ****
    PowerManager.PowerDownCleanup = PowerDownCleanup;
   
-   PowerManager.ArbiterInit  = ArbiterInit;
    PowerManager.ResourceController = ResourceController;
  }
  
--- 77,82 ----
    PowerManager.PowerDownCleanup = PowerDownCleanup;
   
    PowerManager.ResourceController = ResourceController;
+   PowerManager.ArbiterInfo = ArbiterInfo;
  }

More information about the Tinyos-2-commits mailing list