diff --git a/src/core/mac/mac_links.hpp b/src/core/mac/mac_links.hpp index 1b333a7c2..6f8d44019 100644 --- a/src/core/mac/mac_links.hpp +++ b/src/core/mac/mac_links.hpp @@ -171,15 +171,11 @@ public: mTxFrame802154.SetIsSecurityProcessed(false); mTxFrame802154.SetCsmaCaEnabled(true); // Set to true by default, only set to `false` for CSL transmission mTxFrame802154.SetIsHeaderUpdated(false); -#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE mTxFrame802154.SetTxDelay(0); mTxFrame802154.SetTxDelayBaseTime(0); -#endif mTxFrame802154.SetTxPower(Radio::kInvalidPower); -#if OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE mTxFrame802154.SetCslIePresent(false); #endif -#endif #if OPENTHREAD_CONFIG_RADIO_LINK_TREL_ENABLE mTxFrameTrel.SetLength(0); mTxFrameTrel.SetIsARetransmission(false); diff --git a/src/core/mac/sub_mac.cpp b/src/core/mac/sub_mac.cpp index bb8bfbac3..446a0368e 100644 --- a/src/core/mac/sub_mac.cpp +++ b/src/core/mac/sub_mac.cpp @@ -293,7 +293,7 @@ Error SubMac::Send(void) { case kStateDisabled: case kStateCsmaBackoff: -#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE case kStateCslTransmit: #endif case kStateTransmit: @@ -390,7 +390,7 @@ exit: void SubMac::StartCsmaBackoff(void) { -#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE if (mTransmitFrame.GetTxDelay() != 0 || mTransmitFrame.GetTxDelayBaseTime() != 0) { SetState(kStateCslTransmit); @@ -417,7 +417,7 @@ void SubMac::StartCsmaBackoff(void) BeginTransmit(); ExitNow(); } -#endif // !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#endif // OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE SetState(kStateCsmaBackoff); @@ -466,7 +466,7 @@ void SubMac::BeginTransmit(void) { Error error; -#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE VerifyOrExit(mState == kStateCsmaBackoff || mState == kStateCslTransmit); #else VerifyOrExit(mState == kStateCsmaBackoff); @@ -712,7 +712,7 @@ Error SubMac::EnergyScan(uint8_t aScanChannel, uint16_t aScanDuration) case kStateDisabled: case kStateCsmaBackoff: case kStateTransmit: -#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE case kStateCslTransmit: #endif #if OPENTHREAD_CONFIG_MAC_ADD_DELAY_ON_NO_ACK_ERROR_BEFORE_RETRY @@ -794,7 +794,7 @@ void SubMac::HandleTimer(void) { switch (mState) { -#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE case kStateCslTransmit: BeginTransmit(); break; @@ -1084,7 +1084,7 @@ const char *SubMac::StateToString(State aState) #define DelayBeforeRetxStateMapList(_) #endif -#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE #define CslTxStateMapList(_) _(kStateCslTransmit, "CslTransmit") #else #define CslTxStateMapList(_) diff --git a/src/core/mac/sub_mac.hpp b/src/core/mac/sub_mac.hpp index 5c12a3aad..b418b4b7a 100644 --- a/src/core/mac/sub_mac.hpp +++ b/src/core/mac/sub_mac.hpp @@ -538,7 +538,7 @@ private: #if OPENTHREAD_CONFIG_MAC_ADD_DELAY_ON_NO_ACK_ERROR_BEFORE_RETRY kStateDelayBeforeRetx, // Delay before retx #endif -#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE kStateCslTransmit, // CSL transmission. #endif #if OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE || OPENTHREAD_CONFIG_WAKEUP_END_DEVICE_ENABLE diff --git a/src/core/radio/radio_callbacks.cpp b/src/core/radio/radio_callbacks.cpp index 93cbbf1a8..6fc807d6a 100644 --- a/src/core/radio/radio_callbacks.cpp +++ b/src/core/radio/radio_callbacks.cpp @@ -60,7 +60,7 @@ void Callbacks::HandleEnergyScanDone(int8_t aMaxRssi) { Get().Handl void Callbacks::HandleBusLatencyChanged(void) { -#if OPENTHREAD_FTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE && (OPENTHREAD_FTD || OPENTHREAD_MTD) Get().HandleRadioBusLatencyChanged(); #endif #if OPENTHREAD_FTD && OPENTHREAD_CONFIG_WAKEUP_COORDINATOR_ENABLE diff --git a/src/lib/spinel/radio_spinel.cpp b/src/lib/spinel/radio_spinel.cpp index b667ca42c..ba35f98fd 100644 --- a/src/lib/spinel/radio_spinel.cpp +++ b/src/lib/spinel/radio_spinel.cpp @@ -1642,7 +1642,7 @@ otError RadioSpinel::Transmit(otRadioFrame &aFrame) uint32_t transmitDelay = 0; // If supported, add a delay and transmit the network time at a precise moment -#if !OPENTHREAD_MTD && OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE +#if OPENTHREAD_CONFIG_MAC_CSL_TRANSMITTER_ENABLE transmitDelay = kTxWaitUs / 10; mTransmitFrame->mInfo.mTxInfo.mTxDelayBaseTime = static_cast(netRadioTime); mTransmitFrame->mInfo.mTxInfo.mTxDelay = transmitDelay;