define and use RADIO_SEND_RESOURCE

[tinyos-2.x.git] / tos / lib / net / blip / IPDispatchC.nc

diff --git a/tos/lib/net/blip/IPDispatchC.nc b/tos/lib/net/blip/IPDispatchC.nc
index 407aca655fc64673ccff4d9611a9ebfe658912b2..6abcc5af2996408dea2dbf1118c6a550ceb90aeb 100644 (file)
--- a/tos/lib/net/blip/IPDispatchC.nc
+++ b/tos/lib/net/blip/IPDispatchC.nc
@@ -39,7 +39,7 @@ configuration IPDispatchC {
   }
 } implementation {
   
-  components Ieee154MessageC as MessageC, ResourceSendP;
+  components Ieee154MessageC as MessageC; 
   components MainC, IPDispatchP, IPAddressC, IPRoutingP; 
   components NoLedsC as LedsC;
   components RandomC;
@@ -50,9 +50,14 @@ configuration IPDispatchC {
 
   IPDispatchP.Boot -> MainC;
 
+#ifdef IEEE154FRAMES_ENABLED
+  IPDispatchP.Ieee154Send -> MessageC;
+#else
+  components ResourceSendP;
   ResourceSendP.SubSend -> MessageC;
-  ResourceSendP.Resource -> MessageC.SendResource[unique(IEEE154_SEND_CLIENT)];
+  ResourceSendP.Resource -> MessageC.SendResource[unique(RADIO_SEND_RESOURCE)];
   IPDispatchP.Ieee154Send -> ResourceSendP.Ieee154Send;
+#endif
 
   IPDispatchP.Ieee154Receive -> MessageC.Ieee154Receive;
   IPDispatchP.Packet -> MessageC.Packet;
@@ -60,11 +65,10 @@ configuration IPDispatchC {
   IPDispatchP.LowPowerListening -> MessageC;
 #endif
 
-  components CC2420PacketC;
-
+  components ReadLqiC;
   IPDispatchP.Ieee154Packet -> MessageC;
   IPDispatchP.PacketLink -> MessageC;
-  IPDispatchP.CC2420Packet -> CC2420PacketC;
+  IPDispatchP.ReadLqi -> ReadLqiC;
 
   IPDispatchP.Leds -> LedsC;