Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / apps / tests / rf230 / RF230Sniffer / RF230SnifferC.nc

diff --git a/apps/tests/rf230/RF230Sniffer/RF230SnifferC.nc b/apps/tests/rf230/RF230Sniffer/RF230SnifferC.nc
index 43d495a733c86e783b24fb1da34e200150b86d4d..340898332347116b4d71d612032b482aabd0045b 100644 (file)
--- a/apps/tests/rf230/RF230Sniffer/RF230SnifferC.nc
+++ b/apps/tests/rf230/RF230Sniffer/RF230SnifferC.nc
@@ -27,18 +27,35 @@ configuration RF230SnifferC
 
 implementation
 {
-       components RF230SnifferP, MainC, SerialActiveMessageC, RF230LayerC, RF230ActiveMessageP, RF230PacketC, IEEE154PacketC, AssertC;
-
+       components RF230SnifferP, MainC, SerialActiveMessageC, AssertC;
+       
        RF230SnifferP.Boot -> MainC;
        RF230SnifferP.SplitControl -> SerialActiveMessageC;
+       RF230SnifferP.RadioState -> RF230DriverLayerC;
+
+       // just to avoid a timer compilation bug
+       components new TimerMilliC();
+
+// -------- ActiveMessage
+
+       components RF230RadioP, Ieee154PacketLayerC;
+       RF230RadioP.Ieee154PacketLayer -> Ieee154PacketLayerC;
+
+// -------- TimeStamping
+
+       components TimeStampingLayerC;
+       TimeStampingLayerC.LocalTimeRadio -> RF230DriverLayerC;
+       TimeStampingLayerC.SubPacket -> MetadataFlagsLayerC;
+
+// -------- MetadataFlags
+
+       components MetadataFlagsLayerC;
+       MetadataFlagsLayerC.SubPacket -> RF230DriverLayerC;
 
-       RF230SnifferP.RadioState -> RF230LayerC;
+// -------- RF230 Driver
 
-       RF230LayerC.RF230Config -> RF230ActiveMessageP;
-       RF230LayerC.PacketLinkQuality -> RF230PacketC.PacketLinkQuality;
-       RF230LayerC.PacketRSSI -> RF230PacketC.PacketRSSI;
-       RF230LayerC.PacketTransmitPower -> RF230PacketC.PacketTransmitPower;
-       RF230LayerC.PacketTimeStamp -> RF230PacketC.PacketTimeStamp;
+       components RF230DriverLayerC;
+       RF230DriverLayerC.Config -> RF230RadioP;
+       RF230DriverLayerC.PacketTimeStamp -> TimeStampingLayerC;
 
-       RF230ActiveMessageP.IEEE154Packet -> IEEE154PacketC;
 }