espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-10 04:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[nrf52840] fix race condition when reporting channel busy event (#2700)

Browse Source 
Signed-off-by: Duda, Lukasz <[email protected]>
This commit is contained in:
Łukasz Duda
2018-05-15 08:42:42 -07:00
committed by Jonathan Hui
parent 733d461d25
commit 0824818646
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/platforms/nrf52840/radio.c
+10 -14
View File
@@ -157,10 +157,6 @@ static inline void clearPendingEvents(void)
volatile uint32_t pendingEvents;
uint32_t bitsToRemain = ~(0UL);
bitsToRemain &= ~(1UL << kPendingEventFrameTransmitted);
bitsToRemain &= ~(1UL << kPendingEventChannelAccessFailure);
bitsToRemain &= ~(1UL << kPendingEventInvalidOrNoAck);
bitsToRemain &= ~(1UL << kPendingEventSleep);
do
@@ -548,6 +544,8 @@ void nrf5RadioProcess(otInstance *aInstance)
if (isPendingEventSet(kPendingEventFrameTransmitted))
{
resetPendingEvent(kPendingEventFrameTransmitted);
#if OPENTHREAD_ENABLE_DIAG
if (otPlatDiagModeGet())
@@ -566,12 +564,12 @@ void nrf5RadioProcess(otInstance *aInstance)
nrf_802154_buffer_free_raw(sAckFrame.mPsdu - 1);
sAckFrame.mPsdu = NULL;
}
resetPendingEvent(kPendingEventFrameTransmitted);
}
if (isPendingEventSet(kPendingEventChannelAccessFailure))
{
resetPendingEvent(kPendingEventChannelAccessFailure);
#if OPENTHREAD_ENABLE_DIAG
if (otPlatDiagModeGet())
@@ -583,12 +581,12 @@ void nrf5RadioProcess(otInstance *aInstance)
{
otPlatRadioTxDone(aInstance, &sTransmitFrame, NULL, OT_ERROR_CHANNEL_ACCESS_FAILURE);
}
resetPendingEvent(kPendingEventChannelAccessFailure);
}
if (isPendingEventSet(kPendingEventInvalidOrNoAck))
{
resetPendingEvent(kPendingEventInvalidOrNoAck);
#if OPENTHREAD_ENABLE_DIAG
if (otPlatDiagModeGet())
@@ -600,12 +598,12 @@ void nrf5RadioProcess(otInstance *aInstance)
{
otPlatRadioTxDone(aInstance, &sTransmitFrame, NULL, OT_ERROR_NO_ACK);
}
resetPendingEvent(kPendingEventInvalidOrNoAck);
}
if (isPendingEventSet(kPendingEventReceiveFailed))
{
resetPendingEvent(kPendingEventReceiveFailed);
#if OPENTHREAD_ENABLE_DIAG
if (otPlatDiagModeGet())
@@ -617,15 +615,13 @@ void nrf5RadioProcess(otInstance *aInstance)
{
otPlatRadioReceiveDone(aInstance, NULL, sReceiveError);
}
resetPendingEvent(kPendingEventReceiveFailed);
}
if (isPendingEventSet(kPendingEventEnergyDetected))
{
otPlatRadioEnergyScanDone(aInstance, sEnergyDetected);
resetPendingEvent(kPendingEventEnergyDetected);
otPlatRadioEnergyScanDone(aInstance, sEnergyDetected);
}
if (isPendingEventSet(kPendingEventSleep))