safe tinyos annotations

diff --git a/apps/BaseStation/BaseStationP.nc b/apps/BaseStation/BaseStationP.nc
index 89f0c68c469b5ba153506ab04c7bca0230b0893e..04e64c44fd006225b07a4b64ca66610dc9549af7 100644 (file)
--- a/apps/BaseStation/BaseStationP.nc
+++ b/apps/BaseStation/BaseStationP.nc
@@ -75,12 +75,12 @@ implementation
   };
 
   message_t  uartQueueBufs[UART_QUEUE_LEN];
-  message_t  *uartQueue[UART_QUEUE_LEN];
+  message_t  * ONE_NOK uartQueue[UART_QUEUE_LEN];
   uint8_t    uartIn, uartOut;
   bool       uartBusy, uartFull;
 
   message_t  radioQueueBufs[RADIO_QUEUE_LEN];
-  message_t  *radioQueue[RADIO_QUEUE_LEN];
+  message_t  * ONE_NOK radioQueue[RADIO_QUEUE_LEN];
   uint8_t    radioIn, radioOut;
   bool       radioBusy, radioFull;
 
@@ -131,7 +131,7 @@ implementation
 
   uint8_t count = 0;
 
-  message_t* receive(message_t* msg, void* payload, uint8_t len);
+  message_t* ONE receive(message_t* ONE msg, void* payload, uint8_t len);
   
   event message_t *RadioSnoop.receive[am_id_t id](message_t *msg,
                                                    void *payload,

diff --git a/tos/system/AMQueueImplP.nc b/tos/system/AMQueueImplP.nc
index 0a9e4e08654cd707497e15f54184b2d63120befa..02e41d77e7f22cd75a05852f5a9fdc07f84193c2 100644 (file)
--- a/tos/system/AMQueueImplP.nc
+++ b/tos/system/AMQueueImplP.nc
@@ -45,7 +45,7 @@ generic module AMQueueImplP(int numClients) {
 
 implementation {
     typedef struct {
-        message_t* msg;
+        message_t* ONE_NOK msg;
     } queue_entry_t;
   
     uint8_t current = numClients; // mark as empty
@@ -152,7 +152,7 @@ implementation {
         }
     }
 
-    void sendDone(uint8_t last, message_t *msg, error_t err) {
+    void sendDone(uint8_t last, message_t * ONE msg, error_t err) {
         queue[last].msg = NULL;
         tryToSend();
         signal Send.sendDone[last](msg, err);

diff --git a/tos/system/PoolP.nc b/tos/system/PoolP.nc
index 0dc44e5319d1c1b1d54cd1b3c94f3994e99c5da5..c7198505a2480875ae58d24df573ccd187671561 100644 (file)
--- a/tos/system/PoolP.nc
+++ b/tos/system/PoolP.nc
@@ -59,7 +59,7 @@ generic module PoolP(typedef pool_t, uint8_t size) {
 implementation {
   uint8_t free;
   uint8_t index;
-  pool_t* queue[size];
+  pool_t* ONE_NOK queue[size];
   pool_t pool[size];
 
   command error_t Init.init() {

diff --git a/tos/system/QueueC.nc b/tos/system/QueueC.nc
index 3f8d378772a8126d30525918a7c1bae770625bcc..92a14fc6fe169f8d7290db072b2e6eb983a8f8eb 100644 (file)
--- a/tos/system/QueueC.nc
+++ b/tos/system/QueueC.nc
@@ -45,7 +45,7 @@ generic module QueueC(typedef queue_t, uint8_t QUEUE_SIZE) {
 
 implementation {
 
-  queue_t queue[QUEUE_SIZE];
+  queue_t ONE_NOK queue[QUEUE_SIZE];
   uint8_t head = 0;
   uint8_t tail = 0;
   uint8_t size = 0;