Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / lib / tosthreads / csystem / CAMRadioP.nc

diff --git a/tos/lib/tosthreads/csystem/CAMRadioP.nc b/tos/lib/tosthreads/csystem/CAMRadioP.nc
index f9d12e12b669b26798c0091edad5db1ce5c276f0..bfe3efe05acf7f4fc011ab530837ce95b0eec845 100644 (file)
--- a/tos/lib/tosthreads/csystem/CAMRadioP.nc
+++ b/tos/lib/tosthreads/csystem/CAMRadioP.nc
@@ -38,82 +38,82 @@ module CAMRadioP {
   }
 }
 implementation {
-  error_t amRadioStart() @C() @spontaneous() { 
+  error_t amRadioStart() @C() AT_SPONTANEOUS { 
     return call BlockingStdControl.start();
   }
-  error_t amRadioStop() @C() @spontaneous() { 
+  error_t amRadioStop() @C() AT_SPONTANEOUS { 
     return call BlockingStdControl.stop();
   }
-  error_t amRadioReceive(message_t* m, uint32_t timeout, am_id_t amId) @C() @spontaneous() {
+  error_t amRadioReceive(message_t* m, uint32_t timeout, am_id_t amId) @C() AT_SPONTANEOUS {
     if(amId == AM_RECEIVE_FROM_ANY)
       return call BlockingReceiveAny.receive(m, timeout);
     else 
       return call BlockingReceive.receive[amId](m, timeout);
   }
-  error_t amRadioSnoop(message_t* m, uint32_t timeout, am_id_t amId) @C() @spontaneous() {
+  error_t amRadioSnoop(message_t* m, uint32_t timeout, am_id_t amId) @C() AT_SPONTANEOUS {
     if(amId == AM_RECEIVE_FROM_ANY)
       return call BlockingSnoopAny.receive(m, timeout);
     else 
       return call BlockingSnoop.receive[amId](m, timeout);
   }
-  error_t amRadioSend(am_addr_t addr, message_t* msg, uint8_t len, am_id_t amId) @C() @spontaneous() {
+  error_t amRadioSend(am_addr_t addr, message_t* msg, uint8_t len, am_id_t amId) @C() AT_SPONTANEOUS {
     return call Send.send[amId](addr, msg, len);
   }
-  am_addr_t amRadioGetLocalAddress() @C() @spontaneous() {
+  am_addr_t amRadioGetLocalAddress() @C() AT_SPONTANEOUS {
     return call AMPacket.address();
   }
-  am_group_t amRadioGetLocalGroup() @C() @spontaneous() {
+  am_group_t amRadioGetLocalGroup() @C() AT_SPONTANEOUS {
     return call AMPacket.localGroup();
   }
-  am_addr_t amRadioGetDestination(message_t* amsg) @C() @spontaneous() {
+  am_addr_t amRadioGetDestination(message_t* amsg) @C() AT_SPONTANEOUS {
     return call AMPacket.destination(amsg);
   }
-  am_addr_t amRadioGetSource(message_t* amsg) @C() @spontaneous() {
+  am_addr_t amRadioGetSource(message_t* amsg) @C() AT_SPONTANEOUS {
     return call AMPacket.source(amsg);
   }
-  void amRadioSetDestination(message_t* amsg, am_addr_t addr) @C() @spontaneous() {
+  void amRadioSetDestination(message_t* amsg, am_addr_t addr) @C() AT_SPONTANEOUS {
     call AMPacket.setDestination(amsg, addr);
   }
-  void amRadioSetSource(message_t* amsg, am_addr_t addr) @C() @spontaneous() {
+  void amRadioSetSource(message_t* amsg, am_addr_t addr) @C() AT_SPONTANEOUS {
     call AMPacket.setSource(amsg, addr);
   }
-  bool amRadioIsForMe(message_t* amsg) @C() @spontaneous() {
+  bool amRadioIsForMe(message_t* amsg) @C() AT_SPONTANEOUS {
     return call AMPacket.isForMe(amsg);
   }
-  am_id_t amRadioGetType(message_t* amsg) @C() @spontaneous() {
+  am_id_t amRadioGetType(message_t* amsg) @C() AT_SPONTANEOUS {
     return call AMPacket.type(amsg);
   }
-  void amRadioSetType(message_t* amsg, am_id_t t) @C() @spontaneous() {
+  void amRadioSetType(message_t* amsg, am_id_t t) @C() AT_SPONTANEOUS {
     call AMPacket.setType(amsg, t);
   }
-  am_group_t amRadioGetGroup(message_t* amsg) @C() @spontaneous() {
+  am_group_t amRadioGetGroup(message_t* amsg) @C() AT_SPONTANEOUS {
     return call AMPacket.group(amsg);
   }
-  void amRadioSetGroup(message_t* amsg, am_group_t grp) @C() @spontaneous() {
+  void amRadioSetGroup(message_t* amsg, am_group_t grp) @C() AT_SPONTANEOUS {
     call AMPacket.setGroup(amsg, grp);
   }
-  void radioClear(message_t* msg) @C() @spontaneous() {
+  void radioClear(message_t* msg) @C() AT_SPONTANEOUS {
     call Packet.clear(msg);
   }
-  uint8_t radioGetPayloadLength(message_t* msg) @C() @spontaneous() {
+  uint8_t radioGetPayloadLength(message_t* msg) @C() AT_SPONTANEOUS {
     return call Packet.payloadLength(msg);
   }
-  void  radioSetPayloadLength(message_t* msg, uint8_t len) @C() @spontaneous() {
+  void  radioSetPayloadLength(message_t* msg, uint8_t len) @C() AT_SPONTANEOUS {
     call Packet.setPayloadLength(msg, len);
   }
-  uint8_t radioMaxPayloadLength() @C() @spontaneous() {
+  uint8_t radioMaxPayloadLength() @C() AT_SPONTANEOUS {
     return call Packet.maxPayloadLength();
   }
-  void* radioGetPayload(message_t* msg, uint8_t len) @C() @spontaneous() {
+  void* radioGetPayload(message_t* msg, uint8_t len) @C() AT_SPONTANEOUS {
     return call Packet.getPayload(msg, len);
   }
-  error_t radioRequestAck( message_t* msg ) @C() @spontaneous() {
+  error_t radioRequestAck( message_t* msg ) @C() AT_SPONTANEOUS {
     return call PacketAcknowledgements.requestAck(msg);
   }
-  error_t radioNoAck( message_t* msg ) @C() @spontaneous() {
+  error_t radioNoAck( message_t* msg ) @C() AT_SPONTANEOUS {
     return call PacketAcknowledgements.noAck(msg);
   }
-  bool radioWasAcked(message_t* msg) @C() @spontaneous() {
+  bool radioWasAcked(message_t* msg) @C() AT_SPONTANEOUS {
     return call PacketAcknowledgements.wasAcked(msg);
   }
 }