X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Frf2xx%2Frf230%2FRF230ActiveMessageC.nc;h=a9c4b0f672cae3e4a5c0e8c9f832fc0a8c8c0a5d;hb=97e9cb5f12a8fcdd7537ddd0eec19ffe364af663;hp=aa5cffe0b6d3302916640f538cb4b62e18bd29d1;hpb=51b365b6cb1df293dac98e285ae4856c2dccba2b;p=tinyos-2.x.git

diff --git a/tos/chips/rf2xx/rf230/RF230ActiveMessageC.nc b/tos/chips/rf2xx/rf230/RF230ActiveMessageC.nc
index aa5cffe0..a9c4b0f6 100644
--- a/tos/chips/rf2xx/rf230/RF230ActiveMessageC.nc
+++ b/tos/chips/rf2xx/rf230/RF230ActiveMessageC.nc
@@ -65,7 +65,8 @@ implementation
 	RF230ActiveMessageP.IEEE154MessageLayer -> IEEE154MessageLayerC;
 	RF230ActiveMessageP.RadioAlarm -> RadioAlarmC.RadioAlarm[unique("RadioAlarm")];
 	RF230ActiveMessageP.PacketTimeStamp -> TimeStampingLayerC;
-	Packet = RF230ActiveMessageP;
+	RF230ActiveMessageP.ActiveMessagePacket -> ActiveMessageLayerC;
+	RF230ActiveMessageP.RF230Packet -> RF230DriverLayerC;
 
 // -------- Active Message
 
@@ -73,7 +74,9 @@ implementation
 	ActiveMessageLayerC.Config -> RF230ActiveMessageP;
 	ActiveMessageLayerC.SubSend -> LowpanNetworkLayerC;
 	ActiveMessageLayerC.SubReceive -> LowpanNetworkLayerC;
+	ActiveMessageLayerC.SubPacket ->LowpanNetworkLayerC;
 	AMSend = ActiveMessageLayerC;
+	Packet = ActiveMessageLayerC;
 	Receive = ActiveMessageLayerC.Receive;
 	Snoop = ActiveMessageLayerC.Snoop;
 	AMPacket = ActiveMessageLayerC;
@@ -84,15 +87,15 @@ implementation
 	components new DummyLayerC() as LowpanNetworkLayerC;
 #else
 	components LowpanNetworkLayerC;
-	LowpanNetworkLayerC.Config -> RF230ActiveMessageP;
 #endif
 	LowpanNetworkLayerC.SubSend -> UniqueLayerC;
 	LowpanNetworkLayerC.SubReceive -> LowPowerListeningLayerC;
+	LowpanNetworkLayerC.SubPacket -> IEEE154MessageLayerC;
 
-// -------- IEEE154 Packet
+// -------- IEEE154 Message
 
 	components IEEE154MessageLayerC;
-	IEEE154MessageLayerC.Config -> RF230ActiveMessageP;
+	IEEE154MessageLayerC.SubPacket -> LowPowerListeningLayerC;
 
 // -------- UniqueLayer Send part (wired twice)
 
@@ -112,6 +115,7 @@ implementation
 	LowPowerListeningLayerC.SubControl -> MessageBufferLayerC;
 	LowPowerListeningLayerC.SubSend -> PacketLinkLayerC;
 	LowPowerListeningLayerC.SubReceive -> MessageBufferLayerC;
+	LowPowerListeningLayerC.SubPacket -> PacketLinkLayerC;
 	SplitControl = LowPowerListeningLayerC;
 	LowPowerListening = LowPowerListeningLayerC;
 
@@ -120,17 +124,17 @@ implementation
 #ifdef PACKET_LINK
 	components PacketLinkLayerC;
 	PacketLink = PacketLinkLayerC;
-	PacketLinkLayerC.PacketLinkMetadata -> RF230ActiveMessageP;
 	PacketLinkLayerC.PacketAcknowledgements -> SoftwareAckLayerC;
 #else
 	components new DummyLayerC() as PacketLinkLayerC;
 #endif
 	PacketLinkLayerC.SubSend -> MessageBufferLayerC;
+	PacketLinkLayerC.SubPacket -> TimeStampingLayerC;
 
 // -------- MessageBuffer
 
 	components MessageBufferLayerC;
-	MessageBufferLayerC.Packet -> RF230ActiveMessageP;
+	MessageBufferLayerC.Packet -> ActiveMessageLayerC;
 	MessageBufferLayerC.RadioSend -> TrafficMonitorLayerC;
 	MessageBufferLayerC.RadioReceive -> UniqueLayerC;
 	MessageBufferLayerC.RadioState -> TrafficMonitorLayerC;
@@ -174,27 +178,26 @@ implementation
 	CsmaLayerC -> RF230DriverLayerC.RadioSend;
 	CsmaLayerC -> RF230DriverLayerC.RadioCCA;
 
+// -------- TimeStamping
+
+	components TimeStampingLayerC;
+	TimeStampingLayerC.LocalTimeRadio -> RF230DriverLayerC;
+	TimeStampingLayerC.SubPacket -> MetadataFlagsLayerC;
+	PacketTimeStampRadio = TimeStampingLayerC;
+	PacketTimeStampMilli = TimeStampingLayerC;
+
+// -------- MetadataFlags
+
+	components MetadataFlagsLayerC;
+	MetadataFlagsLayerC.SubPacket -> RF230DriverLayerC;
+
 // -------- RF230 Driver
 
 	components RF230DriverLayerC;
-	RF230DriverLayerC.PacketRF230Metadata -> RF230ActiveMessageP;
-	RF230DriverLayerC.RF230DriverConfig -> RF230ActiveMessageP;
+	RF230DriverLayerC.Config -> RF230ActiveMessageP;
 	RF230DriverLayerC.PacketTimeStamp -> TimeStampingLayerC;
 	PacketTransmitPower = RF230DriverLayerC.PacketTransmitPower;
 	PacketLinkQuality = RF230DriverLayerC.PacketLinkQuality;
 	PacketRSSI = RF230DriverLayerC.PacketRSSI;
 	LocalTimeRadio = RF230DriverLayerC;
-
-// -------- MetadataFlags
-
-	components MetadataFlagsLayerC;
-	MetadataFlagsLayerC.PacketFlagsMetadata -> RF230ActiveMessageP;
-
-// -------- TimeStamping
-
-	components TimeStampingLayerC;
-	TimeStampingLayerC.LocalTimeRadio -> RF230DriverLayerC;
-	TimeStampingLayerC.PacketTimeStampMetadata -> RF230ActiveMessageP;
-	PacketTimeStampRadio = TimeStampingLayerC;
-	PacketTimeStampMilli = TimeStampingLayerC;
 }