espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-19 08:59:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[mac] remove disable CSMA-CA on the last transmit (#4765)

Browse Source
This commit is contained in:
Yakun Xu
2020-04-01 18:09:22 -07:00
committed by GitHub
parent ff5a3e0737
commit bac6d8c85d
3 changed files with 5 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/config/mac.h
-10
View File
@@ -172,16 +172,6 @@
#define OPENTHREAD_CONFIG_MAC_TX_NUM_BCAST 1
#endif
/**
* @def OPENTHREAD_CONFIG_MAC_DISABLE_CSMA_CA_ON_LAST_ATTEMPT
*
* Define as 1 to disable CSMA-CA on the last transmit attempt.
*
*/
#ifndef OPENTHREAD_CONFIG_MAC_DISABLE_CSMA_CA_ON_LAST_ATTEMPT
#define OPENTHREAD_CONFIG_MAC_DISABLE_CSMA_CA_ON_LAST_ATTEMPT 0
#endif
/**
* @def OPENTHREAD_CONFIG_MAC_STAY_AWAKE_BETWEEN_FRAGMENTS
*
src/core/config/openthread-core-config-check.h
+4 -7
View File
@@ -59,9 +59,11 @@
*
*/
#ifdef OPENTHREAD_CONFIG_DISABLE_CCA_ON_LAST_ATTEMPT
#if defined(OPENTHREAD_CONFIG_DISABLE_CCA_ON_LAST_ATTEMPT) || \
defined(OPENTHREAD_CONFIG_DISABLE_CSMA_CA_ON_LAST_ATTEMPT) || \
defined(OPENTHREAD_CONFIG_MAC_DISABLE_CSMA_CA_ON_LAST_ATTEMPT)
#error \
"OPENTHREAD_CONFIG_DISABLE_CCA_ON_LAST_ATTEMPT was replaced by OPENTHREAD_CONFIG_MAC_DISABLE_CSMA_CA_ON_LAST_ATTEMPT."
"OPENTHREAD_CONFIG_DISABLE_CCA_ON_LAST_ATTEMPT, OPENTHREAD_CONFIG_DISABLE_CSMA_CA_ON_LAST_ATTEMPT and OPENTHREAD_CONFIG_MAC_DISABLE_CSMA_CA_ON_LAST_ATTEMPT were removed."
#endif
#ifdef OPENTHREAD_CONFIG_MAX_TX_ATTEMPTS_DIRECT
@@ -394,11 +396,6 @@
#error "OPENTHREAD_CONFIG_ENABLE_DYNAMIC_MPL_INTERVAL was replaced by OPENTHREAD_CONFIG_MPL_DYNAMIC_INTERVAL_ENABLE."
#endif
#ifdef OPENTHREAD_CONFIG_DISABLE_CSMA_CA_ON_LAST_ATTEMPT
#error \
"OPENTHREAD_CONFIG_DISABLE_CSMA_CA_ON_LAST_ATTEMPT was replaced by OPENTHREAD_CONFIG_MAC_DISABLE_CSMA_CA_ON_LAST_ATTEMPT."
#endif
#ifdef OPENTHREAD_CONFIG_ENABLE_LONG_ROUTES
#error "OPENTHREAD_CONFIG_ENABLE_LONG_ROUTES was replaced by OPENTHREAD_CONFIG_MLE_LONG_ROUTES_ENABLE."
#endif
src/core/mac/sub_mac.cpp
+1 -18
View File
@@ -231,14 +231,6 @@ void SubMac::StartCsmaBackoff(void)
VerifyOrExit(ShouldHandleCsmaBackOff(), BeginTransmit());
#if OPENTHREAD_CONFIG_MAC_DISABLE_CSMA_CA_ON_LAST_ATTEMPT
if ((mTransmitRetries > 0) && (mTransmitRetries == mTransmitFrame.GetMaxFrameRetries()))
{
BeginTransmit();
ExitNow();
}
#endif
if (backoffExponent > kMaxBE)
{
backoffExponent = kMaxBE;
@@ -274,16 +266,7 @@ void SubMac::BeginTransmit(void)
VerifyOrExit(mState == kStateCsmaBackoff);
#if OPENTHREAD_CONFIG_MAC_DISABLE_CSMA_CA_ON_LAST_ATTEMPT
if ((mTransmitRetries > 0) && (mTransmitRetries == mTransmitFrame.GetMaxFrameRetries()))
{
mTransmitFrame.SetCsmaCaEnabled(false);
}
else
#endif
{
mTransmitFrame.SetCsmaCaEnabled(true);
}
mTransmitFrame.SetCsmaCaEnabled(true);
if ((mRadioCaps & OT_RADIO_CAPS_SLEEP_TO_TX) == 0)
{