Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / chips / cc2420 / lpl / DefaultLplC.nc

diff --git a/tos/chips/cc2420/lpl/DefaultLplC.nc b/tos/chips/cc2420/lpl/DefaultLplC.nc
index e750ae702ca5cf40b34d10ec26c4f13ae2676ec2..b18b08a5ffff1df5b23d1d594896781393edd967 100644 (file)
--- a/tos/chips/cc2420/lpl/DefaultLplC.nc
+++ b/tos/chips/cc2420/lpl/DefaultLplC.nc
@@ -36,7 +36,7 @@
 
 
 #include "DefaultLpl.h"
-#warning "*** USING DEFAULT POWER LISTENING LAYER"
+#warning "*** USING DEFAULT LOW POWER COMMUNICATIONS ***"
 
 configuration DefaultLplC {
   provides {
@@ -58,7 +58,7 @@ implementation {
   components MainC,
       DefaultLplP,
       PowerCycleC,
-      CC2420ActiveMessageC,
+      CC2420RadioC,
       CC2420CsmaC,
       CC2420TransmitC,
       CC2420PacketC,
@@ -66,6 +66,7 @@ implementation {
       new StateC() as SendStateC,
       new TimerMilliC() as OffTimerC,
       new TimerMilliC() as SendDoneTimerC,
+      SystemLowPowerListeningC,
       LedsC;
   
   LowPowerListening = DefaultLplP;
@@ -89,11 +90,10 @@ implementation {
   DefaultLplP.SendDoneTimer -> SendDoneTimerC;
   DefaultLplP.PowerCycle -> PowerCycleC;
   DefaultLplP.Resend -> CC2420TransmitC;
-  DefaultLplP.PacketAcknowledgements -> CC2420ActiveMessageC;
-  DefaultLplP.AMPacket -> CC2420ActiveMessageC;
+  DefaultLplP.PacketAcknowledgements -> CC2420RadioC;
   DefaultLplP.CC2420PacketBody -> CC2420PacketC;
   DefaultLplP.RadioBackoff -> CC2420CsmaC;
   DefaultLplP.Random -> RandomC;
   DefaultLplP.Leds -> LedsC;
-  
+  DefaultLplP.SystemLowPowerListening -> SystemLowPowerListeningC;
 }