From: mmaroti <mmaroti>
Date: Tue, 17 Jun 2008 18:18:49 +0000 (+0000)
Subject: Fix the wiring for IEEE154 6LOWPAN
X-Git-Tag: release_tinyos_2_1_0_0~264
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=328f0021885c36340d441b0a312ac0f9129e1376

Fix the wiring for IEEE154 6LOWPAN
---

diff --git a/tos/chips/rf230/RF230ActiveMessageC.nc b/tos/chips/rf230/RF230ActiveMessageC.nc
index 34315e91..96a6fa7f 100644
--- a/tos/chips/rf230/RF230ActiveMessageC.nc
+++ b/tos/chips/rf230/RF230ActiveMessageC.nc
@@ -70,18 +70,16 @@ implementation
 	LowPowerListening = LowPowerListeningLayerC;
 
 	components ActiveMessageLayerC;
-#ifdef LOW_POWER_LISTENING
-	components LowPowerListeningLayerC;
-#else	
-	components new DummyLayerC() as LowPowerListeningLayerC;
-#endif
-
 #ifdef TFRAMES_ENABLED
 	components new DummyLayerC() as IEEE154NetworkLayerC;
 #else
 	components IEEE154NetworkLayerC;
 #endif
-
+#ifdef LOW_POWER_LISTENING
+	components LowPowerListeningLayerC;
+#else	
+	components new DummyLayerC() as LowPowerListeningLayerC;
+#endif
 	components MessageBufferLayerC;
 	components UniqueLayerC;
 	components TrafficMonitorLayerC;
@@ -101,9 +99,13 @@ implementation
 
 	ActiveMessageLayerC.Config -> RF230ActiveMessageP;
 	ActiveMessageLayerC.AMPacket -> IEEE154PacketC;
-	ActiveMessageLayerC.SubSend -> UniqueLayerC;
-	ActiveMessageLayerC.SubReceive -> LowPowerListeningLayerC;
+	ActiveMessageLayerC.SubSend -> IEEE154NetworkLayerC;
+	ActiveMessageLayerC.SubReceive -> IEEE154NetworkLayerC;
+
+	IEEE154NetworkLayerC.SubSend -> UniqueLayerC;
+	IEEE154NetworkLayerC.SubReceive -> LowPowerListeningLayerC;
 
+	// the UniqueLayer is wired at two points
 	UniqueLayerC.Config -> RF230ActiveMessageP;
 	UniqueLayerC.SubSend -> LowPowerListeningLayerC;