X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Flib%2Fmac%2Ftkn154%2FSimpleTransferArbiterP.nc;h=e1f8d68ab33de5a0e50562a9e9d204943f615a58;hb=dac274225f4101f5dd61d0df8c6647d7f7a4c05f;hp=76ae05b4294bae3e70e44bd1d7c0784a50fbf22e;hpb=f50b3e1320b358f1686b7fd440dc125e3c24c327;p=tinyos-2.x.git

diff --git a/tos/lib/mac/tkn154/SimpleTransferArbiterP.nc b/tos/lib/mac/tkn154/SimpleTransferArbiterP.nc
index 76ae05b4..e1f8d68a 100644
--- a/tos/lib/mac/tkn154/SimpleTransferArbiterP.nc
+++ b/tos/lib/mac/tkn154/SimpleTransferArbiterP.nc
@@ -68,17 +68,12 @@ implementation {
   uint8_t state = RES_IDLE;
   norace uint8_t resId = NO_RES;
   norace uint8_t reqResId;
-  norace uint8_t numTransfers;
-  norace bool reqWhileTransferred;
   
   task void grantedTask();
-  task void checkResourceRequestedTask();
   
   async command error_t Resource.request[uint8_t id]() {
     signal ResourceRequested.requested[resId]();
     atomic {
-      if (numTransfers > 0)
-        reqWhileTransferred = TRUE;
       if(state == RES_IDLE) {
         state = RES_GRANTING;
         reqResId = id;
@@ -106,8 +101,6 @@ implementation {
     bool released = FALSE;
     atomic {
       if(state == RES_BUSY && resId == id) {
-        numTransfers = 0;
-        reqWhileTransferred = FALSE;
         if(call Queue.isEmpty() == FALSE) {
           reqResId = call Queue.dequeue();
           state = RES_GRANTING;
@@ -129,34 +122,21 @@ implementation {
 
   async command bool IsResourceRequested.getNow()
   {
-    return reqWhileTransferred;
-  }
-
-  task void checkResourceRequestedTask()
-  {
-    if (numTransfers && reqWhileTransferred)
-      signal ResourceRequested.requested[resId]();
+    return !(call Queue.isEmpty());
   }
 
   async command error_t ResourceTransferControl.transfer(uint8_t fromClient, uint8_t toClient)
   {
     atomic {
       if (call ArbiterInfo.userId() == fromClient){
-        numTransfers += 1;
         call ResourceConfigure.unconfigure[fromClient]();
         call ResourceConfigure.configure[resId]();
         resId = toClient;
-        post checkResourceRequestedTask();
         return SUCCESS;
       }
-    } 
+    }
     return FAIL;
   }
-
-  async command error_t ResourceTransferControl.release(uint8_t client)
-  {
-    return call Resource.release[client]();
-  }
     
   /**
     Check if the Resource is currently in use