Use BareSend/BareReceive instead of Send/Receive to avoid duplication of payload...

[tinyos-2.x.git] / tos / chips / rf2xx / layers / UniqueLayerP.nc

diff --git a/tos/chips/rf2xx/layers/UniqueLayerP.nc b/tos/chips/rf2xx/layers/UniqueLayerP.nc
index d341942e0313140e8565d820b43293da542c4f61..121139db04688c4f6634829eaf3f4a2411ae7caf 100755 (executable)
--- a/tos/chips/rf2xx/layers/UniqueLayerP.nc
+++ b/tos/chips/rf2xx/layers/UniqueLayerP.nc
@@ -28,7 +28,7 @@ module UniqueLayerP
 {
        provides
        {
-               interface Send;
+               interface BareSend as Send;
                interface RadioReceive;
 
                interface Init;
@@ -36,7 +36,7 @@ module UniqueLayerP
 
        uses
        {
-               interface Send as SubSend;
+               interface BareSend as SubSend;
                interface RadioReceive as SubReceive;
 
                interface UniqueConfig;
@@ -55,10 +55,10 @@ implementation
                return SUCCESS;
        }
 
-       command error_t Send.send(message_t* msg, uint8_t len)
+       command error_t Send.send(message_t* msg)
        {
                call UniqueConfig.setSequenceNumber(msg, ++sequenceNumber);
-               return call SubSend.send(msg, len);
+               return call SubSend.send(msg);
        }
 
        command error_t Send.cancel(message_t* msg)
@@ -71,16 +71,6 @@ implementation
                signal Send.sendDone(msg, error);
        }
 
-       command uint8_t Send.maxPayloadLength()
-       {
-               return call SubSend.maxPayloadLength();
-       }
-
-       command void* Send.getPayload(message_t* msg, uint8_t len)
-       {
-               return call SubSend.getPayload(msg, len);
-       }
-
        tasklet_async event bool SubReceive.header(message_t* msg)
        {
                // we could scan here, but better be lazy