Update of files to align them with TEP108 changes to ResourceController interface...

diff --git a/apps/tests/TestPowerManager/MyComponentC.nc b/apps/tests/TestPowerManager/MyComponentC.nc
index 1f06dc5b12a37a90e044b035f0b74398fa68f383..022c8fd4dbd3292297ccb952f71ef3045d8b9c91 100644 (file)
--- a/apps/tests/TestPowerManager/MyComponentC.nc
+++ b/apps/tests/TestPowerManager/MyComponentC.nc
@@ -56,7 +56,7 @@ implementation {
   PowerManager.AsyncStdControl -> MyComponentP.AsyncStdControl;
 //   PowerManager.StdControl -> MyComponentP.StdControl;
 //   PowerManager.SplitControl -> MyComponentP.SplitControl;
-  PowerManager.ResourceController -> Arbiter.ResourceController;
+  PowerManager.ResourceDefaultOwner -> Arbiter.ResourceDefaultOwner;
   PowerManager.ArbiterInfo -> Arbiter.ArbiterInfo;
 
   MyComponentP.Leds -> LedsC;

diff --git a/apps/tests/TestSharedResource/SharedResourceP.nc b/apps/tests/TestSharedResource/SharedResourceP.nc
index a5e726236edce5ed28d1844828fc2c84c75fb863..4811ed781d3f15e6a23dedca0241873c784c3fdb 100644 (file)
--- a/apps/tests/TestSharedResource/SharedResourceP.nc
+++ b/apps/tests/TestSharedResource/SharedResourceP.nc
@@ -47,7 +47,7 @@ implementation {
   ResourceRequested = Arbiter;
   ResourceConfigure = Arbiter;
   SharedResourceImplP.ArbiterInfo -> Arbiter;
-  PowerManager.ResourceController -> Arbiter;
+  PowerManager.ResourceDefaultOwner -> Arbiter;
   
   PowerManager.SplitControl -> ResourceP;
   SharedResourceImplP.ResourceOperations -> ResourceP;

diff --git a/doc/html/tep109.html b/doc/html/tep109.html
index 0de30da7eb3559dcbf10961e5ee859a7c0a8f9a5..27ed3ab49f08b97e384993d4c8129b45a13e4714 100644 (file)
--- a/doc/html/tep109.html
+++ b/doc/html/tep109.html
@@ -1019,7 +1019,7 @@ implementation {
   SplitControlPowerManagerC.SplitControl -> HplSensirionSht11P;
   SplitControlPowerManagerC.ArbiterInit -> Arbiter.Init;
   SplitControlPowerManagerC.ArbiterInfo -> Arbiter.ArbiterInfo;
-  SplitControlPowerManagerC.ResourceController -> Arbiter.ResourceController;
+  SplitControlPowerManagerC.ResourceDefaultOwner -> Arbiter.ResourceDefaultOwner;
 }
 </pre>
 <pre class="literal-block">

diff --git a/doc/html/tutorial/lesson8.html b/doc/html/tutorial/lesson8.html
index 232133d5b5044f7678c5d55b64b9b266400964d9..c48eb4c65f606d294f50ba25eb386f8dfbc63295 100644 (file)
--- a/doc/html/tutorial/lesson8.html
+++ b/doc/html/tutorial/lesson8.html
@@ -79,7 +79,7 @@ and holding on to it no longer than necessary. Clients explicitly release resour
 </p>\r
 \r
 <p>\r
-Shared resources are essentially built on top of dedicated resources, with access to them being controlled by an arbiter component.  In this way, <b>power managers</b> can be used to automatically control the power state of these resources through their <tt>AsyncStdControl</tt>, <tt>StdControl</tt>, or <tt>SplitControl</tt> interfaces.  They communicate with the arbiter (through the use of a <tt>ResourceController</tt> interface), monitoring whether the resource is being used by any of its clients and powering it on/off accordingly.  The figure below shows how an arbiter component and a power manager can be wired together to provide arbitration and automatic power management for a shared resource.\r
+Shared resources are essentially built on top of dedicated resources, with access to them being controlled by an arbiter component.  In this way, <b>power managers</b> can be used to automatically control the power state of these resources through their <tt>AsyncStdControl</tt>, <tt>StdControl</tt>, or <tt>SplitControl</tt> interfaces.  They communicate with the arbiter (through the use of a <tt>ResourceDefaultOwner</tt> interface), monitoring whether the resource is being used by any of its clients and powering it on/off accordingly.  The figure below shows how an arbiter component and a power manager can be wired together to provide arbitration and automatic power management for a shared resource.\r
 </p>\r
 \r
 <center>\r
@@ -92,7 +92,7 @@ Figure 1: Arbiters and Power Managers
 </center>\r
 \r
 <p>\r
-The arbiter component provides the <tt>Resource</tt>, <tt>ArbiterInfo</tt>, <tt>ResourceRequested</tt>, and <tt>ResourceController</tt> interfaces and uses the <tt>ResourceConfigure</tt> interface.  The power manager doesn't provide any interfaces, but uses one of either the <tt>AsyncStdControl</tt>, <tt>StdControl</tt>, or <tt>SplitControl</tt> interfaces from the underlying resource, as well as the <tt>ResourceController</tt> interface provided by the arbiter.  The figure below shows how these interface are then wired together with the implementation of a shared resource.  Please refer to TEP 108 for more information on arbiters and TEP 115 for more information on Power Managers.\r
+The arbiter component provides the <tt>Resource</tt>, <tt>ArbiterInfo</tt>, <tt>ResourceRequested</tt>, and <tt>ResourceDefaultOwner</tt> interfaces and uses the <tt>ResourceConfigure</tt> interface.  The power manager doesn't provide any interfaces, but uses one of either the <tt>AsyncStdControl</tt>, <tt>StdControl</tt>, or <tt>SplitControl</tt> interfaces from the underlying resource, as well as the <tt>ResourceDefaultOwner</tt> interface provided by the arbiter.  The figure below shows how these interface are then wired together with the implementation of a shared resource.  Please refer to TEP 108 for more information on arbiters and TEP 115 for more information on Power Managers.\r
 </p>\r
 \r
 <center>\r
@@ -307,7 +307,7 @@ implementation {
   ResourceRequested = Arbiter;\r
   ResourceConfigure = Arbiter;\r
   SharedResourceImplP.ArbiterInfo -> Arbiter;\r
-  PowerManager.ResourceController -> Arbiter;\r
+  PowerManager.ResourceDefaultOwner -> Arbiter;\r
   \r
   PowerManager.SplitControl -> ResourceP;\r
   SharedResourceImplP.ResourceOperations -> ResourceP;\r

diff --git a/doc/txt/tep109.txt b/doc/txt/tep109.txt
index 08a451e525f082eb285f5c997a0c321119309dfc..566db01f8579446b5563f427a295e58630a4079e 100644 (file)
--- a/doc/txt/tep109.txt
+++ b/doc/txt/tep109.txt
@@ -756,7 +756,7 @@ on top of the I2C or SPI bus would likely require fewer components.
     SplitControlPowerManagerC.SplitControl -> HplSensirionSht11P;
     SplitControlPowerManagerC.ArbiterInit -> Arbiter.Init;
     SplitControlPowerManagerC.ArbiterInfo -> Arbiter.ArbiterInfo;
-    SplitControlPowerManagerC.ResourceController -> Arbiter.ResourceController;
+    SplitControlPowerManagerC.ResourceDefaultOwner -> Arbiter.ResourceDefaultOwner;
   }
   
 ::

diff --git a/tos/chips/at45db/At45dbC.nc b/tos/chips/at45db/At45dbC.nc
index 002be4e499ae221c45df6b6e08eff66610ae1494..86d12746950fb9972d80c516c4287d1782a49a4b 100644 (file)
--- a/tos/chips/at45db/At45dbC.nc
+++ b/tos/chips/at45db/At45dbC.nc
@@ -24,7 +24,7 @@ configuration At45dbC
   provides {
     interface At45db;
     interface Resource[uint8_t client];
-    interface ResourceController;
+    interface ResourceDefaultOwner;
     interface ArbiterInfo;
   }
 }
@@ -35,7 +35,7 @@ implementation
 
   At45db = At45dbP;
   Resource = Arbiter;
-  ResourceController = Arbiter;
+  ResourceDefaultOwner = Arbiter;
   ArbiterInfo = Arbiter;
 
   MainC.SoftwareInit -> At45dbP;

diff --git a/tos/chips/atm128/adc/Atm128AdcC.nc b/tos/chips/atm128/adc/Atm128AdcC.nc
index a2b583c75ca230ab40b8c56b5f6d7ae17cf19a20..12d9cf140a8afa0ab6de7e2d4a39ba54414c2e5f 100644 (file)
--- a/tos/chips/atm128/adc/Atm128AdcC.nc
+++ b/tos/chips/atm128/adc/Atm128AdcC.nc
@@ -65,5 +65,5 @@ implementation
   Atm128AdcP.Atm128Calibrate -> PlatformC;
 
   PM.AsyncStdControl -> Atm128AdcP;
-  PM.ResourceController -> AdcArbiter;
+  PM.ResourceDefaultOwner -> AdcArbiter;
 }

