[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/TestPowerManager MyComponentC.nc, 1.1.4.2, 1.1.4.3

[Kevin Klues]

Update of /cvsroot/tinyos/tinyos-2.x/apps/tests/TestPowerManager
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30188/apps/tests/TestPowerManager

Modified Files:
      Tag: tos-2-resource-pm-eval-cand
	MyComponentC.nc 
Log Message:
changes to the Resource and PowerManager interfaces as discussed in the meeting on may 19th.

Index: MyComponentC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestPowerManager/Attic/MyComponentC.nc,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -C2 -d -r1.1.4.2 -r1.1.4.3
*** MyComponentC.nc	15 May 2006 18:30:57 -0000	1.1.4.2
--- MyComponentC.nc	7 Jun 2006 10:47:16 -0000	1.1.4.3
***************
*** 45,62 ****
    components MyComponentP, LedsC, 
               new TimerMilliC() as StartTimer, new TimerMilliC() as StopTimer,
!              new FcfsArbiterC(MYCOMPONENT_RESOURCE) as Arbiter,
  //              new AsyncStdControlPowerManagerC() as PowerManager;
! //              new AsyncStdControlDeferredPowerManagerC(750) as PowerManager;
  //              new StdControlPowerManagerC() as PowerManager;
  //              new StdControlDeferredPowerManagerC(750) as PowerManager;
  //              new SplitControlPowerManagerC() as PowerManager;
!              new SplitControlDeferredPowerManagerC(750) as PowerManager;
  
    Init = PowerManager;
    Resource = Arbiter;
  
! //   PowerManager.AsyncStdControl -> MyComponentP.AsyncStdControl;
  //   PowerManager.StdControl -> MyComponentP.StdControl;
!   PowerManager.SplitControl -> MyComponentP.SplitControl;
    PowerManager.ResourceController -> Arbiter.ResourceController;
    PowerManager.ArbiterInfo -> Arbiter.ArbiterInfo;
--- 45,62 ----
    components MyComponentP, LedsC, 
               new TimerMilliC() as StartTimer, new TimerMilliC() as StopTimer,
!              new ControlledFcfsArbiterC(MYCOMPONENT_RESOURCE) as Arbiter,
  //              new AsyncStdControlPowerManagerC() as PowerManager;
!              new AsyncStdControlDeferredPowerManagerC(750) as PowerManager;
  //              new StdControlPowerManagerC() as PowerManager;
  //              new StdControlDeferredPowerManagerC(750) as PowerManager;
  //              new SplitControlPowerManagerC() as PowerManager;
! //              new SplitControlDeferredPowerManagerC(750) as PowerManager;
  
    Init = PowerManager;
    Resource = Arbiter;
  
!   PowerManager.AsyncStdControl -> MyComponentP.AsyncStdControl;
  //   PowerManager.StdControl -> MyComponentP.StdControl;
! //   PowerManager.SplitControl -> MyComponentP.SplitControl;
    PowerManager.ResourceController -> Arbiter.ResourceController;
    PowerManager.ArbiterInfo -> Arbiter.ArbiterInfo;