The big interface switchover for Packet, Send, Receive, and AMSend.

[tinyos-2.x.git] / tos / chips / xe1205 / XE1205SendReceiveP.nc

diff --git a/tos/chips/xe1205/XE1205SendReceiveP.nc b/tos/chips/xe1205/XE1205SendReceiveP.nc
index 77bfff4aa7113c69c4f832f098c458c2e540cb42..2d5f67ff8a638d228eb9e03ce9427ad4700b6769 100644 (file)
--- a/tos/chips/xe1205/XE1205SendReceiveP.nc
+++ b/tos/chips/xe1205/XE1205SendReceiveP.nc
@@ -133,18 +133,10 @@ implementation {
        return call Packet.maxPayloadLength();
     }
 
-    command void* Send.getPayload(message_t* m) {
-       return call Packet.getPayload(m, NULL);
-    }
-
-    command void* Receive.getPayload(message_t* m, uint8_t* len) {
+    command void* Send.getPayload(message_t* m, uint8_t len) {
        return call Packet.getPayload(m, len);
     }
 
-    command uint8_t Receive.payloadLength(message_t* m) {
-       return call Packet.payloadLength(m);
-    }
-
    task void sendDoneTask() {
        txMsgSendDonePtr = txMsgPtr;
        txMsgPtr=NULL;
@@ -386,11 +378,13 @@ implementation {
        return TOSH_DATA_LENGTH;
     }
 
-    command void* Packet.getPayload(message_t* msg, uint8_t* len) {
-       if (len != NULL) {
-           *len = getMetadata(msg)->length;
-       }
+    command void* Packet.getPayload(message_t* msg, uint8_t len) {
+      if (len <= TOSH_DATA_LENGTH) {
        return (void*)msg->data;
+      }
+      else {
+       return NULL;
+      }
     }
 
     async command error_t PacketAcknowledgements.requestAck(message_t* msg) {