Conform SharedArbiterP better to TEP108.

diff --git a/tos/system/SharedArbiterP.nc b/tos/system/SharedArbiterP.nc
index c3503131cde02a93edb6d775de6a5b9d807ad0d6..1228c2a19c4f314441e4d77039eb13da49e4d60f 100644 (file)
--- a/tos/system/SharedArbiterP.nc
+++ b/tos/system/SharedArbiterP.nc
@@ -128,8 +128,12 @@ implementation {
 
   async command error_t Resource.request[uint8_t id]()
   {
+    /* The Resource docs do not say what happens when a user calls
+     * Resource.request() after the resource has already been granted.  We
+     * elect to call EBUSY, as if the request was still in process.
+     */
     if (call RequestingVector.get(id) || call GrantedVector.get(id))
-      return FAIL;
+      return EBUSY;
 
     addRequesting(id);
     if (call State.isIdle())
@@ -141,8 +145,12 @@ implementation {
 
   async command error_t Resource.immediateRequest[uint8_t id]()
   {
+    /* The Resource docs do not say what happens when a user calls
+     * Resource.request() after the resource has already been granted.  We
+     * elect to call EBUSY, as if the request was still in process.
+     */
     if (call RequestingVector.get(id) || call GrantedVector.get(id))
-      return FAIL;
+      return EBUSY;
 
     if (call State.isIdle())
       signal ResourceDefaultOwner.immediateRequested();