more reviews

edmont · Oct 4, 2024 · e9bd1d2 · e9bd1d2
1 parent 82c817c
commit e9bd1d2
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 11 deletions.
diff --git a/src/cli/README.md b/src/cli/README.md
@@ -4418,7 +4418,7 @@ Done
 
 ### wakeup interval
 
-Get the wake-up interval.
+Get the wake-up listen interval.
 
 Requires `OPENTHREAD_CONFIG_WAKEUP_END_DEVICE_ENABLE`.
 
@@ -4430,7 +4430,7 @@ Done
 
 ### wakeup interval \<interval\>
 
-Set the wake-up interval.
+Set the wake-up listen interval.
 
 Requires `OPENTHREAD_CONFIG_WAKEUP_END_DEVICE_ENABLE`.
 
@@ -4441,7 +4441,7 @@ Done
 
 ### wakeup duration
 
-Get the wake-up duration.
+Get the wake-up listen duration.
 
 Requires `OPENTHREAD_CONFIG_WAKEUP_END_DEVICE_ENABLE`.
 
@@ -4453,7 +4453,7 @@ Done
 
 ### wakeup duration \<duration\>
 
-Set the wake-up duration.
+Set the wake-up listen duration.
 
 Requires `OPENTHREAD_CONFIG_WAKEUP_END_DEVICE_ENABLE`.
 

diff --git a/src/core/config/mac.h b/src/core/config/mac.h
@@ -497,6 +497,16 @@
 #define OPENTHREAD_CONFIG_CSL_RECEIVE_TIME_AHEAD 320
 #endif
 
+/**
+ * @def OPENTHREAD_CONFIG_WED_RECEIVE_TIME_AFTER
+ *
+ * Margin to be applied after the end of a WED listen duration to schedule the next listen interval, in units of
+ * microseconds.
+ */
+#ifndef OPENTHREAD_CONFIG_WED_RECEIVE_TIME_AFTER
+#define OPENTHREAD_CONFIG_WED_RECEIVE_TIME_AFTER 500
+#endif
+
 /**
  * @def OPENTHREAD_CONFIG_MIN_RECEIVE_ON_AHEAD
  *

diff --git a/src/core/mac/mac.cpp b/src/core/mac/mac.cpp
@@ -2494,7 +2494,7 @@ Error Mac::SetWedListenEnabled(bool aEnable)
     VerifyOrExit(GetWedListenInterval() > GetWedListenDuration(), error = kErrorInvalidArgs);
 
 #if OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE
-    if (aEnable && IsCslEnabled())
+    if (aEnable && GetCslPeriod() > 0)
     {
         LogWarn("Cannot enable wake-up frame listening while CSL is enabled");
         ExitNow(error = kErrorInvalidState);

diff --git a/src/core/mac/sub_mac.hpp b/src/core/mac/sub_mac.hpp
@@ -556,9 +556,10 @@ class SubMac : public InstanceLocator, private NonCopyable
     static constexpr uint32_t kCslReceiveTimeAhead = OPENTHREAD_CONFIG_CSL_RECEIVE_TIME_AHEAD;
 #endif
 
-#if OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_WAKEUP_END_DEVICE_ENABLE
-    // Margin to be applied to detect wake-up listening receive slots overlaps with CSL slots, in us
-    static constexpr uint32_t kWakeupListeningOverlapMargin = 600;
+#if OPENTHREAD_CONFIG_WAKEUP_END_DEVICE_ENABLE
+    // Margin to be applied after the end of a WED listen duration to schedule the next listen interval.
+    // The value is in usec.
+    static constexpr uint32_t kWedReceiveTimeAfter = OPENTHREAD_CONFIG_WED_RECEIVE_TIME_AFTER;
 #endif
 
 #if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE

diff --git a/src/core/mac/sub_mac_wed.cpp b/src/core/mac/sub_mac_wed.cpp
@@ -62,6 +62,13 @@ void SubMac::UpdateWakeupListening(uint32_t aInterval, uint16_t aDuration, uint8
     {
         mWedSampleTime      = TimerMicro::GetNow() + kCslReceiveTimeAhead;
         mWedSampleTimeRadio = otPlatRadioGetNow(&GetInstance()) + kCslReceiveTimeAhead;
+
+        if ((mWedSampleTime.GetValue() > mWedListenInterval) && (mWedSampleTimeRadio > mWedListenInterval))
+        {
+            mWedSampleTime -= mWedListenInterval;
+            mWedSampleTimeRadio -= mWedListenInterval;
+        }
+
         HandleWedTimer();
     }
 
@@ -73,14 +80,15 @@ void SubMac::HandleWedTimer(Timer &aTimer) { aTimer.Get<SubMac>().HandleWedTimer
 
 void SubMac::HandleWedTimer(void)
 {
+    mWedSampleTime += mWedListenInterval;
+    mWedSampleTimeRadio += mWedListenInterval;
+    mWedTimer.FireAt(mWedSampleTime + mWedListenDuration + kWedReceiveTimeAfter);
+
     if (mState != kStateDisabled)
     {
         IgnoreError(
             Get<Radio>().ReceiveAt(mWakeupChannel, static_cast<uint32_t>(mWedSampleTimeRadio), mWedListenDuration));
     }
-    mWedSampleTime += mWedListenInterval;
-    mWedSampleTimeRadio += mWedListenInterval;
-    mWedTimer.FireAt(mWedSampleTime - kCslReceiveTimeAhead);
 }
 
 } // namespace Mac