X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Frf230%2FRF230LayerC.nc;h=5e842c0f3a17abca051196381121d20459f37f27;hb=adf1de6c009d13b7b52e68535c63b28f59c97400;hp=4454c9069f52d3812790edf28c5261c11ad9ef8f;hpb=2e472571e97ca9d56f7ba30fe837191579204d61;p=tinyos-2.x.git

diff --git a/tos/chips/rf230/RF230LayerC.nc b/tos/chips/rf230/RF230LayerC.nc
index 4454c906..5e842c0f 100644
--- a/tos/chips/rf230/RF230LayerC.nc
+++ b/tos/chips/rf230/RF230LayerC.nc
@@ -33,22 +33,12 @@ configuration RF230LayerC
 		interface RadioCCA;
 	}
 
-	uses 
-	{
-		interface RF230Config;
-
-		interface PacketField<uint8_t> as PacketLinkQuality;
-		interface PacketField<uint8_t> as PacketTransmitPower;
-		interface PacketField<uint8_t> as PacketRSSI;
-		interface PacketTimeStamp<TRF230, uint16_t>;
-
-		async event void lastTouch(message_t* msg);
-	}
+	uses interface RF230Config;
 }
 
 implementation
 {
-	components RF230LayerP, HplRF230C, BusyWaitMicroC, TaskletC, MainC, RadioAlarmC;
+	components RF230LayerP, HplRF230C, BusyWaitMicroC, TaskletC, MainC, RadioAlarmC, RF230PacketC, LocalTimeMicroC as LocalTimeRadioC;
 
 	RadioState = RF230LayerP;
 	RadioSend = RF230LayerP;
@@ -56,10 +46,13 @@ implementation
 	RadioCCA = RF230LayerP;
 
 	RF230Config = RF230LayerP;
-	PacketLinkQuality = RF230LayerP.PacketLinkQuality;
-	PacketTransmitPower = RF230LayerP.PacketTransmitPower;
-	PacketRSSI = RF230LayerP.PacketRSSI;
-	PacketTimeStamp = RF230LayerP.PacketTimeStamp;
+
+	RF230LayerP.PacketLinkQuality -> RF230PacketC.PacketLinkQuality;
+	RF230LayerP.PacketTransmitPower -> RF230PacketC.PacketTransmitPower;
+	RF230LayerP.PacketRSSI -> RF230PacketC.PacketRSSI;
+	RF230LayerP.PacketTimeSyncOffset -> RF230PacketC.PacketTimeSyncOffset;
+	RF230LayerP.PacketTimeStamp -> RF230PacketC;
+	RF230LayerP.LocalTime -> LocalTimeRadioC;
 
 	RF230LayerP.RadioAlarm -> RadioAlarmC.RadioAlarm[unique("RadioAlarm")];
 	RadioAlarmC.Alarm -> HplRF230C.Alarm;
@@ -76,8 +69,6 @@ implementation
 	RF230LayerP.Tasklet -> TaskletC;
 	RF230LayerP.BusyWait -> BusyWaitMicroC;
 
-	lastTouch = RF230LayerP.lastTouch;
-
 #ifdef RF230_DEBUG
 	components DiagMsgC;
 	RF230LayerP.DiagMsg -> DiagMsgC;