espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(coex): fix 802.15.4 external coexistence

Browse Source
This commit is contained in:
Xu Si Yu
2024-09-27 15:44:24 +08:00
parent 87af41852e
commit 683b7b4f07
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_coex/include/esp_coex_i154.h
View File

@ -18,6 +18,8 @@ typedef enum {
void esp_coex_ieee802154_txrx_pti_set(ieee802154_coex_event_t event); void esp_coex_ieee802154_txrx_pti_set(ieee802154_coex_event_t event);
void esp_coex_ieee802154_ack_pti_set(ieee802154_coex_event_t event); void esp_coex_ieee802154_ack_pti_set(ieee802154_coex_event_t event);
void esp_coex_ieee802154_coex_break_notify(void); void esp_coex_ieee802154_coex_break_notify(void);
void esp_coex_ieee802154_extcoex_tx_stage(void);
void esp_coex_ieee802154_extcoex_rx_stage(void);
#endif #endif
#endif #endif

2
components/esp_coex/lib

Submodule components/esp_coex/lib updated: d8ec938fcb...7953ba459a

20
components/ieee802154/driver/esp_ieee802154_dev.c
View File

@ -341,8 +341,23 @@ IEEE802154_NOINLINE IEEE802154_STATIC bool stop_current_operation(void)
return true; return true;
} }
FORCE_INLINE_ATTR void extcoex_tx_stage_start(void)
{
#if CONFIG_ESP_COEX_EXTERNAL_COEXIST_ENABLE
esp_coex_ieee802154_extcoex_tx_stage();
#endif
}
FORCE_INLINE_ATTR void extcoex_rx_stage_start(void)
{
#if CONFIG_ESP_COEX_EXTERNAL_COEXIST_ENABLE
esp_coex_ieee802154_extcoex_rx_stage();
#endif
}
static void enable_rx(void) static void enable_rx(void)
{ {
extcoex_rx_stage_start();
set_next_rx_buffer(); set_next_rx_buffer();
IEEE802154_SET_TXRX_PTI(IEEE802154_SCENE_RX); IEEE802154_SET_TXRX_PTI(IEEE802154_SCENE_RX);
@ -403,6 +418,7 @@ static IRAM_ATTR void isr_handle_tx_done(void)
NEEDS_NEXT_OPT(true); NEEDS_NEXT_OPT(true);
} else if (s_ieee802154_state == IEEE802154_STATE_TX || s_ieee802154_state == IEEE802154_STATE_TX_CCA) { } else if (s_ieee802154_state == IEEE802154_STATE_TX || s_ieee802154_state == IEEE802154_STATE_TX_CCA) {
if (ieee802154_frame_is_ack_required(s_tx_frame) && ieee802154_ll_get_rx_auto_ack()) { if (ieee802154_frame_is_ack_required(s_tx_frame) && ieee802154_ll_get_rx_auto_ack()) {
extcoex_rx_stage_start();
ieee802154_set_state(IEEE802154_STATE_RX_ACK); ieee802154_set_state(IEEE802154_STATE_RX_ACK);
#if !CONFIG_IEEE802154_TEST #if !CONFIG_IEEE802154_TEST
receive_ack_timeout_timer_start(200000); // 200ms for receive ack timeout receive_ack_timeout_timer_start(200000); // 200ms for receive ack timeout
@ -423,6 +439,7 @@ static IRAM_ATTR void isr_handle_rx_done(void)
if (s_ieee802154_state == IEEE802154_STATE_RX) { if (s_ieee802154_state == IEEE802154_STATE_RX) {
if (ieee802154_frame_is_ack_required(s_rx_frame[s_rx_index]) && ieee802154_frame_get_version(s_rx_frame[s_rx_index]) <= IEEE802154_FRAME_VERSION_1 if (ieee802154_frame_is_ack_required(s_rx_frame[s_rx_index]) && ieee802154_frame_get_version(s_rx_frame[s_rx_index]) <= IEEE802154_FRAME_VERSION_1
&& ieee802154_ll_get_tx_auto_ack()) { && ieee802154_ll_get_tx_auto_ack()) {
extcoex_tx_stage_start();
// auto tx ack only works for the frame with version 0b00 and 0b01 // auto tx ack only works for the frame with version 0b00 and 0b01
s_rx_frame_info[s_rx_index].pending = ieee802154_ack_config_pending_bit(s_rx_frame[s_rx_index]); s_rx_frame_info[s_rx_index].pending = ieee802154_ack_config_pending_bit(s_rx_frame[s_rx_index]);
ieee802154_set_state(IEEE802154_STATE_TX_ACK); ieee802154_set_state(IEEE802154_STATE_TX_ACK);
@ -432,6 +449,7 @@ static IRAM_ATTR void isr_handle_rx_done(void)
s_rx_frame_info[s_rx_index].pending = ieee802154_ack_config_pending_bit(s_rx_frame[s_rx_index]); s_rx_frame_info[s_rx_index].pending = ieee802154_ack_config_pending_bit(s_rx_frame[s_rx_index]);
// For 2015 enh-ack, SW should generate an enh-ack then send it manually // For 2015 enh-ack, SW should generate an enh-ack then send it manually
if (esp_ieee802154_enh_ack_generator(s_rx_frame[s_rx_index], &s_rx_frame_info[s_rx_index], s_enh_ack_frame) == ESP_OK) { if (esp_ieee802154_enh_ack_generator(s_rx_frame[s_rx_index], &s_rx_frame_info[s_rx_index], s_enh_ack_frame) == ESP_OK) {
extcoex_tx_stage_start();
#if !CONFIG_IEEE802154_TEST #if !CONFIG_IEEE802154_TEST
// Send the Enh-Ack frame if generator succeeds. // Send the Enh-Ack frame if generator succeeds.
ieee802154_ll_set_tx_addr(s_enh_ack_frame); ieee802154_ll_set_tx_addr(s_enh_ack_frame);
@ -456,6 +474,7 @@ static IRAM_ATTR void isr_handle_rx_done(void)
static IRAM_ATTR void isr_handle_ack_tx_done(void) static IRAM_ATTR void isr_handle_ack_tx_done(void)
{ {
extcoex_rx_stage_start();
ieee802154_receive_done((uint8_t *)s_rx_frame[s_rx_index], &s_rx_frame_info[s_rx_index]); ieee802154_receive_done((uint8_t *)s_rx_frame[s_rx_index], &s_rx_frame_info[s_rx_index]);
NEEDS_NEXT_OPT(true); NEEDS_NEXT_OPT(true);
} }
@ -832,6 +851,7 @@ IEEE802154_STATIC void tx_init(const uint8_t *frame)
// set rx pointer for ack frame // set rx pointer for ack frame
set_next_rx_buffer(); set_next_rx_buffer();
} }
extcoex_tx_stage_start();
} }
static inline esp_err_t ieee802154_transmit_internal(const uint8_t *frame, bool cca) static inline esp_err_t ieee802154_transmit_internal(const uint8_t *frame, bool cca)