diff --git a/.github/workflows/simulation-1.2.yml b/.github/workflows/simulation-1.2.yml index 1941300f7..515e2ab3e 100644 --- a/.github/workflows/simulation-1.2.yml +++ b/.github/workflows/simulation-1.2.yml @@ -245,9 +245,6 @@ jobs: COVERAGE: 1 THREAD_VERSION: 1.3 VIRTUAL_TIME: 1 - INTER_OP: 1 - INTER_OP_BBR: 1 - ADDON_FEAT_1_2: 1 steps: - name: Harden Runner uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1 @@ -268,9 +265,6 @@ jobs: - name: Run run: | ulimit -c unlimited - ./script/test cert_suite ./tests/scripts/thread-cert/Cert_*.py - ./script/test cert_suite ./tests/scripts/thread-cert/test_*.py - ./script/test cert_suite ./tests/scripts/thread-cert/v1_2_*.py ./script/test cert_suite ./tests/scripts/thread-cert/addon_test_channel_manager_autocsl*.py - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 if: ${{ failure() }} diff --git a/src/cli/cli.cpp b/src/cli/cli.cpp index b9ec129bb..5d32f8f31 100644 --- a/src/cli/cli.cpp +++ b/src/cli/cli.cpp @@ -1320,8 +1320,7 @@ template <> otError Interpreter::Process(Arg aArgs[]) } #endif // OPENTHREAD_CONFIG_CHANNEL_MONITOR_ENABLE #if OPENTHREAD_CONFIG_CHANNEL_MANAGER_ENABLE && \ - (OPENTHREAD_FTD || \ - (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE)) + (OPENTHREAD_FTD || OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) else if (aArgs[0] == "manager") { /** @@ -1348,17 +1347,16 @@ template <> otError Interpreter::Process(Arg aArgs[]) #if OPENTHREAD_FTD OutputLine("auto: %d", otChannelManagerGetAutoChannelSelectionEnabled(GetInstancePtr())); #endif -#if (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) +#if OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE OutputLine("autocsl: %u", otChannelManagerGetAutoCslChannelSelectionEnabled(GetInstancePtr())); #endif -#if (OPENTHREAD_FTD && OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && \ - OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) +#if (OPENTHREAD_FTD && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) if (otChannelManagerGetAutoChannelSelectionEnabled(GetInstancePtr()) || otChannelManagerGetAutoCslChannelSelectionEnabled(GetInstancePtr())) #elif OPENTHREAD_FTD if (otChannelManagerGetAutoChannelSelectionEnabled(GetInstancePtr())) -#elif (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) +#elif OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE if (otChannelManagerGetAutoCslChannelSelectionEnabled(GetInstancePtr())) #endif { @@ -1440,7 +1438,7 @@ template <> otError Interpreter::Process(Arg aArgs[]) otChannelManagerSetAutoChannelSelectionEnabled(GetInstancePtr(), enable); } #endif // OPENTHREAD_FTD -#if (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) +#if OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE /** * @cli channel manager autocsl * @code @@ -1463,7 +1461,7 @@ template <> otError Interpreter::Process(Arg aArgs[]) SuccessOrExit(error = aArgs[2].ParseAsBool(enable)); otChannelManagerSetAutoCslChannelSelectionEnabled(GetInstancePtr(), enable); } -#endif // (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) +#endif // OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE #if OPENTHREAD_FTD /** * @cli channel manager delay diff --git a/src/core/api/channel_manager_api.cpp b/src/core/api/channel_manager_api.cpp index 3aa5d36a7..b4b053aae 100644 --- a/src/core/api/channel_manager_api.cpp +++ b/src/core/api/channel_manager_api.cpp @@ -34,8 +34,7 @@ #include "openthread-core-config.h" #if OPENTHREAD_CONFIG_CHANNEL_MANAGER_ENABLE && \ - (OPENTHREAD_FTD || \ - (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE)) + (OPENTHREAD_FTD || OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) #include @@ -86,7 +85,7 @@ bool otChannelManagerGetAutoChannelSelectionEnabled(otInstance *aInstance) } #endif // OPENTHREAD_FTD -#if (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) +#if OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE #if OPENTHREAD_CONFIG_CHANNEL_MONITOR_ENABLE otError otChannelManagerRequestCslChannelSelect(otInstance *aInstance, bool aSkipQualityCheck) { diff --git a/src/core/instance/instance.cpp b/src/core/instance/instance.cpp index 902209622..e208eebdc 100644 --- a/src/core/instance/instance.cpp +++ b/src/core/instance/instance.cpp @@ -234,8 +234,7 @@ Instance::Instance(void) , mChannelMonitor(*this) #endif #if OPENTHREAD_CONFIG_CHANNEL_MANAGER_ENABLE && \ - (OPENTHREAD_FTD || \ - (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE)) + (OPENTHREAD_FTD || OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) , mChannelManager(*this) #endif #if OPENTHREAD_CONFIG_MESH_DIAG_ENABLE && OPENTHREAD_FTD diff --git a/src/core/instance/instance.hpp b/src/core/instance/instance.hpp index 2b462b467..cb9c3d340 100644 --- a/src/core/instance/instance.hpp +++ b/src/core/instance/instance.hpp @@ -671,8 +671,7 @@ private: #endif #if OPENTHREAD_CONFIG_CHANNEL_MANAGER_ENABLE && \ - (OPENTHREAD_FTD || \ - (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE)) + (OPENTHREAD_FTD || OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) Utils::ChannelManager mChannelManager; #endif @@ -978,8 +977,7 @@ template <> inline Utils::ChannelMonitor &Instance::Get(void) { return mChannelM #endif #if OPENTHREAD_CONFIG_CHANNEL_MANAGER_ENABLE && \ - (OPENTHREAD_FTD || \ - (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE)) + (OPENTHREAD_FTD || OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) template <> inline Utils::ChannelManager &Instance::Get(void) { return mChannelManager; } #endif diff --git a/src/core/utils/channel_manager.cpp b/src/core/utils/channel_manager.cpp index c8b685948..1e5c76252 100644 --- a/src/core/utils/channel_manager.cpp +++ b/src/core/utils/channel_manager.cpp @@ -34,9 +34,8 @@ #include "channel_manager.hpp" -#if OPENTHREAD_CONFIG_CHANNEL_MANAGER_ENABLE && \ - (OPENTHREAD_FTD || \ - (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE)) +#if OPENTHREAD_CONFIG_CHANNEL_MANAGER_ENABLE +#if (OPENTHREAD_FTD || OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) #include "common/code_utils.hpp" #include "common/locator_getters.hpp" @@ -67,7 +66,7 @@ ChannelManager::ChannelManager(Instance &aInstance) #if OPENTHREAD_FTD , mAutoSelectEnabled(false) #endif -#if (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) +#if OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE , mAutoSelectCslEnabled(false) #endif , mCcaFailureRateThreshold(kCcaFailureRateThreshold) @@ -82,7 +81,7 @@ void ChannelManager::RequestChannelChange(uint8_t aChannel) RequestNetworkChannelChange(aChannel); } #endif -#if (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) +#if OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE if (mAutoSelectCslEnabled) { ChangeCslChannel(aChannel); @@ -118,7 +117,7 @@ exit: } #endif -#if (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) +#if OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE void ChannelManager::ChangeCslChannel(uint8_t aChannel) { if (!(!Get().IsRxOnWhenIdle() && Get().IsCslEnabled())) @@ -143,7 +142,7 @@ void ChannelManager::ChangeCslChannel(uint8_t aChannel) exit: return; } -#endif // (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) +#endif // OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE #if OPENTHREAD_FTD Error ChannelManager::SetDelay(uint16_t aDelay) @@ -315,7 +314,7 @@ exit: } #endif -#if (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) +#if OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE Error ChannelManager::RequestCslChannelSelect(bool aSkipQualityCheck) { Error error = kErrorNone; @@ -358,7 +357,7 @@ Error ChannelManager::RequestChannelSelect(bool aSkipQualityCheck) SuccessOrExit(error = FindBetterChannel(newChannel, newOccupancy)); -#if (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) +#if OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE if (Get().IsCslEnabled() && (Get().GetCslChannel() != 0)) { curChannel = Get().GetCslChannel(); @@ -402,12 +401,11 @@ void ChannelManager::StartAutoSelectTimer(void) { VerifyOrExit(mState == kStateIdle); -#if (OPENTHREAD_FTD && OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && \ - OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) +#if (OPENTHREAD_FTD && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) if (mAutoSelectEnabled || mAutoSelectCslEnabled) #elif OPENTHREAD_FTD if (mAutoSelectEnabled) -#elif (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) +#elif OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE if (mAutoSelectCslEnabled) #endif { @@ -436,7 +434,7 @@ void ChannelManager::SetAutoNetworkChannelSelectionEnabled(bool aEnabled) } #endif -#if (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) +#if OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE void ChannelManager::SetAutoCslChannelSelectionEnabled(bool aEnabled) { if (aEnabled != mAutoSelectCslEnabled) @@ -457,12 +455,11 @@ Error ChannelManager::SetAutoChannelSelectionInterval(uint32_t aInterval) mAutoSelectInterval = aInterval; -#if (OPENTHREAD_FTD && OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && \ - OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) +#if (OPENTHREAD_FTD && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) if (mAutoSelectEnabled || mAutoSelectCslEnabled) #elif OPENTHREAD_FTD if (mAutoSelectEnabled) -#elif (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) +#elif OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE if (mAutoSelectCslEnabled) #endif { @@ -500,4 +497,5 @@ void ChannelManager::SetCcaFailureRateThreshold(uint16_t aThreshold) } // namespace Utils } // namespace ot +#endif // #if (OPENTHREAD_FTD || OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) #endif // #if OPENTHREAD_CONFIG_CHANNEL_MANAGER_ENABLE diff --git a/src/core/utils/channel_manager.hpp b/src/core/utils/channel_manager.hpp index 02d93053b..d4841bce3 100644 --- a/src/core/utils/channel_manager.hpp +++ b/src/core/utils/channel_manager.hpp @@ -36,9 +36,13 @@ #include "openthread-core-config.h" -#if OPENTHREAD_CONFIG_CHANNEL_MANAGER_ENABLE && \ - (OPENTHREAD_FTD || \ - (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE)) +#if OPENTHREAD_CONFIG_CHANNEL_MANAGER_ENABLE + +#if (OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE && !OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE) +#error "CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE requires OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE"; +#endif + +#if (OPENTHREAD_FTD || OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) #include @@ -164,7 +168,7 @@ public: Error RequestNetworkChannelSelect(bool aSkipQualityCheck); #endif // OPENTHREAD_FTD -#if (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) +#if OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE /** * Requests that `ChannelManager` checks and selects a new Csl channel and starts a channel change. * @@ -192,7 +196,7 @@ public: * */ Error RequestCslChannelSelect(bool aSkipQualityCheck); -#endif // (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) +#endif // OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE #if OPENTHREAD_FTD /** @@ -215,7 +219,7 @@ public: bool GetAutoNetworkChannelSelectionEnabled(void) const { return mAutoSelectEnabled; } #endif -#if (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) +#if OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE /** * Enables/disables the auto-channel-selection functionality. * @@ -352,7 +356,7 @@ private: bool ShouldAttemptChannelChange(void); #endif -#if (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) +#if OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE void ChangeCslChannel(uint8_t aChannel); #endif @@ -371,7 +375,7 @@ private: #if OPENTHREAD_FTD bool mAutoSelectEnabled; #endif -#if (OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE && OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) +#if OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE bool mAutoSelectCslEnabled; #endif uint16_t mCcaFailureRateThreshold; @@ -385,6 +389,7 @@ private: } // namespace Utils } // namespace ot -#endif // OPENTHREAD_CONFIG_CHANNEL_MANAGER_ENABLE && OPENTHREAD_FTD +#endif // #if (OPENTHREAD_FTD || OPENTHREAD_CONFIG_CHANNEL_MANAGER_CSL_CHANNEL_SELECT_ENABLE) +#endif // #if OPENTHREAD_CONFIG_CHANNEL_MANAGER_ENABLE #endif // CHANNEL_MANAGER_HPP_