LPL interface changes

diff --git a/tos/chips/cc1000/CC1000ActiveMessageC.nc b/tos/chips/cc1000/CC1000ActiveMessageC.nc
index 7c888373899c7b1bc24e080721f949bfe99c7050..1ad985b970514ab29a04015b097641b448c83593 100644 (file)
--- a/tos/chips/cc1000/CC1000ActiveMessageC.nc
+++ b/tos/chips/cc1000/CC1000ActiveMessageC.nc
@@ -53,6 +53,7 @@ configuration CC1000ActiveMessageC {
     interface PacketTimeStamp<T32khz, uint32_t> as PacketTimeStamp32khz;
     interface PacketTimeStamp<TMilli, uint32_t> as PacketTimeStampMilli;
     interface PacketTimeSyncOffset;
+    interface LowPowerListening;
   }
 }
 implementation {
@@ -78,4 +79,5 @@ implementation {
   PacketTimeStamp32khz = Radio;
   PacketTimeStampMilli = Radio;
   PacketTimeSyncOffset = Radio;
+  LowPowerListening    = Radio;
 }

diff --git a/tos/chips/cc1000/CC1000CsmaP.nc b/tos/chips/cc1000/CC1000CsmaP.nc
index f5884fd4fb26b0c9bfa2a809e37373677c7b23b4..698ab8cbd205f359ad79079c6cbb7da2718ffba4 100644 (file)
--- a/tos/chips/cc1000/CC1000CsmaP.nc
+++ b/tos/chips/cc1000/CC1000CsmaP.nc
@@ -507,29 +507,21 @@ implementation
     return (1000 * CC1K_LPL_CHECK_TIME) / sleepInterval;
   }
 
-  command void LowPowerListening.setLocalSleepInterval(uint16_t s) {
+  command void LowPowerListening.setLocalWakeupInterval(uint16_t s) {
     sleepTime = validateSleepInterval(s);
   }
 
-  command uint16_t LowPowerListening.getLocalSleepInterval() {
+  command uint16_t LowPowerListening.getLocalWakeupInterval() {
     return sleepTime;
   }
 
-  command void LowPowerListening.setLocalDutyCycle(uint16_t d) {
-    call LowPowerListening.setLocalSleepInterval(dutyToSleep(d));
-  }
-
-  command uint16_t LowPowerListening.getLocalDutyCycle() {
-    return sleepToDuty(call LowPowerListening.getLocalSleepInterval());
-  }
-
-  command void LowPowerListening.setRxSleepInterval(message_t *msg, uint16_t sleepIntervalMs) {
+  command void LowPowerListening.setRemoteWakeupInterval(message_t *msg, uint16_t sleepIntervalMs) {
     cc1000_metadata_t *meta = getMetadata(msg);
 
     meta->strength_or_preamble = -(int16_t)validateSleepInterval(sleepIntervalMs) - 1;
   }
 
-  command uint16_t LowPowerListening.getRxSleepInterval(message_t *msg) {
+  command uint16_t LowPowerListening.getRemoteWakeupInterval(message_t *msg) {
     cc1000_metadata_t *meta = getMetadata(msg);
 
     if (meta->strength_or_preamble >= 0)
@@ -538,22 +530,6 @@ implementation
       return -(meta->strength_or_preamble + 1);
   }
 
-  command void LowPowerListening.setRxDutyCycle(message_t *msg, uint16_t d) {
-    return call LowPowerListening.setRxSleepInterval(msg, dutyToSleep(d));
-  }
-
-  command uint16_t LowPowerListening.getRxDutyCycle(message_t *msg) {
-    return sleepToDuty(call LowPowerListening.getRxSleepInterval(msg));
-  }
-
-  command uint16_t LowPowerListening.dutyCycleToSleepInterval(uint16_t d) {
-    return dutyToSleep(d);
-  }
-
-  command uint16_t LowPowerListening.sleepIntervalToDutyCycle(uint16_t s) {
-    return sleepToDuty(s);
-  }
-
   void setPreambleLength(message_t * ONE msg) {
     cc1000_metadata_t *meta = getMetadata(msg);
     uint16_t s;