Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 03:00:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_some_s31_coex_iso_issues' into 'master'

Browse Source 
fix(coex): fix some s31 coex iso issues

See merge request espressif/esp-idf!48508
This commit is contained in:
Jiang Jiang Jian
2026-05-14 20:32:04 +08:00
parent 31a70d6a36 d11192503b
commit 0ccf6a6a7b
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_coex/include/private/esp_coexist_internal.h
+2 -10
View File
@@ -325,15 +325,7 @@ int coex_schm_register_callback(coex_schm_callback_type_t type, void *callback);
*/
esp_err_t esp_coex_adapter_register(coex_adapter_funcs_t *funcs);
#if CONFIG_COEX_ISO_INT_SCHEME
/**
* @brief Register coexistence dynamic log functions.
*
* @param funcs : coexistence dynamic log functions
* @return : ESP_OK - success, other - failed
*/
esp_err_t esp_coex_dynamic_log_register(void *funcs);
#if SOC_BLE_ISO_SUPPORTED
/**
* @brief Register coexistence iso end wifi callback function.
*
@@ -342,7 +334,7 @@ esp_err_t esp_coex_dynamic_log_register(void *funcs);
* @return : ESP_OK - success, other - failed
*/
esp_err_t esp_coex_configure_iso_end_wifi_cb(bool is_reg, void *funcs);
#endif /* CONFIG_COEX_ISO_INT_SCHEME */
#endif /* SOC_BLE_ISO_SUPPORTED */
#if CONFIG_EXTERNAL_COEX_ENABLE
/**
components/esp_wifi/esp32s31/esp_adapter.c
+1 -1
View File
@@ -621,7 +621,7 @@ static void * coex_schm_get_phase_by_idx_wrapper(int phase_idx)
static int coex_configure_preemption_end_cb_wrapper(bool is_register, int(*cb)(uint32_t))
{
#if CONFIG_SW_COEXIST_ENABLE && CONFIG_COEX_ISO_INT_SCHEME
#if CONFIG_SW_COEXIST_ENABLE && SOC_BLE_ISO_SUPPORTED
return esp_coex_configure_iso_end_wifi_cb(is_register, cb);
#else
return 0;