change metadata handling,

[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..5701af73a1132bcf6d3180ce49e424d6969c851c 100644 (file)
--- a/tos/chips/rf2xx/layers/PacketLinkLayerC.nc
+++ b/tos/chips/rf2xx/layers/PacketLinkLayerC.nc
@@ -69,21 +69,19 @@ configuration PacketLinkLayerC {
   
   uses {
     interface Send as SubSend;
-    interface PacketData<packet_link_metadata_t>;
+    interface PacketData<link_metadata_t> as PacketLinkMetadata;
     interface PacketAcknowledgements;
   }
 }
 
 implementation {
-  components PacketLinkLayerP,
-      RF230PacketC,
-      new TimerMilliC() as DelayTimerC;
+  components PacketLinkLayerP, new TimerMilliC() as DelayTimerC;
   
   PacketLink = PacketLinkLayerP;
   Send = PacketLinkLayerP.Send;
   SubSend = PacketLinkLayerP.SubSend;
   PacketAcknowledgements = PacketLinkLayerP;
-  PacketData = PacketLinkLayerP;
-  
+  PacketLinkMetadata = PacketLinkLayerP;
+
   PacketLinkLayerP.DelayTimer -> DelayTimerC;
 }