X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Frf230%2FRF230LayerC.nc;h=43c1a836def01b5ba8f91bccd2a6f1190ad4a369;hb=813ccd9a39dd0810febb285f17bcd72ba451f536;hp=7e12df94004b4c060e133d8ee3b9451aa769399f;hpb=dfc42b47c11051bae3026948c390e7bbeae4b854;p=tinyos-2.x.git

diff --git a/tos/chips/rf230/RF230LayerC.nc b/tos/chips/rf230/RF230LayerC.nc
index 7e12df94..43c1a836 100644
--- a/tos/chips/rf230/RF230LayerC.nc
+++ b/tos/chips/rf230/RF230LayerC.nc
@@ -21,6 +21,8 @@
  * Author: Miklos Maroti
  */
 
+#include <HplRF230.h>
+
 configuration RF230LayerC
 {
 	provides
@@ -31,18 +33,12 @@ configuration RF230LayerC
 		interface RadioCCA;
 	}
 
-	uses 
-	{
-		interface RF230Config;
-		interface PacketField<uint8_t> as PacketLinkQuality;
-		interface PacketField<uint8_t> as PacketTransmitPower;
-		interface PacketTimeStamp<TRF230, uint16_t>;
-	}
+	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;
@@ -50,16 +46,20 @@ implementation
 	RadioCCA = RF230LayerP;
 
 	RF230Config = RF230LayerP;
-	PacketLinkQuality = RF230LayerP.PacketLinkQuality;
-	PacketTransmitPower = RF230LayerP.PacketTransmitPower;
-	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;
 
 	RF230LayerP.SELN -> HplRF230C.SELN;
 	RF230LayerP.SpiResource -> HplRF230C.SpiResource;
-	RF230LayerP.SpiByte -> HplRF230C;
+	RF230LayerP.FastSpiByte -> HplRF230C;
 	RF230LayerP.HplRF230 -> HplRF230C;
 
 	RF230LayerP.SLP_TR -> HplRF230C.SLP_TR;