From: mmaroti <mmaroti>
Date: Fri, 10 Apr 2009 07:46:44 +0000 (+0000)
Subject: fix Ieee154MessageC wiring
X-Git-Tag: rc_6_tinyos_2_1_1~423
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=dc4dce097c72bddb275f8937df163b1e4041551c

fix Ieee154MessageC wiring
---

diff --git a/tos/chips/rf2xx/rf212/RF212Ieee154MessageC.nc b/tos/chips/rf2xx/rf212/RF212Ieee154MessageC.nc
index 2bfdc092..eb508fe2 100644
--- a/tos/chips/rf2xx/rf212/RF212Ieee154MessageC.nc
+++ b/tos/chips/rf2xx/rf212/RF212Ieee154MessageC.nc
@@ -68,9 +68,10 @@ implementation
 	components IEEE154MessageLayerC;
 	IEEE154MessageLayerC.SubPacket -> LowPowerListeningLayerC;
 	IEEE154MessageLayerC.SubSend -> UniqueLayerC;
+	IEEE154MessageLayerC.SubReceive -> LowPowerListeningLayerC;
 	Ieee154Send = IEEE154MessageLayerC;
 	Packet = IEEE154MessageLayerC;
-	Ieee154Receive = LowPowerListeningLayerC;
+	Ieee154Receive = IEEE154MessageLayerC;
 	Ieee154Packet = IEEE154MessageLayerC;
 	SendNotifier = IEEE154MessageLayerC;
 
@@ -107,7 +108,6 @@ implementation
 // -------- MessageBuffer
 
 	components MessageBufferLayerC;
-	MessageBufferLayerC.Packet -> IEEE154MessageLayerC;	// to get the payload for the Ieee154Receive.receive
 	MessageBufferLayerC.RadioSend -> TrafficMonitorLayerC;
 	MessageBufferLayerC.RadioReceive -> UniqueLayerC;
 	MessageBufferLayerC.RadioState -> TrafficMonitorLayerC;
diff --git a/tos/chips/rf2xx/rf230/RF230Ieee154MessageC.nc b/tos/chips/rf2xx/rf230/RF230Ieee154MessageC.nc
index 59b23960..ae17a957 100644
--- a/tos/chips/rf2xx/rf230/RF230Ieee154MessageC.nc
+++ b/tos/chips/rf2xx/rf230/RF230Ieee154MessageC.nc
@@ -68,9 +68,10 @@ implementation
 	components IEEE154MessageLayerC;
 	IEEE154MessageLayerC.SubPacket -> LowPowerListeningLayerC;
 	IEEE154MessageLayerC.SubSend -> UniqueLayerC;
+	IEEE154MessageLayerC.SubReceive -> LowPowerListeningLayerC;
 	Ieee154Send = IEEE154MessageLayerC;
 	Packet = IEEE154MessageLayerC;
-	Ieee154Receive = LowPowerListeningLayerC;
+	Ieee154Receive = IEEE154MessageLayerC;
 	Ieee154Packet = IEEE154MessageLayerC;
 	SendNotifier = IEEE154MessageLayerC;
 
@@ -107,7 +108,6 @@ implementation
 // -------- MessageBuffer
 
 	components MessageBufferLayerC;
-	MessageBufferLayerC.Packet -> IEEE154MessageLayerC;	// to get the payload for the Ieee154Receive.receive
 	MessageBufferLayerC.RadioSend -> TrafficMonitorLayerC;
 	MessageBufferLayerC.RadioReceive -> UniqueLayerC;
 	MessageBufferLayerC.RadioState -> TrafficMonitorLayerC;