Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / system / FcfsResourceQueueC.nc

diff --git a/tos/system/FcfsResourceQueueC.nc b/tos/system/FcfsResourceQueueC.nc
index 565ba25fca0f96297bf7b7c4ad4ef81b1a92c41e..23e41dd26a5c4077b7f11f6a9dadd3e266253c9d 100644 (file)
--- a/tos/system/FcfsResourceQueueC.nc
+++ b/tos/system/FcfsResourceQueueC.nc
@@ -48,11 +48,11 @@ implementation {
   }  
   
   async command bool FcfsQueue.isEmpty() {
-    return (qHead == NO_ENTRY);
+    atomic return (qHead == NO_ENTRY);
   }
        
   async command bool FcfsQueue.isEnqueued(resource_client_id_t id) {
-       return resQ[id] != NO_ENTRY || qTail == id; 
+       atomic return resQ[id] != NO_ENTRY || qTail == id; 
   }
 
   async command resource_client_id_t FcfsQueue.dequeue() {