Inserted a check into Resource.request() that controls if the current caller id has...

This fixes a problem which prevented the RF230 driver from accessing the Spi bus when ActiveMessageAddress.changed() was signaled in the case of a ID change when using tosboot. This prevented the startup procedure to continue.

diff --git a/tos/system/ArbiterP.nc b/tos/system/ArbiterP.nc
index b07f975dc4e5b2b2e762a90c020aff7772ec43cf..bf66c2c58d047c6636fc5df0e505fbd38bd8261b 100644 (file)
--- a/tos/system/ArbiterP.nc
+++ b/tos/system/ArbiterP.nc
@@ -81,6 +81,9 @@ implementation {
         state = RES_GRANTING;
         reqResId = id;
       }
+      else if (reqResId == id) {
+       return SUCCESS;
+      }
       else return call Queue.enqueue(id);
     }
     signal ResourceDefaultOwner.requested();