X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fsystem%2FRoundRobinArbiterC.nc;h=dd8fb6a1ee1bdc5aefc8d1134ce355c3d4a32aad;hb=82ff984239b5b5088c952b684a5ab0f8112b8074;hp=1a4df49e5f353464782149d57d5c617298b55b45;hpb=1a329382c4f4556fd52d85f4e3f4a67e54911682;p=tinyos-2.x.git

diff --git a/tos/system/RoundRobinArbiterC.nc b/tos/system/RoundRobinArbiterC.nc
index 1a4df49e..dd8fb6a1 100644
--- a/tos/system/RoundRobinArbiterC.nc
+++ b/tos/system/RoundRobinArbiterC.nc
@@ -60,16 +60,16 @@
  * Please refer to TEP 108 for more information about this component and its
  * intended use.<br><br>
  *
- * This component provides the Resource, ArbiterInfo, and Resource
- * Controller interfaces and uses the ResourceConfigure interface as
+ * This component provides the Resource, ArbiterInfo, and ResourceDefaultOwner
+ * interfaces and uses the ResourceConfigure interface as
  * described in TEP 108.  It provides arbitration to a shared resource in
- * an FCFS fashion.  An array 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 array is checked and the next user (in FCFS order)
+ * a Round Robin fashion.  An array 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 array is checked and the next user (in Round Robin order)
  * that has a pending request will ge granted control of the resource.  If
- * there are no pending requests, then the resource becomes idle and any
- * user can put in a request and immediately receive access to the
- * Resource.
+ * there are no pending requests, then the resource is granted to the default 
+ * user.  If a new request is made, the default user will release the resource, 
+ * and it will be granted to the requesting cleint.
  *
  * @param <b>resourceName</b> -- The name of the Resource being shared
  * 
@@ -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;