diff --git a/tos/chips/atm128/i2c/Atm128I2CMasterP.nc b/tos/chips/atm128/i2c/Atm128I2CMasterP.nc
index 109db94ff2ae9332ecd751bd4656a5ed0a9f66f9..8f077e29772f2ffa724b7f90b58029697cc94971 100644 (file)
--- a/tos/chips/atm128/i2c/Atm128I2CMasterP.nc
+++ b/tos/chips/atm128/i2c/Atm128I2CMasterP.nc
@@ -65,7 +65,7 @@ implementation {
   I2C.Atm128I2C -> Master;
   
   Power.AsyncStdControl -> Master;
-  Power.ResourceController -> Arbiter;
+  Power.ResourceDefaultOwner -> Arbiter;
 
   Master.I2C -> HplAtm128I2CBusC;
   Master.ReadDebugLeds -> NoLedsC;

diff --git a/tos/chips/msp430/usart/Msp430UsartShare1P.nc b/tos/chips/msp430/usart/Msp430UsartShare1P.nc
index 153906a72acd234ccb94e9f7f0e24322a40d52bc..1b6edcf5b78d620c9db706c18c2bfc7200e03368 100644 (file)
--- a/tos/chips/msp430/usart/Msp430UsartShare1P.nc
+++ b/tos/chips/msp430/usart/Msp430UsartShare1P.nc
@@ -57,7 +57,7 @@ implementation {
   UsartShareP.ArbiterInfo -> ArbiterC;
 
   components new AsyncStdControlPowerManagerC() as PowerManagerC;
-  PowerManagerC.ResourceController -> ArbiterC;
+  PowerManagerC.ResourceDefaultOwner -> ArbiterC;
        
   components HplMsp430Usart1C as UsartC;
   PowerManagerC.AsyncStdControl -> UsartC;

diff --git a/tos/chips/stm25p/Stm25pSectorC.nc b/tos/chips/stm25p/Stm25pSectorC.nc
index 1f0e5dd117a917c493044c959cf37359992cd669..416b9ee567d548f6c0eb16f9cda9906cb99b60c3 100644 (file)
--- a/tos/chips/stm25p/Stm25pSectorC.nc
+++ b/tos/chips/stm25p/Stm25pSectorC.nc
@@ -59,7 +59,7 @@ implementation {
 
   components new SplitControlDeferredPowerManagerC( 1024 ) as PowerManagerC;
   PowerManagerC.SplitControl -> SectorP;
-  PowerManagerC.ResourceController -> ArbiterC;
+  PowerManagerC.ResourceDefaultOwner -> ArbiterC;
   PowerManagerC.ArbiterInfo -> ArbiterC;
 
   components Stm25pSpiC as SpiC;

diff --git a/tos/lib/power/AsyncDeferredPowerManagerP.nc b/tos/lib/power/AsyncDeferredPowerManagerP.nc
index 0344a7fe855d0b22c6d94ffa3ab5a203da6831db..73be3d537177d106665b1fa3b1d1a65d4d67d744 100644 (file)
--- a/tos/lib/power/AsyncDeferredPowerManagerP.nc
+++ b/tos/lib/power/AsyncDeferredPowerManagerP.nc
@@ -54,7 +54,7 @@ generic module AsyncDeferredPowerManagerP(uint32_t delay) {
     interface AsyncStdControl;
 
     interface PowerDownCleanup;
-    interface ResourceController;
+    interface ResourceDefaultOwner;
     interface ArbiterInfo;
     interface Timer<TMilli> as TimerMilli;
   }
@@ -73,21 +73,21 @@ implementation {
       call TimerMilli.startOneShot(delay);
   }
 
-  async event void ResourceController.requested() {
+  async event void ResourceDefaultOwner.requested() {
     stopTimer = TRUE;
     post stopTimerTask();
     call AsyncStdControl.start();
-    call ResourceController.release();
+    call ResourceDefaultOwner.release();
   }
 
-  async event void ResourceController.immediateRequested() {
+  async event void ResourceDefaultOwner.immediateRequested() {
     stopTimer = TRUE;
     post stopTimerTask();
     call AsyncStdControl.start();
-    call ResourceController.release();
+    call ResourceDefaultOwner.release();
   }
 
-  async event void ResourceController.granted() {
+  async event void ResourceDefaultOwner.granted() {
       post timerTask();
   }
 

diff --git a/tos/lib/power/AsyncPowerManagerP.nc b/tos/lib/power/AsyncPowerManagerP.nc
index bf745dfd052e77c468d1dc4e150fddd90446da33..9f15cd3b50428247b22089a52c92a37096650bbe 100644 (file)
--- a/tos/lib/power/AsyncPowerManagerP.nc
+++ b/tos/lib/power/AsyncPowerManagerP.nc
@@ -50,23 +50,23 @@ generic module AsyncPowerManagerP() {
     interface AsyncStdControl;
 
     interface PowerDownCleanup;
-    interface ResourceController;
+    interface ResourceDefaultOwner;
     interface ArbiterInfo;
   }
 }
 implementation {
 
-  async event void ResourceController.requested() {
+  async event void ResourceDefaultOwner.requested() {
     call AsyncStdControl.start();
-    call ResourceController.release(); 
+    call ResourceDefaultOwner.release(); 
   }
 
-  async event void ResourceController.immediateRequested() {
+  async event void ResourceDefaultOwner.immediateRequested() {
     call AsyncStdControl.start();
-    call ResourceController.release();
+    call ResourceDefaultOwner.release();
   } 
 
-  async event void ResourceController.granted() {
+  async event void ResourceDefaultOwner.granted() {
     call PowerDownCleanup.cleanup();
     call AsyncStdControl.stop();
   }

diff --git a/tos/lib/power/AsyncStdControlDeferredPowerManagerC.nc b/tos/lib/power/AsyncStdControlDeferredPowerManagerC.nc
index eddb9980d4f5d7a0fde09bc4824af0eeff440048..e050bd2da101b85d162c1ea01362ff3b54b6c736 100644 (file)
--- a/tos/lib/power/AsyncStdControlDeferredPowerManagerC.nc
+++ b/tos/lib/power/AsyncStdControlDeferredPowerManagerC.nc
@@ -63,7 +63,7 @@ generic configuration AsyncStdControlDeferredPowerManagerC(uint32_t delay)
     interface AsyncStdControl;
 
     interface PowerDownCleanup;
-    interface ResourceController;
+    interface ResourceDefaultOwner;
     interface ArbiterInfo;
   }
 }
@@ -74,7 +74,7 @@ implementation {
   PowerManager.AsyncStdControl = AsyncStdControl;
   PowerManager.PowerDownCleanup = PowerDownCleanup;
  
-  PowerManager.ResourceController = ResourceController;
+  PowerManager.ResourceDefaultOwner = ResourceDefaultOwner;
   PowerManager.ArbiterInfo = ArbiterInfo;
 
   PowerManager.TimerMilli -> TimerMilliC;

diff --git a/tos/lib/power/AsyncStdControlPowerManagerC.nc b/tos/lib/power/AsyncStdControlPowerManagerC.nc
index d345d0ba2bb0642167dabef710f38cf287f1a6af..476c403e3b92bf848503745f6a2f52a94d4d5a1c 100644 (file)
--- a/tos/lib/power/AsyncStdControlPowerManagerC.nc
+++ b/tos/lib/power/AsyncStdControlPowerManagerC.nc
@@ -60,7 +60,7 @@ generic configuration AsyncStdControlPowerManagerC()
     interface AsyncStdControl;
 
     interface PowerDownCleanup;
-    interface ResourceController;
+    interface ResourceDefaultOwner;
     interface ArbiterInfo;
   }
 }
@@ -71,7 +71,7 @@ implementation {
 
   PowerManager.PowerDownCleanup = PowerDownCleanup;
  
-  PowerManager.ResourceController = ResourceController;
+  PowerManager.ResourceDefaultOwner = ResourceDefaultOwner;
   PowerManager.ArbiterInfo = ArbiterInfo;
 }
 

diff --git a/tos/lib/power/DeferredPowerManagerP.nc b/tos/lib/power/DeferredPowerManagerP.nc
index 1009e2c58875136d8a0b77788869151b28d86682..250042cee03e3ff41a48bc5126890d4c8619c033 100644 (file)
--- a/tos/lib/power/DeferredPowerManagerP.nc
+++ b/tos/lib/power/DeferredPowerManagerP.nc
@@ -55,7 +55,7 @@ generic module DeferredPowerManagerP(uint32_t delay) {
     interface SplitControl;
 
     interface PowerDownCleanup;
-    interface ResourceController;
+    interface ResourceDefaultOwner;
     interface ArbiterInfo;
     interface Timer<TMilli> as TimerMilli;
   }
@@ -77,7 +77,7 @@ implementation {
     call TimerMilli.startOneShot(delay); 
   }
 
-  async event void ResourceController.requested() {
+  async event void ResourceDefaultOwner.requested() {
     if(stopping == FALSE) {
       stopTimer = TRUE;
       post startTask();
@@ -85,7 +85,7 @@ implementation {
     else atomic requested = TRUE;
   }
 
-  async event void ResourceController.immediateRequested() {
+  async event void ResourceDefaultOwner.immediateRequested() {
   }
 
   default command error_t StdControl.start() {
@@ -97,10 +97,10 @@ implementation {
   }
 
   event void SplitControl.startDone(error_t error) {
-    call ResourceController.release();
+    call ResourceDefaultOwner.release();
   }
 
-  async event void ResourceController.granted() {
+  async event void ResourceDefaultOwner.granted() {
     post timerTask();
   }
 

diff --git a/tos/lib/power/PowerManagerP.nc b/tos/lib/power/PowerManagerP.nc
index b0c6046f7d939d4ae4d8a1722f28a00a535bbb02..7423b520aaea96fefaf4e32249e675a964c02e22 100644 (file)
--- a/tos/lib/power/PowerManagerP.nc
+++ b/tos/lib/power/PowerManagerP.nc
@@ -51,7 +51,7 @@ generic module PowerManagerP() {
     interface SplitControl;
 
     interface PowerDownCleanup;
-    interface ResourceController;
+    interface ResourceDefaultOwner;
     interface ArbiterInfo;
   }
 }
@@ -71,14 +71,14 @@ implementation {
     call SplitControl.stop();    
   }
 
-  async event void ResourceController.requested() {
+  async event void ResourceDefaultOwner.requested() {
     if(stopping == FALSE) {
       post startTask();
     }
     else requested = TRUE;
   }
 
-  async event void ResourceController.immediateRequested() {
+  async event void ResourceDefaultOwner.immediateRequested() {
   }
   
   default command error_t StdControl.start() {
@@ -90,10 +90,10 @@ implementation {
   }
 
   event void SplitControl.startDone(error_t error) {
-    call ResourceController.release();
+    call ResourceDefaultOwner.release();
   }
   
-  async event void ResourceController.granted() {
+  async event void ResourceDefaultOwner.granted() {
     atomic stopping = TRUE;
     post stopTask();
   }

diff --git a/tos/lib/power/SplitControlDeferredPowerManagerC.nc b/tos/lib/power/SplitControlDeferredPowerManagerC.nc
index 7bc529191692ceb055368c72d35a79cb35143363..8c55753499967884620edb887a0a70e9be26d9d3 100644 (file)
--- a/tos/lib/power/SplitControlDeferredPowerManagerC.nc
+++ b/tos/lib/power/SplitControlDeferredPowerManagerC.nc
@@ -62,7 +62,7 @@ generic configuration SplitControlDeferredPowerManagerC(uint32_t delay) {
     interface SplitControl;
 
     interface PowerDownCleanup;
-    interface ResourceController;
+    interface ResourceDefaultOwner;
     interface ArbiterInfo;
   }
 }
@@ -74,7 +74,7 @@ implementation {
 
   PowerManager.PowerDownCleanup = PowerDownCleanup;
  
-  PowerManager.ResourceController = ResourceController;
+  PowerManager.ResourceDefaultOwner = ResourceDefaultOwner;
   PowerManager.ArbiterInfo = ArbiterInfo;
 
   PowerManager.TimerMilli -> TimerMilliC;

diff --git a/tos/lib/power/SplitControlPowerManagerC.nc b/tos/lib/power/SplitControlPowerManagerC.nc
index 7b46758c2d5418963240e6102e9fedb476c4bf7e..8057d2e62c7c57a01f82e3230c30ae3c6b55c0da 100644 (file)
--- a/tos/lib/power/SplitControlPowerManagerC.nc
+++ b/tos/lib/power/SplitControlPowerManagerC.nc
@@ -59,7 +59,7 @@ generic configuration SplitControlPowerManagerC() {
     interface SplitControl;
 
     interface PowerDownCleanup;
-    interface ResourceController;
+    interface ResourceDefaultOwner;
     interface ArbiterInfo;
   }
 }
@@ -70,7 +70,7 @@ implementation {
 
   PowerManager.PowerDownCleanup = PowerDownCleanup;
  
-  PowerManager.ResourceController = ResourceController;
+  PowerManager.ResourceDefaultOwner = ResourceDefaultOwner;
   PowerManager.ArbiterInfo = ArbiterInfo;
 }
 

diff --git a/tos/lib/power/StdControlDeferredPowerManagerC.nc b/tos/lib/power/StdControlDeferredPowerManagerC.nc
index 54a0052931465237d5b749c5eb9fd17606fc9d4f..51c0d5479b0c9b9971240074b3abde7f2e7bc88a 100644 (file)
--- a/tos/lib/power/StdControlDeferredPowerManagerC.nc
+++ b/tos/lib/power/StdControlDeferredPowerManagerC.nc
@@ -63,7 +63,7 @@ generic configuration StdControlDeferredPowerManagerC(uint32_t delay)
     interface StdControl;
 
     interface PowerDownCleanup;
-    interface ResourceController;
+    interface ResourceDefaultOwner;
     interface ArbiterInfo;
   }
 }
@@ -75,7 +75,7 @@ implementation {
 
   PowerManager.PowerDownCleanup = PowerDownCleanup;
  
-  PowerManager.ResourceController = ResourceController;
+  PowerManager.ResourceDefaultOwner = ResourceDefaultOwner;
   PowerManager.ArbiterInfo = ArbiterInfo;
 
   PowerManager.TimerMilli -> TimerMilliC;

diff --git a/tos/lib/power/StdControlPowerManagerC.nc b/tos/lib/power/StdControlPowerManagerC.nc
index 663fbcd5b016d31bd95e822ffdfd0980996d0dba..8d89d3cf8821096f859c2cbe592619c52098db5a 100644 (file)
--- a/tos/lib/power/StdControlPowerManagerC.nc
+++ b/tos/lib/power/StdControlPowerManagerC.nc
@@ -60,7 +60,7 @@ generic configuration StdControlPowerManagerC()
     interface StdControl;
 
     interface PowerDownCleanup;
-    interface ResourceController;
+    interface ResourceDefaultOwner;
     interface ArbiterInfo;
   }
 }
@@ -71,7 +71,7 @@ implementation {
 
   PowerManager.PowerDownCleanup = PowerDownCleanup;
  
-  PowerManager.ResourceController = ResourceController;
+  PowerManager.ResourceDefaultOwner = ResourceDefaultOwner;
   PowerManager.ArbiterInfo = ArbiterInfo;
 }
 

diff --git a/tos/platforms/eyesIFX/chips/msp430/Msp430UsartShare0P.nc b/tos/platforms/eyesIFX/chips/msp430/Msp430UsartShare0P.nc
index ff0ca8052e72423e849fe83ba3aad165e7d63253..49c3f95927c310ea814afc1cd84719c2132715a9 100644 (file)
--- a/tos/platforms/eyesIFX/chips/msp430/Msp430UsartShare0P.nc
+++ b/tos/platforms/eyesIFX/chips/msp430/Msp430UsartShare0P.nc
@@ -61,7 +61,7 @@ implementation {
   UsartShareP.ArbiterInfo -> ArbiterC;
 
 //  components new AsyncStdControlDeferredPowerManagerC(1) as PowerManagerC;
-//  PowerManagerC.ResourceController -> ArbiterC;
+//  PowerManagerC.ResourceDefaultOwner -> ArbiterC;
 
   components HplMsp430Usart0C as UsartC;
   //PowerManagerC.AsyncStdControl -> UsartC;

diff --git a/tos/platforms/telosa/chips/sht11/HplSensirionSht11C.nc b/tos/platforms/telosa/chips/sht11/HplSensirionSht11C.nc
index 690c0b5e5579e6985434d780e7fc384c74a2dc1b..3601c8eb4f1ee5a234e85133616a48ddc6e7e85a 100644 (file)
--- a/tos/platforms/telosa/chips/sht11/HplSensirionSht11C.nc
+++ b/tos/platforms/telosa/chips/sht11/HplSensirionSht11C.nc
@@ -79,5 +79,5 @@ implementation {
   components new SplitControlPowerManagerC();
   SplitControlPowerManagerC.SplitControl -> HplSensirionSht11P;
   SplitControlPowerManagerC.ArbiterInfo -> Arbiter.ArbiterInfo;
-  SplitControlPowerManagerC.ResourceController -> Arbiter.ResourceController;
+  SplitControlPowerManagerC.ResourceDefaultOwner -> Arbiter.ResourceDefaultOwner;
 }

diff --git a/tos/system/ArbiterP.nc b/tos/system/ArbiterP.nc
index 6bb79a2484e1e213e54046d5390ddf7613c32718..12ddd8fbbaf0f05d63daa7975a566032342159d4 100644 (file)
--- a/tos/system/ArbiterP.nc
+++ b/tos/system/ArbiterP.nc
@@ -32,13 +32,13 @@
  * intended use.<br><br>
  *
  * This component provides the Resource, ResourceRequested, ArbiterInfo, 
- * and ResourceController interfaces and uses the ResourceConfigure interface as
+ * and ResourceDefaultOwner interfaces and uses the ResourceConfigure interface as
  * described in TEP 108.  It provides arbitration to a shared resource.
  * An Queue is used to keep track of which users have put
  * in requests for the resource.  Upon the release of the resource by one
  * of these users, the queue is checked and the next user
  * that has a pending request will ge granted control of the resource.  If
- * there are no pending requests, then the user of the ResourceController
+ * there are no pending requests, then the user of the ResourceDefaultOwner
  * interface gains access to the resource, and holds onto it until
  * another user makes a request.
  *
@@ -52,7 +52,7 @@ generic module ArbiterP(uint8_t controller_id) {
   provides {
     interface Resource[uint8_t id];
     interface ResourceRequested[uint8_t id];
-    interface ResourceController;
+    interface ResourceDefaultOwner;
     interface ArbiterInfo;
   }
   uses {
@@ -81,7 +81,7 @@ implementation {
       }
       else return call Queue.enqueue(id);
     }
-    signal ResourceController.requested();
+    signal ResourceDefaultOwner.requested();
     return SUCCESS;
   }
 
@@ -94,7 +94,7 @@ implementation {
       }
       else return FAIL;
     }
-    signal ResourceController.immediateRequested();
+    signal ResourceDefaultOwner.immediateRequested();
     if(resId == id) {
       call ResourceConfigure.configure[resId]();
       return SUCCESS;
@@ -114,7 +114,7 @@ implementation {
         else {
           resId = CONTROLLER_ID;
           state = RES_CONTROLLED;
-          signal ResourceController.granted();
+          signal ResourceDefaultOwner.granted();
         }
         call ResourceConfigure.unconfigure[id]();
       }
@@ -122,7 +122,7 @@ implementation {
     return FAIL;
   }
 
-  async command error_t ResourceController.release() {
+  async command error_t ResourceDefaultOwner.release() {
     atomic {
       if(resId == CONTROLLER_ID) {
         if(state == RES_GRANTING) {
@@ -165,7 +165,7 @@ implementation {
     }
   }
 
-  async command uint8_t ResourceController.isOwner() {
+  async command uint8_t ResourceDefaultOwner.isOwner() {
     return call Resource.isOwner[CONTROLLER_ID]();
   }
   
@@ -187,13 +187,13 @@ implementation {
   }
   default async event void ResourceRequested.immediateRequested[uint8_t id]() {
   }
-  default async event void ResourceController.granted() {
+  default async event void ResourceDefaultOwner.granted() {
   }
-  default async event void ResourceController.requested() {
-    call ResourceController.release();
+  default async event void ResourceDefaultOwner.requested() {
+    call ResourceDefaultOwner.release();
   }
-  default async event void ResourceController.immediateRequested() {
-       call ResourceController.release();
+  default async event void ResourceDefaultOwner.immediateRequested() {
+       call ResourceDefaultOwner.release();
   }
   default async command void ResourceConfigure.configure[uint8_t id]() {
   }

diff --git a/tos/system/FcfsArbiterC.nc b/tos/system/FcfsArbiterC.nc
index 79f3683a57c9f5df8081aac2ef5b67776f7765a4..894d82ad0e91cfe35a28da3bd5932654be49fc01 100644 (file)
--- a/tos/system/FcfsArbiterC.nc
+++ b/tos/system/FcfsArbiterC.nc
@@ -80,7 +80,7 @@ generic configuration FcfsArbiterC(char resourceName[]) {
   provides {
     interface Resource[uint8_t id];
     interface ResourceRequested[uint8_t id];
-    interface ResourceController;
+    interface ResourceDefaultOwner;
     interface ArbiterInfo;
   }
   uses interface ResourceConfigure[uint8_t id];
@@ -94,7 +94,7 @@ implementation {
 
   Resource = Arbiter;
   ResourceRequested = Arbiter;
-  ResourceController = Arbiter;
+  ResourceDefaultOwner = Arbiter;
   ArbiterInfo = Arbiter;
   ResourceConfigure = Arbiter;
 

diff --git a/tos/system/FcfsPriorityArbiterC.nc b/tos/system/FcfsPriorityArbiterC.nc
index 93adc231d79c413b6c51350a5fc6dd8cb6a3906b..bc75a76fa44adf5e334729cfa5535c17e76534fd 100644 (file)
--- a/tos/system/FcfsPriorityArbiterC.nc
+++ b/tos/system/FcfsPriorityArbiterC.nc
@@ -62,7 +62,7 @@
  *
  * This component provides the Resource, ArbiterInfo, and Resource
  * Controller interfaces and uses the ResourceConfigure interface as
- * described in TEP 108.  An additional ResourceController interface is
+ * described in TEP 108.  An additional ResourceDefaultOwner interface is
  * provided to allow clients of differing Priorities to control the
  * Resource according to some policy implemented in an external
  * component. This component provides arbitration to a shared resource in
@@ -85,8 +85,8 @@ generic module FcfsPriorityArbiterC(char resourceName[]) {
   provides {
     interface Init;
     interface Resource[uint8_t id];
-    interface ResourceController as HighPriorityClient;
-    interface ResourceController as LowPriorityClient;
+    interface ResourceDefaultOwner as HighPriorityClient;
+    interface ResourceDefaultOwner as LowPriorityClient;
     interface ArbiterInfo;
   }
   uses {

diff --git a/tos/system/RoundRobinArbiterC.nc b/tos/system/RoundRobinArbiterC.nc
index 1a4df49e5f353464782149d57d5c617298b55b45..9f52ed8f0b3f592a3a77048a323ef91f1fc2c1a9 100644 (file)
--- a/tos/system/RoundRobinArbiterC.nc
+++ b/tos/system/RoundRobinArbiterC.nc
@@ -80,7 +80,7 @@ generic configuration RoundRobinArbiterC(char resourceName[]) {
   provides {
     interface Resource[uint8_t id];
     interface ResourceRequested[uint8_t id];
-    interface ResourceController;
+    interface ResourceDefaultOwner;
     interface ArbiterInfo;
   }
   uses interface ResourceConfigure[uint8_t id];
@@ -94,7 +94,7 @@ implementation {
 
   Resource = Arbiter;
   ResourceRequested = Arbiter;
-  ResourceController = Arbiter;
+  ResourceDefaultOwner = Arbiter;
   ArbiterInfo = Arbiter;
   ResourceConfigure = Arbiter;