From 8650ee1d11f5456114246c62f9624659c49ffa7b Mon Sep 17 00:00:00 2001 From: Abtin Keshavarzian Date: Tue, 14 Jul 2026 12:30:23 -0700 Subject: [PATCH] [mac] move private constants inside `Mac` class (#13345) Move MAC-private constants (`kDataPollTimeout`, `kSleepDelay`, CSMA/retry limits, and CSL/WED default constants) from `ot::Mac` namespace scope into the `private` section of the `Mac` class as `static constexpr` constants. --- src/core/mac/mac.hpp | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/src/core/mac/mac.hpp b/src/core/mac/mac.hpp index 26c1f8fe7..41ac22b3a 100644 --- a/src/core/mac/mac.hpp +++ b/src/core/mac/mac.hpp @@ -73,33 +73,14 @@ class Neighbor; namespace Mac { -constexpr uint32_t kDataPollTimeout = - OPENTHREAD_CONFIG_MAC_DATA_POLL_TIMEOUT; ///< Timeout for receiving Data Frame (in msec). -constexpr uint32_t kSleepDelay = 300; ///< Max sleep delay when frame is pending (in msec). - constexpr uint16_t kScanDurationDefault = OPENTHREAD_CONFIG_MAC_SCAN_DURATION; ///< Duration per channel (in msec). -constexpr uint8_t kMaxCsmaBackoffsDirect = OPENTHREAD_CONFIG_MAC_MAX_CSMA_BACKOFFS_DIRECT; -constexpr uint8_t kMaxCsmaBackoffsIndirect = OPENTHREAD_CONFIG_MAC_MAX_CSMA_BACKOFFS_INDIRECT; -constexpr uint8_t kMaxCsmaBackoffsCsl = 0; - -constexpr uint8_t kDefaultMaxFrameRetriesDirect = OPENTHREAD_CONFIG_MAC_DEFAULT_MAX_FRAME_RETRIES_DIRECT; -constexpr uint8_t kDefaultMaxFrameRetriesIndirect = OPENTHREAD_CONFIG_MAC_DEFAULT_MAX_FRAME_RETRIES_INDIRECT; -constexpr uint8_t kMaxFrameRetriesCsl = 0; - -constexpr uint8_t kTxNumBcast = OPENTHREAD_CONFIG_MAC_TX_NUM_BCAST; ///< Num of times broadcast frame is tx. - /** * Specifies the number of microseconds ahead of time that the MAC layer should deliver a CSL frame to the sub-MAC * layer. */ constexpr uint16_t kCslRequestAhead = OPENTHREAD_CONFIG_MAC_CSL_REQUEST_AHEAD_US; -constexpr uint16_t kMinCslIePeriod = OPENTHREAD_CONFIG_MAC_CSL_MIN_PERIOD; - -constexpr uint32_t kDefaultWedListenInterval = OPENTHREAD_CONFIG_WED_LISTEN_INTERVAL; -constexpr uint32_t kDefaultWedListenDuration = OPENTHREAD_CONFIG_WED_LISTEN_DURATION; - /** * Defines the function pointer which is called during an Energy Scan when the scan result for a channel is * ready or when the scan completes. @@ -780,6 +761,22 @@ public: private: static constexpr uint16_t kMaxCcaSampleCount = OPENTHREAD_CONFIG_CCA_FAILURE_RATE_AVERAGING_WINDOW; + static constexpr uint32_t kDataPollTimeout = OPENTHREAD_CONFIG_MAC_DATA_POLL_TIMEOUT; // in msec. + static constexpr uint32_t kSleepDelay = 300; // in msec. + + static constexpr uint8_t kMaxCsmaBackoffsDirect = OPENTHREAD_CONFIG_MAC_MAX_CSMA_BACKOFFS_DIRECT; + static constexpr uint8_t kMaxCsmaBackoffsIndirect = OPENTHREAD_CONFIG_MAC_MAX_CSMA_BACKOFFS_INDIRECT; + static constexpr uint8_t kMaxCsmaBackoffsCsl = 0; + static constexpr uint8_t kDefaultMaxFrameRetriesDirect = OPENTHREAD_CONFIG_MAC_DEFAULT_MAX_FRAME_RETRIES_DIRECT; + static constexpr uint8_t kDefaultMaxFrameRetriesIndirect = OPENTHREAD_CONFIG_MAC_DEFAULT_MAX_FRAME_RETRIES_INDIRECT; + static constexpr uint8_t kMaxFrameRetriesCsl = 0; + static constexpr uint8_t kTxNumBcast = OPENTHREAD_CONFIG_MAC_TX_NUM_BCAST; + + static constexpr uint16_t kMinCslIePeriod = OPENTHREAD_CONFIG_MAC_CSL_MIN_PERIOD; + + static constexpr uint32_t kDefaultWedListenInterval = OPENTHREAD_CONFIG_WED_LISTEN_INTERVAL; + static constexpr uint32_t kDefaultWedListenDuration = OPENTHREAD_CONFIG_WED_LISTEN_DURATION; + enum Operation : uint8_t { kOperationIdle = 0,