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

[Kevin Klues]

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

Modified Files:
      Tag: tos-2-resource-pm-eval-cand
	MyComponentC.nc 
Log Message:
Changes to the Resource interfaces and arbiter implementations.  Now has support for immediateRequest again, and no longer need a separate PriorityArbiter because of the introduction of the ResourceRequested interface.  In fact the Resource interface is now back to what it was originally, with changes to the ResourceController interface and the introduction of the ResourceRequested interface simplifying the state machines in the arbiters.

See previous check in logs to read about these changes to the ResourceController interface.

Index: MyComponentC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestPowerManager/Attic/MyComponentC.nc,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -C2 -d -r1.1.4.5 -r1.1.4.6
*** MyComponentC.nc	27 Jun 2006 21:09:38 -0000	1.1.4.5
--- MyComponentC.nc	5 Jul 2006 12:01:27 -0000	1.1.4.6
***************
*** 45,50 ****
               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;
--- 45,50 ----
               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;