From: r-studio Date: Thu, 29 Oct 2009 15:55:00 +0000 (+0000) Subject: removed cc2420 dependency X-Git-Tag: rc_6_tinyos_2_1_1~162 X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=148c570897568984aa26a318a4da0448c12e7a80 removed cc2420 dependency --- diff --git a/apps/tests/TestFtsp/FtspLpl/TestFtspAppC.nc b/apps/tests/TestFtsp/FtspLpl/TestFtspAppC.nc index fbb75400..bb590615 100755 --- a/apps/tests/TestFtsp/FtspLpl/TestFtspAppC.nc +++ b/apps/tests/TestFtsp/FtspLpl/TestFtspAppC.nc @@ -46,6 +46,8 @@ implementation { App.AMSend -> ActiveMessageC.AMSend[AM_TEST_FTSP_MSG]; App.Packet -> ActiveMessageC; App.PacketTimeStamp -> ActiveMessageC; + App.LowPowerListening -> ActiveMessageC; + components RandomC; App.Random -> RandomC; @@ -58,10 +60,5 @@ implementation { App.GlobalTime -> TimeSync32kC; App.TimeSyncInfo -> TimeSync32kC; App.Leds -> LedsC; - -#ifdef LOW_POWER_LISTENING - components CC2420ActiveMessageC; - App.LowPowerListening -> CC2420ActiveMessageC; -#endif - + } diff --git a/apps/tests/TestFtsp/FtspLpl/TestFtspC.nc b/apps/tests/TestFtsp/FtspLpl/TestFtspC.nc index fe377e0c..58b58ee3 100755 --- a/apps/tests/TestFtsp/FtspLpl/TestFtspC.nc +++ b/apps/tests/TestFtsp/FtspLpl/TestFtspC.nc @@ -44,9 +44,7 @@ module TestFtspC interface TimeSyncPacket; -#ifdef LOW_POWER_LISTENING interface LowPowerListening; -#endif } } @@ -116,9 +114,7 @@ implementation } event void RadioControl.startDone(error_t err) { -#ifdef LOW_POWER_LISTENING call LowPowerListening.setLocalWakeupInterval(LPL_INTERVAL); -#endif } event void RadioControl.stopDone(error_t error){} } diff --git a/tos/lib/ftsp/TimeSync32kC.nc b/tos/lib/ftsp/TimeSync32kC.nc index f709829e..5d325db0 100755 --- a/tos/lib/ftsp/TimeSync32kC.nc +++ b/tos/lib/ftsp/TimeSync32kC.nc @@ -72,8 +72,7 @@ implementation TimeSyncP.Leds -> LedsC; #ifdef LOW_POWER_LISTENING - components CC2420ActiveMessageC; - TimeSyncP.LowPowerListening -> CC2420ActiveMessageC; + TimeSyncP.LowPowerListening -> ActiveMessageC; #endif