update RF230Sniffer to the new interfaces

diff --git a/apps/tests/rf230/RF230Sniffer/RF230SnifferC.nc b/apps/tests/rf230/RF230Sniffer/RF230SnifferC.nc
index 43d495a733c86e783b24fb1da34e200150b86d4d..489583937a437a3ad334c4111a4b65aaaf9015ef 100644 (file)
--- a/apps/tests/rf230/RF230Sniffer/RF230SnifferC.nc
+++ b/apps/tests/rf230/RF230Sniffer/RF230SnifferC.nc
@@ -27,18 +27,16 @@ configuration RF230SnifferC
 
 implementation
 {
-       components RF230SnifferP, MainC, SerialActiveMessageC, RF230LayerC, RF230ActiveMessageP, RF230PacketC, IEEE154PacketC, AssertC;
-
+       components RF230SnifferP, MainC, SerialActiveMessageC, RF230LayerC, RF230ActiveMessageP, IEEE154PacketC, AssertC;
+       
        RF230SnifferP.Boot -> MainC;
        RF230SnifferP.SplitControl -> SerialActiveMessageC;
-
        RF230SnifferP.RadioState -> RF230LayerC;
 
        RF230LayerC.RF230Config -> RF230ActiveMessageP;
-       RF230LayerC.PacketLinkQuality -> RF230PacketC.PacketLinkQuality;
-       RF230LayerC.PacketRSSI -> RF230PacketC.PacketRSSI;
-       RF230LayerC.PacketTransmitPower -> RF230PacketC.PacketTransmitPower;
-       RF230LayerC.PacketTimeStamp -> RF230PacketC.PacketTimeStamp;
 
        RF230ActiveMessageP.IEEE154Packet -> IEEE154PacketC;
+
+       // just to avoid a timer compilation bug
+       components new TimerMilliC();
 }

diff --git a/tos/chips/rf230/RF230LayerP.nc b/tos/chips/rf230/RF230LayerP.nc
index b2a9bb4921d7f71e218ad1de2976dadef1cf3327..85058a77ae29271d2bf52797a55947a62ab0623c 100644 (file)
--- a/tos/chips/rf230/RF230LayerP.nc
+++ b/tos/chips/rf230/RF230LayerP.nc
@@ -598,7 +598,7 @@ implementation
                        length = call RF230Config.getLength(rxMsg);
 
                        call DiagMsg.str("rx");
-                       call DiagMsg.uint32(call PacketTimeStamp.isSet(rxMsg) ? call PacketTimeStamp.get(rxMsg) : 0);
+                       call DiagMsg.uint32(call PacketTimeStamp.isValid(rxMsg) ? call PacketTimeStamp.timestamp(rxMsg) : 0);
                        call DiagMsg.uint16(call RadioAlarm.getNow());
                        call DiagMsg.uint8(crc != 0);
                        call DiagMsg.uint8(length);