From: razvanm <razvanm>
Date: Thu, 22 Oct 2009 18:37:40 +0000 (+0000)
Subject: Fix the apps affected by the changes in the LowPowerListening interface.
X-Git-Tag: rc_6_tinyos_2_1_1~188
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=08ac46166ef9eb913af405baf6428154569a8728

Fix the apps affected by the changes in the LowPowerListening interface.
---

diff --git a/apps/tests/TestFtsp/FtspLpl/TestFtspC.nc b/apps/tests/TestFtsp/FtspLpl/TestFtspC.nc
index ed8f504d..fe377e0c 100755
--- a/apps/tests/TestFtsp/FtspLpl/TestFtspC.nc
+++ b/apps/tests/TestFtsp/FtspLpl/TestFtspC.nc
@@ -100,7 +100,7 @@ implementation
     event void RandomTimer.fired()
     {
 #ifdef LOW_POWER_LISTENING
-        call LowPowerListening.setRxSleepInterval(&msg, LPL_INTERVAL);
+        call LowPowerListening.setRemoteWakeupInterval(&msg, LPL_INTERVAL);
 #endif
         if(locked && (call AMSend.send(4000, &msg, sizeof(test_ftsp_msg_t)) == SUCCESS)){
             call Leds.led2On();
@@ -117,7 +117,7 @@ implementation
 
     event void RadioControl.startDone(error_t err) {
 #ifdef LOW_POWER_LISTENING
-        call LowPowerListening.setLocalSleepInterval(LPL_INTERVAL);
+        call LowPowerListening.setLocalWakeupInterval(LPL_INTERVAL);
 #endif
     }
     event void RadioControl.stopDone(error_t error){}
diff --git a/apps/tests/TestFtsp/FtspLplBeaconer/RadioCountToLedsC.nc b/apps/tests/TestFtsp/FtspLplBeaconer/RadioCountToLedsC.nc
index 436c4ed0..02b613bf 100755
--- a/apps/tests/TestFtsp/FtspLplBeaconer/RadioCountToLedsC.nc
+++ b/apps/tests/TestFtsp/FtspLplBeaconer/RadioCountToLedsC.nc
@@ -101,7 +101,7 @@ implementation {
 
       rcm->counter = counter;
 #ifdef LOW_POWER_LISTENING
-      call LowPowerListening.setRxSleepInterval(&packet, LPL_INTERVAL);
+      call LowPowerListening.setRemoteWakeupInterval(&packet, LPL_INTERVAL);
 #endif
       
       if (call AMSend.send(AM_BROADCAST_ADDR, &packet, sizeof(radio_count_msg_t), time) == SUCCESS) {
diff --git a/apps/tests/cc2420/LplBroadcastCountToLeds/RadioCountToLedsC.nc b/apps/tests/cc2420/LplBroadcastCountToLeds/RadioCountToLedsC.nc
index 71fd0279..96205b7c 100644
--- a/apps/tests/cc2420/LplBroadcastCountToLeds/RadioCountToLedsC.nc
+++ b/apps/tests/cc2420/LplBroadcastCountToLeds/RadioCountToLedsC.nc
@@ -71,7 +71,7 @@ implementation {
   event void AMControl.startDone(error_t err) {
     if (err == SUCCESS) {
       // Note we can setup LPL before or after the radio turns on
-      call LowPowerListening.setLocalSleepInterval(1000);
+      call LowPowerListening.setLocalWakeupInterval(1000);
       call MilliTimer.startOneShot(1500);
     }
     else {
@@ -96,7 +96,7 @@ implementation {
       }
 
       rcm->counter = counter;
-      call LowPowerListening.setRxSleepInterval(&packet, 1000);
+      call LowPowerListening.setRemoteWakeupInterval(&packet, 1000);
       if (call AMSend.send(AM_BROADCAST_ADDR, &packet, sizeof(radio_count_msg_t)) == SUCCESS) {
         dbg("RadioCountToLedsC", "RadioCountToLedsC: packet sent.\n", counter);        
         locked = TRUE;
diff --git a/apps/tests/cc2420/LplBroadcastPeriodicDelivery/TestPeriodicC.nc b/apps/tests/cc2420/LplBroadcastPeriodicDelivery/TestPeriodicC.nc
index dab737a8..9e7dfff9 100644
--- a/apps/tests/cc2420/LplBroadcastPeriodicDelivery/TestPeriodicC.nc
+++ b/apps/tests/cc2420/LplBroadcastPeriodicDelivery/TestPeriodicC.nc
@@ -71,7 +71,7 @@ implementation {
     transmitter = (call AMPacket.address() == 1);
     count = 0;
     
-    call LowPowerListening.setLocalSleepInterval(1000);
+    call LowPowerListening.setLocalWakeupInterval(1000);
     call SplitControl.start();
   }
   
@@ -124,7 +124,7 @@ implementation {
   task void send() {
     TestPeriodicMsg *periodicMsg = (TestPeriodicMsg *) call Packet.getPayload(&fullMsg, sizeof(TestPeriodicMsg));
     periodicMsg->count = count;
-    call LowPowerListening.setRxSleepInterval(&fullMsg, 1000);
+    call LowPowerListening.setRemoteWakeupInterval(&fullMsg, 1000);
     if(call AMSend.send(AM_BROADCAST_ADDR, &fullMsg, sizeof(TestPeriodicMsg)) != SUCCESS) {
       post send();
     } else {
diff --git a/apps/tests/cc2420/LplUnicastPeriodicDelivery/TestPeriodicC.nc b/apps/tests/cc2420/LplUnicastPeriodicDelivery/TestPeriodicC.nc
index 59d3b881..4ecce836 100644
--- a/apps/tests/cc2420/LplUnicastPeriodicDelivery/TestPeriodicC.nc
+++ b/apps/tests/cc2420/LplUnicastPeriodicDelivery/TestPeriodicC.nc
@@ -69,7 +69,7 @@ implementation {
     transmitter = (call AMPacket.address() != 0);
     count = 0;
     
-    call LowPowerListening.setLocalSleepInterval(1000);
+    call LowPowerListening.setLocalWakeupInterval(1000);
     call SplitControl.start();
   }
   
@@ -110,7 +110,7 @@ implementation {
   task void send() {
     TestPeriodicMsg *periodicMsg = (TestPeriodicMsg *) call Packet.getPayload(&fullMsg, sizeof(TestPeriodicMsg));
     periodicMsg->count = count;
-    call LowPowerListening.setRxSleepInterval(&fullMsg, 1000);
+    call LowPowerListening.setRemoteWakeupInterval(&fullMsg, 1000);
     if(call AMSend.send(0, &fullMsg, sizeof(TestPeriodicMsg)) != SUCCESS) {
       post send();
     } else {
diff --git a/apps/tutorials/LowPowerSensing/Base/LowPowerSensingBaseC.nc b/apps/tutorials/LowPowerSensing/Base/LowPowerSensingBaseC.nc
index 48e2dc02..7e7454c2 100644
--- a/apps/tutorials/LowPowerSensing/Base/LowPowerSensingBaseC.nc
+++ b/apps/tutorials/LowPowerSensing/Base/LowPowerSensingBaseC.nc
@@ -85,7 +85,7 @@ implementation {
   event message_t* SerialRequestSampleMsgsReceive.receive(message_t* msg, void* payload, uint8_t len) {
     serial_request_samples_msg_t* request_msg = payload;
     call Leds.led0On();
-    call LPL.setRxSleepInterval(&request_samples_msg, LPL_INTERVAL+100);
+    call LPL.setRemoteWakeupInterval(&request_samples_msg, LPL_INTERVAL+100);
     call RadioRequestSampleMsgsSend.send(request_msg->addr, &request_samples_msg, sizeof(request_samples_msg_t));
     return msg;
   }
diff --git a/apps/tutorials/LowPowerSensing/Sampler/LowPowerSensingPeriodicSamplerC.nc b/apps/tutorials/LowPowerSensing/Sampler/LowPowerSensingPeriodicSamplerC.nc
index 2fd455b3..2ebdd544 100644
--- a/apps/tutorials/LowPowerSensing/Sampler/LowPowerSensingPeriodicSamplerC.nc
+++ b/apps/tutorials/LowPowerSensing/Sampler/LowPowerSensingPeriodicSamplerC.nc
@@ -68,7 +68,7 @@ implementation {
   }
   
   void sendSampleMsg() {
-    call LPL.setRxSleepInterval(&sample_msg, 0);
+    call LPL.setRemoteWakeupInterval(&sample_msg, 0);
     if(call SampleSend.send(BASE_STATION_ADDR, &sample_msg, sizeof(nx_sensor_sample_t)) != SUCCESS)
       post sendSampleMsgTask();
     else call Leds.led2On();
@@ -78,7 +78,7 @@ implementation {
   task void sendSampleMsgTask() { sendSampleMsg(); }
 	
   event void Boot.booted() {
-    call LPL.setLocalSleepInterval(LPL_INTERVAL);
+    call LPL.setLocalWakeupInterval(LPL_INTERVAL);
     call AMControl.start();
   }
   
diff --git a/tos/lib/ftsp/TimeSyncP.nc b/tos/lib/ftsp/TimeSyncP.nc
index 3c3affe8..db59408b 100644
--- a/tos/lib/ftsp/TimeSyncP.nc
+++ b/tos/lib/ftsp/TimeSyncP.nc
@@ -360,7 +360,7 @@ implementation
         outgoingMsg->globalTime = globalTime;
 
 #ifdef LOW_POWER_LISTENING
-        call LowPowerListening.setRxSleepInterval(&outgoingMsgBuffer, LPL_INTERVAL);
+        call LowPowerListening.setRemoteWakeupInterval(&outgoingMsgBuffer, LPL_INTERVAL);
 #endif
         // we don't send time sync msg, if we don't have enough data
         if( numEntries < ENTRY_SEND_LIMIT && outgoingMsg->rootID != TOS_NODE_ID ){