From b3f3506bc1cc84882b1da91862f6159e572b36af Mon Sep 17 00:00:00 2001 From: klueska Date: Sun, 4 Feb 2007 19:54:25 +0000 Subject: [PATCH] Update of files to align them with TEP108 changes to ResourceController interface to rename it to ResourceDefaultOwner. TEP103 hasn't been altered, and we still need to decide what should be done with it exactly. --- apps/tests/TestPowerManager/MyComponentC.nc | 2 +- .../TestSharedResource/SharedResourceP.nc | 2 +- doc/html/tep109.html | 2 +- doc/html/tutorial/lesson8.html | 6 ++--- doc/txt/tep109.txt | 2 +- tos/chips/at45db/At45dbC.nc | 4 +-- tos/chips/atm128/adc/Atm128AdcC.nc | 2 +- tos/chips/atm128/i2c/Atm128I2CMasterP.nc | 2 +- tos/chips/msp430/usart/Msp430UsartShare1P.nc | 2 +- tos/chips/stm25p/Stm25pSectorC.nc | 2 +- tos/lib/power/AsyncDeferredPowerManagerP.nc | 12 ++++----- tos/lib/power/AsyncPowerManagerP.nc | 12 ++++----- .../AsyncStdControlDeferredPowerManagerC.nc | 4 +-- tos/lib/power/AsyncStdControlPowerManagerC.nc | 4 +-- tos/lib/power/DeferredPowerManagerP.nc | 10 +++---- tos/lib/power/PowerManagerP.nc | 10 +++---- .../SplitControlDeferredPowerManagerC.nc | 4 +-- tos/lib/power/SplitControlPowerManagerC.nc | 4 +-- .../power/StdControlDeferredPowerManagerC.nc | 4 +-- tos/lib/power/StdControlPowerManagerC.nc | 4 +-- .../chips/msp430/Msp430UsartShare0P.nc | 2 +- .../telosa/chips/sht11/HplSensirionSht11C.nc | 2 +- tos/system/ArbiterP.nc | 26 +++++++++---------- tos/system/FcfsArbiterC.nc | 4 +-- tos/system/FcfsPriorityArbiterC.nc | 6 ++--- tos/system/RoundRobinArbiterC.nc | 4 +-- 26 files changed, 69 insertions(+), 69 deletions(-) diff --git a/apps/tests/TestPowerManager/MyComponentC.nc b/apps/tests/TestPowerManager/MyComponentC.nc index 1f06dc5b..022c8fd4 100644 --- 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 a5e72623..4811ed78 100644 --- 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 0de30da7..27ed3ab4 100644 --- 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; } 
diff --git a/doc/html/tutorial/lesson8.html b/doc/html/tutorial/lesson8.html
index 232133d5..c48eb4c6 100644
--- 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
 

 
 

-Shared resources are essentially built on top of dedicated resources, with access to them being controlled by an arbiter component.  In this way, power managers can be used to automatically control the power state of these resources through their AsyncStdControl, StdControl, or SplitControl interfaces.  They communicate with the arbiter (through the use of a ResourceController 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.
+Shared resources are essentially built on top of dedicated resources, with access to them being controlled by an arbiter component.  In this way, power managers can be used to automatically control the power state of these resources through their AsyncStdControl, StdControl, or SplitControl interfaces.  They communicate with the arbiter (through the use of a ResourceDefaultOwner 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.
 

 
 

@@ -92,7 +92,7 @@ Figure 1: Arbiters and Power Managers
 

 
 

-The arbiter component provides the Resource, ArbiterInfo, ResourceRequested, and ResourceController interfaces and uses the ResourceConfigure interface.  The power manager doesn't provide any interfaces, but uses one of either the AsyncStdControl, StdControl, or SplitControl interfaces from the underlying resource, as well as the ResourceController 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.
+The arbiter component provides the Resource, ArbiterInfo, ResourceRequested, and ResourceDefaultOwner interfaces and uses the ResourceConfigure interface.  The power manager doesn't provide any interfaces, but uses one of either the AsyncStdControl, StdControl, or SplitControl interfaces from the underlying resource, as well as the ResourceDefaultOwner 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.
 

 
 

@@ -307,7 +307,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/txt/tep109.txt b/doc/txt/tep109.txt
index 08a451e5..566db01f 100644
--- 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 002be4e4..86d12746 100644
--- 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 a2b583c7..12d9cf14 100644
--- 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 109db94f..8f077e29 100644
--- 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 153906a7..1b6edcf5 100644
--- 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 1f0e5dd1..416b9ee5 100644
--- 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 0344a7fe..73be3d53 100644
--- 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 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 bf745dfd..9f15cd3b 100644
--- 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 eddb9980..e050bd2d 100644
--- 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 d345d0ba..476c403e 100644
--- 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 1009e2c5..250042ce 100644
--- 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 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 b0c6046f..7423b520 100644
--- 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 7bc52919..8c557534 100644
--- 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 7b46758c..8057d2e6 100644
--- 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 54a00529..51c0d547 100644
--- 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 663fbcd5..8d89d3cf 100644
--- 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 ff0ca805..49c3f959 100644
--- 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 690c0b5e..3601c8eb 100644
--- 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 6bb79a24..12ddd8fb 100644
--- a/tos/system/ArbiterP.nc
+++ b/tos/system/ArbiterP.nc
@@ -32,13 +32,13 @@
  * intended use.


  *
  * 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 79f3683a..894d82ad 100644
--- 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 93adc231..bc75a76f 100644
--- 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 1a4df49e..9f52ed8f 100644
--- 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;
 
-- 
2.39.2