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

diff --git a/tos/chips/rf2xx/rf230/RF230ActiveMessageC.nc b/tos/chips/rf2xx/rf230/RF230ActiveMessageC.nc
index b11d0e23..aa5cffe0 100644
--- a/tos/chips/rf2xx/rf230/RF230ActiveMessageC.nc
+++ b/tos/chips/rf2xx/rf230/RF230ActiveMessageC.nc
@@ -56,39 +56,43 @@ configuration RF230ActiveMessageC
 
 implementation
 {
-	components RF230ActiveMessageP, IEEE154PacketLayerC, RadioAlarmC;
+	components RF230ActiveMessageP, RadioAlarmC;
 
 #ifdef RADIO_DEBUG
 	components AssertC;
 #endif
 
-	RF230ActiveMessageP.IEEE154PacketLayer -> IEEE154PacketLayerC;
+	RF230ActiveMessageP.IEEE154MessageLayer -> IEEE154MessageLayerC;
 	RF230ActiveMessageP.RadioAlarm -> RadioAlarmC.RadioAlarm[unique("RadioAlarm")];
 	RF230ActiveMessageP.PacketTimeStamp -> TimeStampingLayerC;
-
 	Packet = RF230ActiveMessageP;
 
-// -------- ActiveMessage
+// -------- Active Message
 
 	components ActiveMessageLayerC;
 	ActiveMessageLayerC.Config -> RF230ActiveMessageP;
-	ActiveMessageLayerC.AMPacket -> IEEE154PacketLayerC;
-	ActiveMessageLayerC.SubSend -> IEEE154NetworkLayerC;
-	ActiveMessageLayerC.SubReceive -> IEEE154NetworkLayerC;
+	ActiveMessageLayerC.SubSend -> LowpanNetworkLayerC;
+	ActiveMessageLayerC.SubReceive -> LowpanNetworkLayerC;
 	AMSend = ActiveMessageLayerC;
 	Receive = ActiveMessageLayerC.Receive;
 	Snoop = ActiveMessageLayerC.Snoop;
-	AMPacket = IEEE154PacketLayerC;
+	AMPacket = ActiveMessageLayerC;
 
-// -------- IEEE154Network
+// -------- Lowpan Network
 
 #ifdef TFRAMES_ENABLED
-	components new DummyLayerC() as IEEE154NetworkLayerC;
+	components new DummyLayerC() as LowpanNetworkLayerC;
 #else
-	components IEEE154NetworkLayerC;
+	components LowpanNetworkLayerC;
+	LowpanNetworkLayerC.Config -> RF230ActiveMessageP;
 #endif
-	IEEE154NetworkLayerC.SubSend -> UniqueLayerC;
-	IEEE154NetworkLayerC.SubReceive -> LowPowerListeningLayerC;
+	LowpanNetworkLayerC.SubSend -> UniqueLayerC;
+	LowpanNetworkLayerC.SubReceive -> LowPowerListeningLayerC;
+
+// -------- IEEE154 Packet
+
+	components IEEE154MessageLayerC;
+	IEEE154MessageLayerC.Config -> RF230ActiveMessageP;
 
 // -------- UniqueLayer Send part (wired twice)
 
@@ -100,8 +104,7 @@ implementation
 
 #ifdef LOW_POWER_LISTENING
 	components LowPowerListeningLayerC;
-	LowPowerListeningLayerC.PacketLplMetadata -> RF230ActiveMessageP;
-	LowPowerListeningLayerC.IEEE154PacketLayer -> IEEE154PacketLayerC;
+	LowPowerListeningLayerC.Config -> RF230ActiveMessageP;
 	LowPowerListeningLayerC.PacketAcknowledgements -> SoftwareAckLayerC;
 #else	
 	components LowPowerListeningDummyC as LowPowerListeningLayerC;