From: mmaroti <mmaroti>
Date: Thu, 5 Jun 2008 19:43:20 +0000 (+0000)
Subject: update RF230Sniffer to the new interfaces
X-Git-Tag: release_tinyos_2_1_0_0~330
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=e90b80efe22dc89b94b4d032715269849ff6796e

update RF230Sniffer to the new interfaces
---

diff --git a/apps/tests/rf230/RF230Sniffer/RF230SnifferC.nc b/apps/tests/rf230/RF230Sniffer/RF230SnifferC.nc
index 43d495a7..48958393 100644
--- 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 b2a9bb49..85058a77 100644
--- 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);