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

[tinyos-2.x.git] / tos / chips / cc1000 / CC1000SendReceiveP.nc

diff --git a/tos/chips/cc1000/CC1000SendReceiveP.nc b/tos/chips/cc1000/CC1000SendReceiveP.nc
index e4e4d77d9d95ac26eefc87d5682404fb74615e62..31a2fc2c634a255efabffcdecf1221b778ebb62c 100644 (file)
--- a/tos/chips/cc1000/CC1000SendReceiveP.nc
+++ b/tos/chips/cc1000/CC1000SendReceiveP.nc
@@ -632,13 +632,13 @@ implementation
     return TOSH_DATA_LENGTH;
   }
 
-  command void* Packet.getPayload(message_t *msg, uint8_t *len) {
-    if (len != NULL) {
-      cc1000_header_t *header = getHeader(msg);
-
-      *len = header->length;
+  command void* Packet.getPayload(message_t *msg, uint8_t len) {
+    if (len <= TOSH_DATA_LENGTH) {
+      return (void*)msg->data;
+    }
+    else {
+      return NULL;
     }
-    return (void*)msg->data;
   }
 
   async command error_t PacketAcknowledgements.requestAck(message_t *msg) {
@@ -649,20 +649,12 @@ implementation
     return FAIL;               /* We always ack */
   }
 
-  command void* Receive.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);
-  }
-
   command uint8_t Send.maxPayloadLength() {
     return call Packet.maxPayloadLength();
   }
 
-  command void* Send.getPayload(message_t *m) {
-    return call Packet.getPayload(m, NULL);
+  command void* Send.getPayload(message_t *m, uint8_t len) {
+    return call Packet.getPayload(m, len);
   }
 
   async command bool PacketAcknowledgements.wasAcked(message_t *msg) {