From: regehr <regehr>
Date: Sat, 31 May 2008 20:27:07 +0000 (+0000)
Subject: safe tinyos annotations
X-Git-Tag: release_tinyos_2_1_0_0~349
X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=commitdiff_plain;h=b21ba62c1963284eb820ad80adcde4a51afd3e6b;p=tinyos-2.x.git

safe tinyos annotations
---

diff --git a/apps/BaseStation/BaseStationP.nc b/apps/BaseStation/BaseStationP.nc
index 89f0c68c..04e64c44 100644
--- 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 0a9e4e08..02e41d77 100644
--- 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 0dc44e53..c7198505 100644
--- 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 3f8d3787..92a14fc6 100644
--- 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;