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 34ea89118e613ff45a25d8c4767d4a51d0d8115c..efd5a0c5460f013b55ff46c2a26f2bfbacb6e7bf 100644 (file)
--- a/tos/chips/rf2xx/layers/PacketLinkLayerC.nc
+++ b/tos/chips/rf2xx/layers/PacketLinkLayerC.nc
@@ -59,31 +59,29 @@
 
 #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<packet_link_metadata_t>;
+    interface BareSend as SubSend;
+    interface RadioPacket as SubPacket;
     interface PacketAcknowledgements;
   }
 }
 
 implementation {
-  components PacketLinkLayerP,
-      RF230PacketC,
-      new TimerMilliC() as DelayTimerC;
+  components PacketLinkLayerP, new TimerMilliC() as DelayTimerC;
   
   PacketLink = PacketLinkLayerP;
-  Send = PacketLinkLayerP.Send;
-  SubSend = PacketLinkLayerP.SubSend;
+  Send = PacketLinkLayerP;
+  SubSend = PacketLinkLayerP;
   PacketAcknowledgements = PacketLinkLayerP;
-  PacketData = PacketLinkLayerP;
-  
+  RadioPacket = PacketLinkLayerP;
+  SubPacket = PacketLinkLayerP;
+
   PacketLinkLayerP.DelayTimer -> DelayTimerC;
 }