Incorporate new modular tos-bsl.

[tinyos-2.x.git] / tos / lib / tossim / TossimActiveMessageC.nc

diff --git a/tos/lib/tossim/TossimActiveMessageC.nc b/tos/lib/tossim/TossimActiveMessageC.nc
index 191f08d67ac808085c12dacd219a13f2629d012a..dd183fc2647e26881683423215ca59145da25c53 100644 (file)
--- a/tos/lib/tossim/TossimActiveMessageC.nc
+++ b/tos/lib/tossim/TossimActiveMessageC.nc
@@ -103,7 +103,7 @@ implementation {
     void* payload;
 
     memcpy(bufferPointer, msg, sizeof(message_t));
-    len = call Packet.getPayloadLength(bufferPtr);
+    len = call Packet.payloadLength(bufferPointer);
     payload = call Packet.getPayload(bufferPointer, call Packet.maxPayloadLength());
 
     if (call AMPacket.isForMe(msg)) {
@@ -243,7 +243,7 @@ implementation {
    return evt;
  }
  
- void active_message_deliver(int node, message_t* msg, sim_time_t t) __attribute__ ((C, spontaneous)) {
+ void active_message_deliver(int node, message_t* msg, sim_time_t t) @C() @spontaneous() {
    sim_event_t* evt = allocate_deliver_event(node, msg, t);
    sim_queue_insert(evt);
  }