Changed the default to be that all platforms #include stdio.h unless specifically...

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

diff --git a/tos/lib/tossim/SerialActiveMessageC.nc b/tos/lib/tossim/SerialActiveMessageC.nc
index 4d317337a1c6a6e85679ee60a0e006475fd11d4f..9b0fe461ecc12154f3ce90006d2ff0e36df025db 100644 (file)
--- a/tos/lib/tossim/SerialActiveMessageC.nc
+++ b/tos/lib/tossim/SerialActiveMessageC.nc
@@ -72,10 +72,12 @@ implementation {
   command error_t AMSend.send[am_id_t id](am_addr_t addr,
                                          message_t* amsg,
                                          uint8_t len) {
+    dbg("Serial", "Serial: sending a packet of size %d\n", len);
     return FAIL;
   }
 
   command error_t AMSend.cancel[am_id_t id](message_t* msg) {
+    dbg("Serial", "Serial: cancelled a packet\n");
     return FAIL;
   }
   
@@ -83,38 +85,32 @@ implementation {
     return call Packet.maxPayloadLength();
   }
 
-  command void* AMSend.getPayload[am_id_t id](message_t* m) {
-    return call Packet.getPayload(m, NULL);
-  }
-
-  command void* Receive.getPayload[am_id_t id](message_t* m, uint8_t* len) {
-    return call Packet.getPayload(m, len);
-  }
-
-  command uint8_t Receive.payloadLength[am_id_t id](message_t* m) {
-    return call Packet.payloadLength(m);
-  }
-  
-  command void* Snoop.getPayload[am_id_t id](message_t* m, uint8_t* len) {
+  command void* AMSend.getPayload[am_id_t id](message_t* m, uint8_t len) {
     return call Packet.getPayload(m, len);
   }
 
-  command uint8_t Snoop.payloadLength[am_id_t id](message_t* m) {
-    return call Packet.payloadLength(m);
-  }
-  
   command am_addr_t AMPacket.address() {
     return call amAddress();
   }
  
   command am_addr_t AMPacket.destination(message_t* amsg) {
     serial_header_t* header = getHeader(amsg);
-    return header->addr;
+    return header->dest;
   }
 
   command void AMPacket.setDestination(message_t* amsg, am_addr_t addr) {
     serial_header_t* header = getHeader(amsg);
-    header->addr = addr;
+    header->dest = addr;
+  }
+
+  command am_addr_t AMPacket.source(message_t* amsg) {
+    serial_header_t* header = getHeader(amsg);
+    return header->src;
+  }
+
+  command void AMPacket.setSource(message_t* amsg, am_addr_t addr) {
+    serial_header_t* header = getHeader(amsg);
+    header->src = addr;
   }
 
   command bool AMPacket.isForMe(message_t* amsg) {
@@ -131,7 +127,20 @@ implementation {
     serial_header_t* header = getHeader(amsg);
     header->type = t;
   }
- 
+
+  command am_group_t AMPacket.group(message_t* amsg) {
+    serial_header_t* header = getHeader(amsg);
+    return header->group;
+  }
+  
+  command void AMPacket.setGroup(message_t* msg, am_group_t group) {
+    serial_header_t* header = getHeader(msg);
+    header->group = group;
+  }
+
+  command am_group_t AMPacket.localGroup() {
+    return TOS_AM_GROUP;
+  }
   command void Packet.clear(message_t* msg) {}
   
   command uint8_t Packet.payloadLength(message_t* msg) {
@@ -146,11 +155,13 @@ implementation {
     return TOSH_DATA_LENGTH;
   }
   
-  command void* Packet.getPayload(message_t* msg, uint8_t* len) {
-    if (len != NULL) {
-      *len = call Packet.payloadLength(msg);
+  command void* Packet.getPayload(message_t* msg, uint8_t len) {
+    if (len <= TOSH_DATA_LENGTH) {
+      return msg->data;
+    }
+    else {
+      return NULL;
     }
-    return msg->data;
   }
 
   async command error_t Acks.requestAck(message_t* msg) {