commit svn HEAD of blip into core to start merge testing

[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 e74d70d2e2ba4aaa96e2a83740b151bffb93c75f..66a44c0f2c8f27308ad69fb14d8a6842f159112d 100644 (file)
--- a/tos/lib/net/blip/IPDispatchC.nc
+++ b/tos/lib/net/blip/IPDispatchC.nc
@@ -39,11 +39,7 @@ configuration IPDispatchC {
   }
 } implementation {
   
-#ifndef SIM
-  components CC2420ActiveMessageC as MessageC;
-#else
-  components ActiveMessageC as MessageC;
-#endif
+  components Ieee154MessageC as MessageC;
   components MainC, IPDispatchP, IPAddressC, IPRoutingP; 
   components NoLedsC as LedsC;
   components RandomC;
@@ -54,27 +50,18 @@ configuration IPDispatchC {
 
   IPDispatchP.Boot -> MainC;
 
-#ifndef SIM
-  IPDispatchP.IEEE154Send -> MessageC;
-  IPDispatchP.IEEE154Receive -> MessageC;
-#else
-  IPDispatchP.IEEE154Send -> MessageC.AMSend[0];
-  IPDispatchP.IEEE154Receive -> MessageC.Receive[0];
-#endif
-  IPDispatchP.Packet -> MessageC.SubAMPacket;
+  IPDispatchP.Ieee154Send -> MessageC;
+  IPDispatchP.Ieee154Receive -> MessageC.Ieee154Receive;
+  IPDispatchP.Packet -> MessageC.Packet;
 #ifdef LOW_POWER_LISTENING
   IPDispatchP.LowPowerListening -> MessageC;
 #endif
 
+  components CC2420PacketC;
 
-  IPDispatchP.IEEE154Packet -> MessageC;
+  IPDispatchP.Ieee154Packet -> MessageC;
   IPDispatchP.PacketLink -> MessageC;
-  IPDispatchP.CC2420Packet -> MessageC;
-
-#ifdef DBG_TRACK_FLOWS
-  IPDispatchP.getFlowID -> MessageC;
-#endif
-
+  IPDispatchP.CC2420Packet -> CC2420PacketC;
 
   IPDispatchP.Leds -> LedsC;
 
@@ -101,13 +88,21 @@ configuration IPDispatchC {
   IPRoutingP.ICMP  -> ICMPResponderC;
   IPDispatchP.RadioControl -> MessageC;
 
+  components IPExtensionP;
+  MainC.SoftwareInit -> IPExtensionP.Init;
+  IPDispatchP.InternalIPExtension -> IPExtensionP;
+
   IPDispatchP.IPRouting -> IPRoutingP;
   IPRoutingP.Boot -> MainC;
   IPRoutingP.Leds -> LedsC;
   IPRoutingP.IPAddress -> IPAddressC;
   IPRoutingP.Random -> RandomC;
   IPRoutingP.TrafficGenTimer -> TGenTimer;
-  IPRoutingP.TGenSend -> IPDispatchP.IP[NXTHDR_UNKNOWN];
+  IPRoutingP.TGenSend -> IPDispatchP.IP[IPV6_NONEXT];
+
+  IPRoutingP.IPExtensions -> IPDispatchP;
+  IPRoutingP.DestinationExt -> IPExtensionP.DestinationExt[0];
+  
 
   IPStats    = IPDispatchP;
   RouteStats = IPRoutingP;