Skip to content

Update revision of nrf_802154 #1885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 21, 2025
Merged

Update revision of nrf_802154 #1885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions nrf_802154/driver/src/mac_features/nrf_802154_csma_ca.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,15 @@ static bool csma_ca_can_abort(nrf_802154_term_t term_lvl,
return result;
}

static void csma_ca_finish_failed(uint8_t * p_frame,
nrf_802154_tx_error_t error,
const nrf_802154_transmit_done_metadata_t * p_metadata)
{
nrf_802154_sl_atomic_store_u8((uint8_t *)&m_state, CSMA_CA_STATE_IDLE);
nrf_802154_frame_parser_data_clear(&m_frame);
nrf_802154_notify_transmit_failed(p_frame, error, p_metadata);
}

static void csma_ca_failed(uint8_t * p_frame,
nrf_802154_tx_error_t error,
const nrf_802154_transmit_done_metadata_t * p_metadata,
Expand All @@ -396,18 +405,12 @@ static void csma_ca_failed(uint8_t * p_frame,
case NRF_802154_TX_ERROR_TIMESLOT_ENDED:
if (channel_busy())
{
nrf_802154_sl_atomic_store_u8((uint8_t *)&m_state, CSMA_CA_STATE_IDLE);
nrf_802154_frame_parser_data_clear(&m_frame);
nrf_802154_notify_transmit_failed(p_frame,
NRF_802154_TX_ERROR_BUSY_CHANNEL,
p_metadata);
csma_ca_finish_failed(p_frame, error, p_metadata);
}
break;

default:
nrf_802154_sl_atomic_store_u8((uint8_t *)&m_state, CSMA_CA_STATE_IDLE);
nrf_802154_frame_parser_data_clear(&m_frame);
nrf_802154_notify_transmit_failed(p_frame, error, p_metadata);
csma_ca_finish_failed(p_frame, error, p_metadata);
break;
}

Expand Down
5 changes: 5 additions & 0 deletions nrf_802154/driver/src/nrf_802154_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2777,6 +2777,11 @@ nrf_802154_tx_error_t nrf_802154_core_transmit(nrf_802154_term_t te
if (result)
{
result = current_operation_terminate(term_lvl, req_orig, true);

if (!result)
{
error = NRF_802154_TX_ERROR_BUSY_CHANNEL;
}
}

if (result)
Expand Down