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

[tinyos-2.x.git] / tos / lib / byte_radio / LinkLayerP.nc

diff --git a/tos/lib/byte_radio/LinkLayerP.nc b/tos/lib/byte_radio/LinkLayerP.nc
index 84361ec9d8b80f72aeda620e78b8a57f4d1a6193..abb016369626e87bb9918a77e824185398b54189 100644 (file)
--- a/tos/lib/byte_radio/LinkLayerP.nc
+++ b/tos/lib/byte_radio/LinkLayerP.nc
@@ -172,8 +172,8 @@ implementation
       return call Packet.maxPayloadLength();
     }
 
-    command void* Send.getPayload(message_t* msg) {
-      return call Packet.getPayload(msg, (uint8_t*) (call Packet.payloadLength(msg)) );
+    command void* Send.getPayload(message_t* msg, uint8_t len) {
+      return call Packet.getPayload(msg, len);
     }
     
     async event void SendDown.sendDone(message_t* msg, error_t error) { 
@@ -196,7 +196,7 @@ implementation
       message_t* tmpMsgPtr;
       atomic {
         len = call Packet.payloadLength(rxBufPtr);
-        payload = call Packet.getPayload(rxBufPtr, &len);
+        payload = call Packet.getPayload(rxBufPtr, len);
         tmpMsgPtr = rxBufPtr;
       }
       tmpMsgPtr = signal Receive.receive(tmpMsgPtr, payload , len);
@@ -222,13 +222,6 @@ implementation
       return msgPtr;
     }
 
-    command void* Receive.getPayload(message_t* msg, uint8_t* len) {
-      return call Packet.getPayload(msg, len);
-    }
-
-    command uint8_t Receive.payloadLength(message_t* msg) {
-      return call Packet.payloadLength(msg);
-    }
 
     /*************** default events ***********/