diff --git a/src/cli/cli.cpp b/src/cli/cli.cpp index df6be4601..f7bf7635e 100644 --- a/src/cli/cli.cpp +++ b/src/cli/cli.cpp @@ -2278,7 +2278,7 @@ exit: return error; } -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE otError Interpreter::ProcessMlr(uint8_t aArgsLength, char *aArgs[]) { @@ -2363,7 +2363,7 @@ void Interpreter::HandleMlrRegResult(otError aError, OutputResult(aError); } -#endif // OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE +#endif // (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE) && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE otError Interpreter::ProcessMode(uint8_t aArgsLength, char *aArgs[]) { diff --git a/src/cli/cli.hpp b/src/cli/cli.hpp index ae171177f..978fa9dd7 100644 --- a/src/cli/cli.hpp +++ b/src/cli/cli.hpp @@ -393,7 +393,7 @@ private: otError ParseLinkMetricsFlags(otLinkMetrics &aLinkMetrics, char *aFlags); #endif -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE otError ProcessMlr(uint8_t aArgsLength, char *aArgs[]); otError ProcessMlrReg(uint8_t aArgsLength, char *aArgs[]); @@ -672,7 +672,7 @@ private: {"macfilter", &Interpreter::ProcessMacFilter}, #endif {"masterkey", &Interpreter::ProcessMasterKey}, -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE +#if (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE) && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE {"mlr", &Interpreter::ProcessMlr}, #endif {"mode", &Interpreter::ProcessMode}, diff --git a/src/core/api/ip6_api.cpp b/src/core/api/ip6_api.cpp index a24890d56..65f2ad4bf 100644 --- a/src/core/api/ip6_api.cpp +++ b/src/core/api/ip6_api.cpp @@ -258,7 +258,7 @@ exit: return error; } -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE otError otIp6RegisterMulticastListeners(otInstance * aInstance, const otIp6Address * aAddresses, uint8_t aAddressNum, diff --git a/src/core/backbone_router/bbr_leader.cpp b/src/core/backbone_router/bbr_leader.cpp index cf5f11e08..806f20034 100644 --- a/src/core/backbone_router/bbr_leader.cpp +++ b/src/core/backbone_router/bbr_leader.cpp @@ -242,11 +242,11 @@ void Leader::UpdateBackboneRouterPrimary(void) Get().HandleBackboneRouterPrimaryUpdate(state, mConfig); #endif -#if OPENTHREAD_CONFIG_MLR_ENABLE || OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_CONFIG_MLR_ENABLE || (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE) Get().HandleBackboneRouterPrimaryUpdate(state, mConfig); #endif -#if OPENTHREAD_CONFIG_DUA_ENABLE || OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_CONFIG_DUA_ENABLE || (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE) Get().HandleBackboneRouterPrimaryUpdate(state, mConfig); #endif } @@ -307,7 +307,7 @@ void Leader::UpdateDomainPrefixConfig(void) #endif #endif -#if OPENTHREAD_CONFIG_DUA_ENABLE || OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_CONFIG_DUA_ENABLE || (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE) Get().HandleDomainPrefixUpdate(state); #endif } diff --git a/src/core/common/instance.hpp b/src/core/common/instance.hpp index 031f501ff..9d9ee552f 100644 --- a/src/core/common/instance.hpp +++ b/src/core/common/instance.hpp @@ -542,7 +542,7 @@ template <> inline DataPollHandler &Instance::Get(void) return mThreadNetif.mMeshForwarder.mIndirectSender.mDataPollHandler; } -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE template <> inline CslTxScheduler &Instance::Get(void) { return mThreadNetif.mMeshForwarder.mIndirectSender.mCslTxScheduler; @@ -798,14 +798,14 @@ template <> inline BackboneRouter::BackboneTmfAgent &Instance::Get(void) } #endif -#if OPENTHREAD_CONFIG_MLR_ENABLE || OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_CONFIG_MLR_ENABLE || (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE) template <> inline MlrManager &Instance::Get(void) { return mThreadNetif.mMlrManager; } #endif -#if OPENTHREAD_CONFIG_DUA_ENABLE || OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_CONFIG_DUA_ENABLE || (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE) template <> inline DuaManager &Instance::Get(void) { return mThreadNetif.mDuaManager; diff --git a/src/core/common/notifier.cpp b/src/core/common/notifier.cpp index 79282ba90..8b0be4b70 100644 --- a/src/core/common/notifier.cpp +++ b/src/core/common/notifier.cpp @@ -158,10 +158,10 @@ void Notifier::EmitEvents(void) #if OPENTHREAD_CONFIG_BORDER_AGENT_ENABLE Get().HandleNotifierEvents(events); #endif -#if OPENTHREAD_CONFIG_MLR_ENABLE || OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_CONFIG_MLR_ENABLE || (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE) Get().HandleNotifierEvents(events); #endif -#if OPENTHREAD_CONFIG_DUA_ENABLE || OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_CONFIG_DUA_ENABLE || (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE) Get().HandleNotifierEvents(events); #endif #if OPENTHREAD_CONFIG_TIME_SYNC_ENABLE diff --git a/src/core/common/time_ticker.cpp b/src/core/common/time_ticker.cpp index dfe2deb62..10461d098 100644 --- a/src/core/common/time_ticker.cpp +++ b/src/core/common/time_ticker.cpp @@ -109,14 +109,14 @@ void TimeTicker::HandleTimer(void) } #endif -#if OPENTHREAD_CONFIG_DUA_ENABLE || OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_CONFIG_DUA_ENABLE || (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE) if (mReceivers & Mask(kDuaManager)) { Get().HandleTimeTick(); } #endif -#if OPENTHREAD_CONFIG_MLR_ENABLE || OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_CONFIG_MLR_ENABLE || (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE) if (mReceivers & Mask(kMlrManager)) { Get().HandleTimeTick(); diff --git a/src/core/config/mac.h b/src/core/config/mac.h index 7a87e68c7..7ab7b87b8 100644 --- a/src/core/config/mac.h +++ b/src/core/config/mac.h @@ -326,13 +326,14 @@ #endif /** + * @def OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE * - * This setting configures the CSL transmitter feature in Thread 1.2. - * This is compulsory for 1.2 FTD. + * Define to 1 to enable csl transmitter logic. * */ -#define OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE \ - (OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2) && (OPENTHREAD_FTD || OPENTHREAD_RADIO) +#ifndef OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#define OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE (OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2) +#endif /** * @def OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE diff --git a/src/core/config/openthread-core-config-check.h b/src/core/config/openthread-core-config-check.h index d22570850..0b8253191 100644 --- a/src/core/config/openthread-core-config-check.h +++ b/src/core/config/openthread-core-config-check.h @@ -511,9 +511,6 @@ #if (OPENTHREAD_CONFIG_THREAD_VERSION < OT_THREAD_VERSION_1_2) #error "Thread 1.2 or higher version is required for OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE" #endif -#if (!OPENTHREAD_FTD && !OPENTHREAD_RADIO) -#error "FTD or RADIO is required for OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE" -#endif #endif // OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE #if OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE diff --git a/src/core/config/tmf.h b/src/core/config/tmf.h index e3f8a2849..7959f37c8 100644 --- a/src/core/config/tmf.h +++ b/src/core/config/tmf.h @@ -180,8 +180,7 @@ * */ #ifndef OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE -#define OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE \ - ((OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2) && OPENTHREAD_FTD) +#define OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE (OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2) #endif #if OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE && OPENTHREAD_CONFIG_THREAD_VERSION < OT_THREAD_VERSION_1_2 @@ -194,8 +193,7 @@ * */ #ifndef OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE -#define OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE \ - ((OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2) && OPENTHREAD_FTD) +#define OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE (OPENTHREAD_CONFIG_THREAD_VERSION >= OT_THREAD_VERSION_1_2) #endif #if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE && OPENTHREAD_CONFIG_THREAD_VERSION < OT_THREAD_VERSION_1_2 diff --git a/src/core/mac/data_poll_handler.hpp b/src/core/mac/data_poll_handler.hpp index 730494917..d1e140809 100644 --- a/src/core/mac/data_poll_handler.hpp +++ b/src/core/mac/data_poll_handler.hpp @@ -90,7 +90,7 @@ public: class ChildInfo { friend class DataPollHandler; -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE friend class CslTxScheduler; #endif diff --git a/src/core/mac/mac.cpp b/src/core/mac/mac.cpp index c5e873a88..f98f45aa4 100644 --- a/src/core/mac/mac.cpp +++ b/src/core/mac/mac.cpp @@ -109,7 +109,7 @@ Mac::Mac(Instance &aInstance) #if OPENTHREAD_FTD , mMaxFrameRetriesIndirect(kDefaultMaxFrameRetriesIndirect) #endif -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE , mCslTxFireTime(TimeMilli::kMaxDuration) #endif , mActiveScanHandler(nullptr) // Initialize `mActiveScanHandler` and `mEnergyScanHandler` union @@ -204,7 +204,7 @@ bool Mac::IsInTransmitState(void) const case kOperationTransmitDataDirect: #if OPENTHREAD_FTD case kOperationTransmitDataIndirect: -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE case kOperationTransmitDataCsl: #endif #endif @@ -578,7 +578,7 @@ exit: return; } -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE void Mac::RequestCslFrameTransmission(uint32_t aDelay) { VerifyOrExit(mEnabled); @@ -652,7 +652,7 @@ void Mac::UpdateIdleMode(void) } #endif } -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE else if (mPendingTransmitDataCsl) { mTimer.FireAt(mCslTxFireTime); @@ -724,7 +724,7 @@ void Mac::StartOperation(Operation aOperation) mPendingTransmitDataIndirect = true; break; -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE case kOperationTransmitDataCsl: mPendingTransmitDataCsl = true; break; @@ -769,7 +769,7 @@ void Mac::PerformNextOperation(void) mPendingTransmitDataDirect = false; #if OPENTHREAD_FTD mPendingTransmitDataIndirect = false; -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE mPendingTransmitDataCsl = false; #endif #endif @@ -790,7 +790,7 @@ void Mac::PerformNextOperation(void) mPendingWaitingForData = false; mOperation = kOperationWaitingForData; } -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE else if (mPendingTransmitDataCsl && TimerMilli::GetNow() >= mCslTxFireTime) { mPendingTransmitDataCsl = false; @@ -867,7 +867,7 @@ void Mac::PerformNextOperation(void) case kOperationTransmitDataDirect: #if OPENTHREAD_FTD case kOperationTransmitDataIndirect: -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE case kOperationTransmitDataCsl: #endif #endif @@ -1094,7 +1094,7 @@ void Mac::BeginTransmit(void) VerifyOrExit(IsEnabled(), error = OT_ERROR_ABORT); sendFrame.SetIsARetransmission(false); sendFrame.SetIsSecurityProcessed(false); -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE sendFrame.SetTxDelay(0); sendFrame.SetTxDelayBaseTime(0); #endif @@ -1149,7 +1149,7 @@ void Mac::BeginTransmit(void) } break; -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE case kOperationTransmitDataCsl: sendFrame.SetMaxCsmaBackoffs(kMaxCsmaBackoffsCsl); sendFrame.SetMaxFrameRetries(kMaxFrameRetriesCsl); @@ -1314,7 +1314,7 @@ void Mac::RecordFrameTransmitStatus(const TxFrame &aFrame, #if OPENTHREAD_FTD if (aAckFrame->GetVersion() == Frame::kFcfFrameVersion2015) { -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE ProcessCsl(*aAckFrame, dstAddr); #endif } @@ -1459,7 +1459,7 @@ void Mac::HandleTransmitDone(TxFrame &aFrame, RxFrame *aAckFrame, otError aError break; #if OPENTHREAD_FTD -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE case kOperationTransmitDataCsl: mCounters.mTxData++; @@ -1539,7 +1539,7 @@ void Mac::HandleTimer(void) } #endif } -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE else if (mPendingTransmitDataCsl) { PerformNextOperation(); @@ -1903,7 +1903,7 @@ void Mac::HandleReceivedFrame(RxFrame *aFrame, otError aError) ExitNow(); } -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE if (aFrame->GetVersion() == Frame::kFcfFrameVersion2015) { ProcessCsl(*aFrame, srcaddr); @@ -2199,7 +2199,7 @@ const char *Mac::OperationToString(Operation aOperation) retval = "TransmitDataIndirect"; break; -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE case kOperationTransmitDataCsl: retval = "TransmitDataCsl"; break; @@ -2352,7 +2352,7 @@ bool Mac::IsCslEnabled(void) const #endif // OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE void Mac::ProcessCsl(const RxFrame &aFrame, const Address &aSrcAddr) { const uint8_t *cur = aFrame.GetHeaderIe(Frame::kHeaderIeCsl); @@ -2378,7 +2378,7 @@ void Mac::ProcessCsl(const RxFrame &aFrame, const Address &aSrcAddr) exit: return; } -#endif // OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#endif // !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE #if OPENTHREAD_CONFIG_MAC_HEADER_IE_SUPPORT otError Mac::AppendHeaderIe(bool aIsTimeSync, TxFrame &aFrame) const @@ -2463,7 +2463,7 @@ void Mac::UpdateFrameControlField(const Neighbor *aNeighbor, bool aIsTimeSync, u } else #endif -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE if (aNeighbor != nullptr && !Mle::MleRouter::IsActiveRouter(aNeighbor->GetRloc16()) && static_cast(aNeighbor)->IsCslSynchronized()) { diff --git a/src/core/mac/mac.hpp b/src/core/mac/mac.hpp index c02b4646d..22cf65738 100644 --- a/src/core/mac/mac.hpp +++ b/src/core/mac/mac.hpp @@ -219,7 +219,7 @@ public: */ void RequestIndirectFrameTransmission(void); -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE /** * This method requests `Mac` to start a CSL tx operation after a delay of @p aDelay time. * @@ -790,7 +790,7 @@ private: kOperationTransmitDataDirect, #if OPENTHREAD_FTD kOperationTransmitDataIndirect, -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE kOperationTransmitDataCsl, #endif #endif @@ -859,7 +859,7 @@ private: uint8_t GetTimeIeOffset(const Frame &aFrame); #endif -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE void ProcessCsl(const RxFrame &aFrame, const Address &aSrcAddr); #endif static const char *OperationToString(Operation aOperation); @@ -878,7 +878,7 @@ private: #if OPENTHREAD_FTD bool mPendingTransmitDataIndirect : 1; #endif -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE bool mPendingTransmitDataCsl : 1; #endif bool mPendingTransmitPoll : 1; @@ -914,7 +914,7 @@ private: #if OPENTHREAD_FTD uint8_t mMaxFrameRetriesIndirect; #endif -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE TimeMilli mCslTxFireTime; #endif diff --git a/src/core/mac/sub_mac.cpp b/src/core/mac/sub_mac.cpp index d44f234c7..dd27e7146 100644 --- a/src/core/mac/sub_mac.cpp +++ b/src/core/mac/sub_mac.cpp @@ -283,7 +283,7 @@ otError SubMac::Send(void) { case kStateDisabled: case kStateCsmaBackoff: -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE case kStateCslTransmit: #endif case kStateTransmit: @@ -349,7 +349,7 @@ void SubMac::StartCsmaBackoff(void) uint32_t backoff; uint32_t backoffExponent = kMinBE + mTransmitRetries + mCsmaBackoffs; -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE if (mTransmitFrame.mInfo.mTxInfo.mTxDelay != 0) { SetState(kStateCslTransmit); @@ -375,7 +375,7 @@ void SubMac::StartCsmaBackoff(void) ExitNow(); } -#endif // OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#endif // !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE SetState(kStateCsmaBackoff); VerifyOrExit(ShouldHandleCsmaBackOff(), BeginTransmit()); @@ -413,7 +413,7 @@ void SubMac::BeginTransmit(void) OT_UNUSED_VARIABLE(error); -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE VerifyOrExit(mState == kStateCsmaBackoff || mState == kStateCslTransmit); #else VerifyOrExit(mState == kStateCsmaBackoff); @@ -583,7 +583,7 @@ otError SubMac::EnergyScan(uint8_t aScanChannel, uint16_t aScanDuration) case kStateDisabled: case kStateCsmaBackoff: case kStateTransmit: -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE case kStateCslTransmit: #endif case kStateEnergyScan: @@ -664,7 +664,7 @@ void SubMac::HandleTimer(void) { switch (mState) { -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE case kStateCslTransmit: BeginTransmit(); break; @@ -881,7 +881,7 @@ const char *SubMac::StateToString(State aState) case kStateEnergyScan: str = "EnergyScan"; break; -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE case kStateCslTransmit: str = "CslTransmit"; break; diff --git a/src/core/mac/sub_mac.hpp b/src/core/mac/sub_mac.hpp index ff9646d9b..8ab30ea27 100644 --- a/src/core/mac/sub_mac.hpp +++ b/src/core/mac/sub_mac.hpp @@ -522,7 +522,7 @@ private: kStateCsmaBackoff, ///< CSMA backoff before transmission. kStateTransmit, ///< Radio is transmitting. kStateEnergyScan, ///< Energy scan. -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE kStateCslTransmit, ///< CSL transmission. #endif #if OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE diff --git a/src/core/thread/csl_tx_scheduler.cpp b/src/core/thread/csl_tx_scheduler.cpp index 7216f082d..065ab1994 100644 --- a/src/core/thread/csl_tx_scheduler.cpp +++ b/src/core/thread/csl_tx_scheduler.cpp @@ -28,7 +28,7 @@ #include "csl_tx_scheduler.hpp" -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE #include "common/locator-getters.hpp" #include "common/logging.hpp" @@ -287,4 +287,4 @@ exit: } // namespace ot -#endif // OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#endif // !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE diff --git a/src/core/thread/csl_tx_scheduler.hpp b/src/core/thread/csl_tx_scheduler.hpp index d7509bd09..777f9d9f5 100644 --- a/src/core/thread/csl_tx_scheduler.hpp +++ b/src/core/thread/csl_tx_scheduler.hpp @@ -50,7 +50,7 @@ namespace ot { * @{ */ -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE class Child; @@ -208,7 +208,7 @@ private: Callbacks mCallbacks; }; -#endif // OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#endif // !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE /** * @} diff --git a/src/core/thread/dua_manager.cpp b/src/core/thread/dua_manager.cpp index 04ea7ee34..5941bda7f 100644 --- a/src/core/thread/dua_manager.cpp +++ b/src/core/thread/dua_manager.cpp @@ -33,7 +33,7 @@ #include "dua_manager.hpp" -#if OPENTHREAD_CONFIG_DUA_ENABLE || OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_CONFIG_DUA_ENABLE || (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE) #include "common/code_utils.hpp" #include "common/instance.hpp" @@ -59,7 +59,7 @@ DuaManager::DuaManager(Instance &aInstance) , mDadCounter(0) , mLastRegistrationTime(0) #endif -#if OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE , mChildIndexDuaRegistering(0) , mRegisterCurrentChildIndex(false) #endif @@ -71,7 +71,7 @@ DuaManager::DuaManager(Instance &aInstance) mFixedDuaInterfaceIdentifier.Clear(); #endif -#if OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE mChildDuaMask.Clear(); mChildDuaRegisteredMask.Clear(); #endif @@ -93,7 +93,7 @@ void DuaManager::HandleDomainPrefixUpdate(BackboneRouter::Leader::DomainPrefixSt RemoveDomainUnicastAddress(); #endif -#if OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE if (mChildDuaMask.HasAny()) { mChildDuaMask.Clear(); @@ -379,7 +379,7 @@ void DuaManager::HandleTimeTick(void) } #endif -#if OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE mChildDuaRegisteredMask.Clear(); #endif attempt = true; @@ -421,14 +421,14 @@ void DuaManager::PerformNextRegistration(void) // Only send DUA.req when necessary #if OPENTHREAD_CONFIG_DUA_ENABLE -#if OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE VerifyOrExit(mle.IsRouterOrLeader() || !mle.IsExpectedToBecomeRouter(), error = OT_ERROR_INVALID_STATE); VerifyOrExit((mDuaState == kToRegister && mDelay.mFields.mRegistrationDelay == 0) || (mChildDuaMask.HasAny() && mChildDuaMask != mChildDuaRegisteredMask), error = OT_ERROR_NOT_FOUND); #else VerifyOrExit(mDuaState == kToRegister && mDelay.mFields.mRegistrationDelay == 0, error = OT_ERROR_NOT_FOUND); -#endif // OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#endif // OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE VerifyOrExit(mle.IsFullThreadDevice() || mle.GetParent().IsThreadVersion1p1(), error = OT_ERROR_INVALID_STATE); #endif // OPENTHREAD_CONFIG_DUA_ENABLE @@ -451,7 +451,7 @@ void DuaManager::PerformNextRegistration(void) else #endif // OPENTHREAD_CONFIG_DUA_ENABLE { -#if OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE uint32_t lastTransactionTime; const Ip6::Address *duaPtr = nullptr; Child * child = nullptr; @@ -481,7 +481,7 @@ void DuaManager::PerformNextRegistration(void) lastTransactionTime = Time::MsecToSec(TimerMilli::GetNow() - child->GetLastHeard()); SuccessOrExit(error = Tlv::Append(*message, lastTransactionTime)); -#endif // OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#endif // OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE } if (!mle.IsFullThreadDevice() && mle.GetParent().IsThreadVersion1p1()) @@ -616,7 +616,7 @@ otError DuaManager::ProcessDuaResponse(Coap::Message &aMessage) } else #endif -#if OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE { Child *child = Get().GetChildAtIndex(mChildIndexDuaRegistering); @@ -649,14 +649,14 @@ otError DuaManager::ProcessDuaResponse(Coap::Message &aMessage) break; } } -#endif // OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#endif // OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE exit: UpdateTimeTickerRegistration(); return error; } -#if OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE void DuaManager::SendAddressNotification(Ip6::Address & aAddress, ThreadStatusTlv::DuaStatus aStatus, const Child & aChild) @@ -730,8 +730,8 @@ void DuaManager::UpdateChildDomainUnicastAddress(const Child &aChild, Mle::Child return; } -#endif // OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#endif // OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE } // namespace ot -#endif // OPENTHREAD_CONFIG_DUA_ENABLE || OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#endif // OPENTHREAD_CONFIG_DUA_ENABLE || (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE) diff --git a/src/core/thread/dua_manager.hpp b/src/core/thread/dua_manager.hpp index 255c056b4..be31a2d42 100644 --- a/src/core/thread/dua_manager.hpp +++ b/src/core/thread/dua_manager.hpp @@ -36,7 +36,7 @@ #include "openthread-core-config.h" -#if OPENTHREAD_CONFIG_DUA_ENABLE || OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_CONFIG_DUA_ENABLE || (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE) #include "backbone_router/bbr_leader.hpp" #include "coap/coap.hpp" @@ -162,7 +162,7 @@ public: void NotifyDuplicateDomainUnicastAddress(void); #endif -#if OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE void UpdateChildDomainUnicastAddress(const Child &aChild, Mle::ChildDuaState aState); #endif @@ -181,7 +181,7 @@ private: void UpdateRegistrationDelay(uint8_t aDelay); #endif -#if OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE void SendAddressNotification(Ip6::Address &aAddress, ThreadStatusTlv::DuaStatus aStatus, const Child &aChild); #endif @@ -251,7 +251,7 @@ private: uint32_t mValue; ///< Non-zero indicates timer should start. } mDelay; -#if OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE // TODO: (DUA) may re-evaluate the alternative option of distributing the flags into the child table: // - Child class itself have some padding - may save some RAM // - Avoid cross reference between a bit-vector and the child entry @@ -264,5 +264,5 @@ private: } // namespace ot -#endif // OPENTHREAD_CONFIG_DUA_ENABLE || OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#endif // OPENTHREAD_CONFIG_DUA_ENABLE || (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE) #endif // DUA_MANAGER_HPP_ diff --git a/src/core/thread/indirect_sender.cpp b/src/core/thread/indirect_sender.cpp index dd0375433..1ad113c32 100644 --- a/src/core/thread/indirect_sender.cpp +++ b/src/core/thread/indirect_sender.cpp @@ -65,7 +65,7 @@ IndirectSender::IndirectSender(Instance &aInstance) , mEnabled(false) , mSourceMatchController(aInstance) , mDataPollHandler(aInstance) -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE , mCslTxScheduler(aInstance) #endif { @@ -82,7 +82,7 @@ void IndirectSender::Stop(void) } mDataPollHandler.Clear(); -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE mCslTxScheduler.Clear(); #endif @@ -163,7 +163,7 @@ void IndirectSender::ClearAllMessagesForSleepyChild(Child &aChild) mSourceMatchController.ResetMessageCount(aChild); mDataPollHandler.RequestFrameChange(DataPollHandler::kPurgeFrame, aChild); -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE mCslTxScheduler.Update(); #endif @@ -208,7 +208,7 @@ void IndirectSender::HandleChildModeChange(Child &aChild, Mle::DeviceMode aOldMo mSourceMatchController.ResetMessageCount(aChild); mDataPollHandler.RequestFrameChange(DataPollHandler::kPurgeFrame, aChild); -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE mCslTxScheduler.Update(); #endif } @@ -263,7 +263,7 @@ void IndirectSender::RequestMessageUpdate(Child &aChild) aChild.SetWaitingForMessageUpdate(true); mDataPollHandler.RequestFrameChange(DataPollHandler::kPurgeFrame, aChild); -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE mCslTxScheduler.Update(); #endif @@ -295,7 +295,7 @@ void IndirectSender::RequestMessageUpdate(Child &aChild) aChild.SetWaitingForMessageUpdate(true); mDataPollHandler.RequestFrameChange(DataPollHandler::kReplaceFrame, aChild); -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE mCslTxScheduler.Update(); #endif @@ -321,7 +321,7 @@ void IndirectSender::UpdateIndirectMessage(Child &aChild) aChild.SetIndirectFragmentOffset(0); aChild.SetIndirectTxSuccess(true); -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE mCslTxScheduler.Update(); #endif @@ -463,7 +463,7 @@ void IndirectSender::HandleSentFrameToChild(const Mac::TxFrame &aFrame, { aChild.SetIndirectFragmentOffset(nextOffset); mDataPollHandler.HandleNewFrame(aChild); -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE mCslTxScheduler.Update(); #endif ExitNow(); diff --git a/src/core/thread/indirect_sender.hpp b/src/core/thread/indirect_sender.hpp index 95bd141b4..f0bca7620 100644 --- a/src/core/thread/indirect_sender.hpp +++ b/src/core/thread/indirect_sender.hpp @@ -67,7 +67,7 @@ class IndirectSender : public InstanceLocator, public IndirectSenderBase, privat { friend class Instance; friend class DataPollHandler::Callbacks; -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE friend class CslTxScheduler::Callbacks; #endif @@ -228,7 +228,7 @@ private: bool mEnabled; SourceMatchController mSourceMatchController; DataPollHandler mDataPollHandler; -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE CslTxScheduler mCslTxScheduler; #endif }; diff --git a/src/core/thread/mle.hpp b/src/core/thread/mle.hpp index 012eb00cc..2bec7b9d3 100644 --- a/src/core/thread/mle.hpp +++ b/src/core/thread/mle.hpp @@ -1241,7 +1241,7 @@ protected: otError AppendXtalAccuracy(Message &aMessage); #endif // OPENTHREAD_CONFIG_TIME_SYNC_ENABLE -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE || OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE +#if (!OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE) || OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE /** * This method appends a CSL Channel TLV to a message. * @@ -1263,7 +1263,7 @@ protected: * */ otError AppendCslTimeout(Message &aMessage); -#endif // OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE || OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE +#endif // (!OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE) || OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE /** * This method appends a Active Timestamp TLV to a message. diff --git a/src/core/thread/mle_router.cpp b/src/core/thread/mle_router.cpp index 71073a3c3..96839289f 100644 --- a/src/core/thread/mle_router.cpp +++ b/src/core/thread/mle_router.cpp @@ -1779,7 +1779,7 @@ void MleRouter::HandleTimeTick(void) OT_UNREACHABLE_CODE(break); } -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE if (child.IsCslSynchronized() && TimerMilli::GetNow() - child.GetCslLastHeard() >= Time::SecToMsec(child.GetCslTimeout())) { @@ -1969,13 +1969,13 @@ otError MleRouter::UpdateChildAddresses(const Message &aMessage, uint16_t aOffse uint8_t storedCount = 0; uint16_t offset = 0; uint16_t end = 0; -#if OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE Ip6::Address oldDua; const Ip6::Address *oldDuaPtr = nullptr; bool hasDua = false; #endif -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE Ip6::Address oldMlrRegisteredAddresses[OPENTHREAD_CONFIG_MLE_IP_ADDRS_PER_CHILD - 1]; uint16_t oldMlrRegisteredAddressNum = 0; #endif @@ -1986,14 +1986,14 @@ otError MleRouter::UpdateChildAddresses(const Message &aMessage, uint16_t aOffse offset = aOffset + sizeof(tlv); end = offset + tlv.GetLength(); -#if OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE if ((oldDuaPtr = aChild.GetDomainUnicastAddress()) != nullptr) { oldDua = *oldDuaPtr; } #endif -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE // Retrieve registered multicast addresses of the Child if (aChild.HasAnyMlrRegisteredAddress()) { @@ -2039,7 +2039,7 @@ otError MleRouter::UpdateChildAddresses(const Message &aMessage, uint16_t aOffse address.SetPrefix(context.mPrefix); address.SetIid(entry.GetIid()); -#if OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE if (Get().IsDomainUnicast(address)) { hasDua = true; @@ -2118,7 +2118,7 @@ otError MleRouter::UpdateChildAddresses(const Message &aMessage, uint16_t aOffse // Clear EID-to-RLOC cache for the unicast address registered by the child. Get().Remove(address); } -#if OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE // Dua is removed if (oldDuaPtr != nullptr && !hasDua) { @@ -2126,7 +2126,7 @@ otError MleRouter::UpdateChildAddresses(const Message &aMessage, uint16_t aOffse } #endif -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE Get().UpdateProxiedSubscriptions(aChild, oldMlrRegisteredAddresses, oldMlrRegisteredAddressNum); #endif @@ -2436,7 +2436,7 @@ void MleRouter::HandleChildUpdateRequest(const Message & aMessage, ExitNow(error = OT_ERROR_PARSE); } -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE if (child->IsCslSynchronized()) { CslChannelTlv cslChannel; @@ -2457,7 +2457,7 @@ void MleRouter::HandleChildUpdateRequest(const Message & aMessage, child->SetCslChannel(0); } } -#endif // OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#endif // !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE child->SetLastHeard(TimerMilli::GetNow()); @@ -2468,7 +2468,7 @@ void MleRouter::HandleChildUpdateRequest(const Message & aMessage, childDidChange = true; -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE if (child->IsRxOnWhenIdle()) { // Clear CSL synchronization state @@ -4243,7 +4243,7 @@ void MleRouter::SetChildStateToValid(Child &aChild) aChild.SetState(Neighbor::kStateValid); IgnoreError(mChildTable.StoreChild(aChild)); -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE Get().UpdateProxiedSubscriptions(aChild, nullptr, 0); #endif diff --git a/src/core/thread/mle_tlvs.hpp b/src/core/thread/mle_tlvs.hpp index 91fa012cc..a70c3a12f 100644 --- a/src/core/thread/mle_tlvs.hpp +++ b/src/core/thread/mle_tlvs.hpp @@ -1265,7 +1265,7 @@ public: bool IsValid(void) const { return GetLength() >= sizeof(*this) - sizeof(Tlv); } } OT_TOOL_PACKED_END; -#if OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE || OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE || (!OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE) /** * This class implements CSL Channel TLV generation and parsing. * @@ -1330,7 +1330,7 @@ private: uint16_t mChannel; } OT_TOOL_PACKED_END; -#endif // OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE || OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#endif // OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE || (!OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE) /** * @} diff --git a/src/core/thread/mlr_manager.cpp b/src/core/thread/mlr_manager.cpp index 3231a9943..287ec602b 100644 --- a/src/core/thread/mlr_manager.cpp +++ b/src/core/thread/mlr_manager.cpp @@ -33,7 +33,7 @@ #include "mlr_manager.hpp" -#if OPENTHREAD_CONFIG_MLR_ENABLE || OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_CONFIG_MLR_ENABLE || (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE) #include "common/code_utils.hpp" #include "common/instance.hpp" @@ -48,14 +48,14 @@ namespace ot { MlrManager::MlrManager(Instance &aInstance) : InstanceLocator(aInstance) -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE +#if (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE) && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE , mRegisterMulticastListenersCallback(nullptr) , mRegisterMulticastListenersContext(nullptr) #endif , mReregistrationDelay(0) , mSendDelay(0) , mMlrPending(false) -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE +#if (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE) && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE , mRegisterMulticastListenersPending(false) #endif { @@ -91,7 +91,7 @@ void MlrManager::HandleBackboneRouterPrimaryUpdate(BackboneRouter::Leader::State #if OPENTHREAD_CONFIG_MLR_ENABLE void MlrManager::UpdateLocalSubscriptions(void) { -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE // Check multicast addresses are newly listened against Children for (Ip6::ExternalNetifMulticastAddress &addr : Get().IterateExternalMulticastAddresses(Ip6::Address::kTypeMulticastLargerThanRealmLocal)) @@ -127,7 +127,7 @@ exit: #endif // OPENTHREAD_CONFIG_MLR_ENABLE -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE bool MlrManager::IsAddressMlrRegisteredByAnyChildExcept(const Ip6::Address &aAddress, const Child *aExceptChild) const { @@ -188,7 +188,7 @@ exit: } } -#endif // OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#endif // OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE void MlrManager::ScheduleSend(uint16_t aDelay) { @@ -253,7 +253,7 @@ void MlrManager::SendMulticastListenerRegistration(void) } #endif -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE // Append Child multicast addresses for (Child &child : Get().Iterate(Child::kInStateValid)) { @@ -311,7 +311,7 @@ exit: CheckInvariants(); } -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE +#if (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE) && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE otError MlrManager::RegisterMulticastListeners(const otIp6Address * aAddresses, uint8_t aAddressNum, const uint32_t * aTimeout, @@ -374,7 +374,7 @@ void MlrManager::HandleRegisterMulticastListenersResponse(otMessage * a } } -#endif // OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE +#endif // (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE) && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE otError MlrManager::SendMulticastListenerRegistrationMessage(const otIp6Address * aAddresses, uint8_t aAddressNum, @@ -404,7 +404,7 @@ otError MlrManager::SendMulticastListenerRegistrationMessage(const otIp6Address SuccessOrExit(error = message->Append(addressesTlv)); SuccessOrExit(error = message->AppendBytes(aAddresses, sizeof(Ip6::Address) * aAddressNum)); -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE +#if (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE) && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE if (Get().IsActive()) { SuccessOrExit( @@ -539,7 +539,7 @@ void MlrManager::SetMulticastAddressMlrState(MlrState aFromState, MlrState aToSt } } #endif -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE for (Child &child : Get().Iterate(Child::kInStateValid)) { for (const Ip6::Address &address : child.IterateIp6Addresses(Ip6::Address::kTypeMulticastLargerThanRealmLocal)) @@ -573,7 +573,7 @@ void MlrManager::FinishMulticastListenerRegistration(bool aSucces } } #endif -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE for (Child &child : Get().Iterate(Child::kInStateValid)) { for (const Ip6::Address &address : child.IterateIp6Addresses(Ip6::Address::kTypeMulticastLargerThanRealmLocal)) @@ -678,7 +678,7 @@ void MlrManager::LogMulticastAddresses(void) } #endif -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE for (Child &child : Get().Iterate(Child::kInStateValid)) { for (const Ip6::Address &address : child.IterateIp6Addresses(Ip6::Address::kTypeMulticastLargerThanRealmLocal)) @@ -696,7 +696,7 @@ void MlrManager::AppendToUniqueAddressList(Ip6::Address (&aAddresses)[kIPv6Addre uint8_t & aAddressNum, const Ip6::Address &aAddress) { -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE for (uint8_t i = 0; i < aAddressNum; i++) { if (aAddresses[i] == aAddress) @@ -708,7 +708,7 @@ void MlrManager::AppendToUniqueAddressList(Ip6::Address (&aAddresses)[kIPv6Addre aAddresses[aAddressNum++] = aAddress; -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE exit: #endif return; @@ -779,7 +779,7 @@ void MlrManager::CheckInvariants(void) const registeringNum += (addr.GetMlrState() == kMlrStateRegistering); } #endif -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE for (Child &child : Get().Iterate(Child::kInStateValid)) { for (const Ip6::Address &address : child.IterateIp6Addresses(Ip6::Address::kTypeMulticastLargerThanRealmLocal)) diff --git a/src/core/thread/mlr_manager.hpp b/src/core/thread/mlr_manager.hpp index d8f6f5ff7..fa2a9f1a3 100644 --- a/src/core/thread/mlr_manager.hpp +++ b/src/core/thread/mlr_manager.hpp @@ -36,7 +36,7 @@ #include "openthread-core-config.h" -#if OPENTHREAD_CONFIG_MLR_ENABLE || OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_CONFIG_MLR_ENABLE || (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE) #include "backbone_router/bbr_leader.hpp" #include "coap/coap_message.hpp" @@ -93,7 +93,7 @@ public: void HandleBackboneRouterPrimaryUpdate(BackboneRouter::Leader::State aState, const BackboneRouter::BackboneRouterConfig &aConfig); -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE /** * This method updates the Multicast Subscription Table according to the Child information. * @@ -108,11 +108,11 @@ public: uint16_t aOldMlrRegisteredAddressNum); #endif -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE /** * This method registers Multicast Listeners to Primary Backbone Router. * - * Note: only available when both `OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE` and + * Note: only available when both `(OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE)` and * `OPENTHREAD_CONFIG_COMMISSIONER_ENABLE` are enabled) * * @param aAddresses A pointer to Ip6 multicast addresses to register. @@ -176,7 +176,7 @@ private: bool IsAddressMlrRegisteredByNetif(const Ip6::Address &aAddress) const; #endif -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE bool IsAddressMlrRegisteredByAnyChild(const Ip6::Address &aAddress) const { return IsAddressMlrRegisteredByAnyChildExcept(aAddress, nullptr); @@ -210,7 +210,7 @@ private: const Ip6::Address *aFailedAddresses, uint8_t aFailedAddressNum); -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE +#if (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE) && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE otIp6RegisterMulticastListenersCallback mRegisterMulticastListenersCallback; void * mRegisterMulticastListenersContext; #endif @@ -219,12 +219,12 @@ private: uint16_t mSendDelay; bool mMlrPending : 1; -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE +#if (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE) && OPENTHREAD_CONFIG_COMMISSIONER_ENABLE bool mRegisterMulticastListenersPending : 1; #endif }; } // namespace ot -#endif // OPENTHREAD_CONFIG_MLR_ENABLE || OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#endif // OPENTHREAD_CONFIG_MLR_ENABLE || (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE) #endif // MLR_MANAGER_HPP_ diff --git a/src/core/thread/mlr_types.hpp b/src/core/thread/mlr_types.hpp index 366a34ea2..c9d642f75 100644 --- a/src/core/thread/mlr_types.hpp +++ b/src/core/thread/mlr_types.hpp @@ -36,7 +36,7 @@ #include "openthread-core-config.h" -#if OPENTHREAD_CONFIG_MLR_ENABLE || OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_CONFIG_MLR_ENABLE || (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE) namespace ot { @@ -60,5 +60,5 @@ enum MlrState } // namespace ot -#endif // OPENTHREAD_CONFIG_MLR_ENABLE || OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#endif // OPENTHREAD_CONFIG_MLR_ENABLE || (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE) #endif // MLR_TYPES_HPP_ diff --git a/src/core/thread/neighbor_table.cpp b/src/core/thread/neighbor_table.cpp index eec83564d..1a25a01e2 100644 --- a/src/core/thread/neighbor_table.cpp +++ b/src/core/thread/neighbor_table.cpp @@ -291,7 +291,7 @@ void NeighborTable::Signal(Event aEvent, const Neighbor &aNeighbor) case OT_NEIGHBOR_TABLE_EVENT_CHILD_REMOVED: Get().Signal(kEventThreadChildRemoved); -#if OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE Get().UpdateChildDomainUnicastAddress(static_cast(aNeighbor), Mle::ChildDuaState::kRemoved); #endif diff --git a/src/core/thread/thread_netif.cpp b/src/core/thread/thread_netif.cpp index a7a2955dd..f8348bfdd 100644 --- a/src/core/thread/thread_netif.cpp +++ b/src/core/thread/thread_netif.cpp @@ -111,11 +111,11 @@ ThreadNetif::ThreadNetif(Instance &aInstance) , mBackboneRouterLocal(aInstance) , mBackboneRouterManager(aInstance) #endif -#if OPENTHREAD_CONFIG_MLR_ENABLE || OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_CONFIG_MLR_ENABLE || (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE) , mMlrManager(aInstance) #endif -#if OPENTHREAD_CONFIG_DUA_ENABLE || OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_CONFIG_DUA_ENABLE || (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE) , mDuaManager(aInstance) #endif , mChildSupervisor(aInstance) diff --git a/src/core/thread/thread_netif.hpp b/src/core/thread/thread_netif.hpp index 40f8cd0fa..3fee6650c 100644 --- a/src/core/thread/thread_netif.hpp +++ b/src/core/thread/thread_netif.hpp @@ -56,11 +56,11 @@ #include "backbone_router/bbr_manager.hpp" #endif -#if OPENTHREAD_CONFIG_MLR_ENABLE || OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_CONFIG_MLR_ENABLE || (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE) #include "thread/mlr_manager.hpp" #endif -#if OPENTHREAD_CONFIG_DUA_ENABLE || OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_CONFIG_DUA_ENABLE || (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE) #include "thread/dua_manager.hpp" #endif @@ -252,10 +252,10 @@ private: BackboneRouter::Local mBackboneRouterLocal; BackboneRouter::Manager mBackboneRouterManager; #endif -#if OPENTHREAD_CONFIG_MLR_ENABLE || OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_CONFIG_MLR_ENABLE || (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE) MlrManager mMlrManager; #endif -#if OPENTHREAD_CONFIG_DUA_ENABLE || OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_CONFIG_DUA_ENABLE || (OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE) DuaManager mDuaManager; #endif Utils::ChildSupervisor mChildSupervisor; diff --git a/src/core/thread/topology.cpp b/src/core/thread/topology.cpp index cd6995369..60b54653b 100644 --- a/src/core/thread/topology.cpp +++ b/src/core/thread/topology.cpp @@ -217,7 +217,7 @@ void Child::Info::SetFrom(const Child &aChild) mFullThreadDevice = aChild.IsFullThreadDevice(); mFullNetworkData = aChild.IsFullNetworkData(); mIsStateRestoring = aChild.IsStateRestoring(); -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE mIsCslSynced = aChild.IsCslSynchronized(); #else mIsCslSynced = false; @@ -269,7 +269,7 @@ void Child::ClearIp6Addresses(void) { mMeshLocalIid.Clear(); memset(mIp6Address, 0, sizeof(mIp6Address)); -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE mMlrToRegisterMask.Clear(); mMlrRegisteredMask.Clear(); #endif @@ -386,7 +386,7 @@ exit: return retval; } -#if OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE const Ip6::Address *Child::GetDomainUnicastAddress(void) const { const Ip6::Address *addr = nullptr; @@ -411,7 +411,7 @@ void Child::GenerateChallenge(void) IgnoreError(Random::Crypto::FillBuffer(mAttachChallenge, sizeof(mAttachChallenge))); } -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE bool Child::HasMlrRegisteredAddress(const Ip6::Address &aAddress) const { bool has = false; @@ -454,7 +454,7 @@ void Child::SetAddressMlrState(const Ip6::Address &aAddress, MlrState aState) mMlrToRegisterMask.Set(addressIndex, aState == kMlrStateToRegister); mMlrRegisteredMask.Set(addressIndex, aState == kMlrStateRegistered); } -#endif // OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#endif // OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE void Router::Info::SetFrom(const Router &aRouter) { diff --git a/src/core/thread/topology.hpp b/src/core/thread/topology.hpp index 49728ade0..bf7f28724 100644 --- a/src/core/thread/topology.hpp +++ b/src/core/thread/topology.hpp @@ -698,7 +698,7 @@ private: class Child : public Neighbor, public IndirectSender::ChildInfo, public DataPollHandler::ChildInfo -#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE , public CslTxScheduler::ChildInfo #endif @@ -981,7 +981,7 @@ public: */ bool HasIp6Address(const Ip6::Address &aAddress) const; -#if OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_DUA_ENABLE /** * This method retrieves the Domain Unicast Address registered by the child. * @@ -1094,7 +1094,7 @@ public: #endif // #if OPENTHREAD_CONFIG_CHILD_SUPERVISION_ENABLE -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE /** * This method returns MLR state of an Ip6 multicast address. * @@ -1146,7 +1146,7 @@ public: * */ bool HasAnyMlrToRegisterAddress(void) const { return mMlrToRegisterMask.HasAny(); } -#endif // OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#endif // OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE private: #if OPENTHREAD_CONFIG_MLE_IP_ADDRS_PER_CHILD < 2 @@ -1181,7 +1181,7 @@ private: Ip6::Address mIp6Address[kNumIp6Addresses]; ///< Registered IPv6 addresses uint32_t mTimeout; ///< Child timeout -#if OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE +#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_TMF_PROXY_MLR_ENABLE ChildIp6AddressMask mMlrToRegisterMask; ChildIp6AddressMask mMlrRegisteredMask; #endif