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

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

diff --git a/tos/chips/rf2xx/layers/PacketLinkLayerC.nc b/tos/chips/rf2xx/layers/PacketLinkLayerC.nc
index 5701af73a1132bcf6d3180ce49e424d6969c851c..efd5a0c5460f013b55ff46c2a26f2bfbacb6e7bf 100644 (file)
--- a/tos/chips/rf2xx/layers/PacketLinkLayerC.nc
+++ b/tos/chips/rf2xx/layers/PacketLinkLayerC.nc
@@ -59,17 +59,16 @@
 
 #include <PacketLinkLayer.h>
 
-#warning "*** USING PACKET LINK LAYER"
-
 configuration PacketLinkLayerC {
   provides {
-    interface Send;
+    interface BareSend as Send;
     interface PacketLink;
+    interface RadioPacket;
   }
   
   uses {
-    interface Send as SubSend;
-    interface PacketData<link_metadata_t> as PacketLinkMetadata;
+    interface BareSend as SubSend;
+    interface RadioPacket as SubPacket;
     interface PacketAcknowledgements;
   }
 }
@@ -78,10 +77,11 @@ implementation {
   components PacketLinkLayerP, new TimerMilliC() as DelayTimerC;
   
   PacketLink = PacketLinkLayerP;
-  Send = PacketLinkLayerP.Send;
-  SubSend = PacketLinkLayerP.SubSend;
+  Send = PacketLinkLayerP;
+  SubSend = PacketLinkLayerP;
   PacketAcknowledgements = PacketLinkLayerP;
-  PacketLinkMetadata = PacketLinkLayerP;
+  RadioPacket = PacketLinkLayerP;
+  SubPacket = PacketLinkLayerP;
 
   PacketLinkLayerP.DelayTimer -> DelayTimerC;
 }