mirror of
https://github.com/espressif/esp-idf.git
synced 2026-10-01 18:50:34 +03:00
Merge branch 'feat/configure_related_154_regs_when_enable_coex' into 'master'
fix(coex): move 15.4 register configuration to 15.4 init Closes WIFI-7364 See merge request espressif/esp-idf!48956
This commit is contained in:
@@ -1,11 +1,13 @@
|
|||||||
/*
|
/*
|
||||||
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
|
* SPDX-FileCopyrightText: 2023-2026 Espressif Systems (Shanghai) CO LTD
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
#ifndef __COEXIST_I154_H__
|
#ifndef __COEXIST_I154_H__
|
||||||
#define __COEXIST_I154_H__
|
#define __COEXIST_I154_H__
|
||||||
|
|
||||||
|
#include <stdbool.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief 802.15.4 coex event
|
* @brief 802.15.4 coex event
|
||||||
*/
|
*/
|
||||||
@@ -63,4 +65,10 @@ void esp_coex_ieee802154_status_enable(void);
|
|||||||
*/
|
*/
|
||||||
void esp_coex_ieee802154_status_disable(void);
|
void esp_coex_ieee802154_status_disable(void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Configure the 802.15.4 force Rx state
|
||||||
|
* @param enable true to enable, false to disable
|
||||||
|
*/
|
||||||
|
void esp_coex_ieee802154_force_rx_enable(bool enable);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
+1
-1
Submodule components/esp_coex/lib updated: 3c490f8059...c7211ee903
@@ -925,12 +925,19 @@ esp_err_t ieee802154_mac_init(void)
|
|||||||
|
|
||||||
ESP_RETURN_ON_FALSE(ieee802154_sleep_init() == ESP_OK, ESP_FAIL, IEEE802154_TAG, "IEEE802154 MAC sleep init failed");
|
ESP_RETURN_ON_FALSE(ieee802154_sleep_init() == ESP_OK, ESP_FAIL, IEEE802154_TAG, "IEEE802154 MAC sleep init failed");
|
||||||
|
|
||||||
|
#if CONFIG_ESP_COEX_EXTERNAL_COEXIST_ENABLE
|
||||||
|
esp_coex_ieee802154_force_rx_enable(true);
|
||||||
|
#endif
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
esp_err_t ieee802154_mac_deinit(void)
|
esp_err_t ieee802154_mac_deinit(void)
|
||||||
{
|
{
|
||||||
esp_err_t ret = ESP_OK;
|
esp_err_t ret = ESP_OK;
|
||||||
|
#if CONFIG_ESP_COEX_EXTERNAL_COEXIST_ENABLE
|
||||||
|
esp_coex_ieee802154_force_rx_enable(false);
|
||||||
|
#endif
|
||||||
if (s_ieee802154_isr_handle) {
|
if (s_ieee802154_isr_handle) {
|
||||||
ret = esp_intr_free(s_ieee802154_isr_handle);
|
ret = esp_intr_free(s_ieee802154_isr_handle);
|
||||||
s_ieee802154_isr_handle = NULL;
|
s_ieee802154_isr_handle = NULL;
|
||||||
|
|||||||
Reference in New Issue
Block a user