espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 12:44:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(ble): ensure ble controller disable safety for ESP32-C2

Browse Source
This commit is contained in:
Zhou Xiao
2025-06-26 17:17:54 +08:00
parent 20da1d9266
commit 87396ab0ce
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/bt/controller/esp32c2/bt.c
View File

@@ -141,7 +141,7 @@ extern void esp_panic_handler_feed_wdts(void);
#endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED #endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
extern int ble_controller_deinit(void); extern int ble_controller_deinit(void);
extern int ble_controller_enable(uint8_t mode); extern int ble_controller_enable(uint8_t mode);
extern int ble_controller_disable(void); extern void ble_controller_disable(void);
extern int esp_register_ext_funcs (struct ext_funcs_t *); extern int esp_register_ext_funcs (struct ext_funcs_t *);
extern void esp_unregister_ext_funcs (void); extern void esp_unregister_ext_funcs (void);
extern int esp_ble_ll_set_public_addr(const uint8_t *addr); extern int esp_ble_ll_set_public_addr(const uint8_t *addr);
@@ -1077,9 +1077,9 @@ esp_err_t esp_bt_controller_disable(void)
ESP_LOGW(NIMBLE_PORT_LOG_TAG, "invalid controller state"); ESP_LOGW(NIMBLE_PORT_LOG_TAG, "invalid controller state");
return ESP_FAIL; return ESP_FAIL;
} }
if (ble_controller_disable() != 0) { ble_controller_status = ESP_BT_CONTROLLER_STATUS_INITED;
return ESP_FAIL;
} ble_controller_disable();
ble_stack_disable(); ble_stack_disable();
if (s_ble_active) { if (s_ble_active) {
esp_phy_disable(PHY_MODEM_BT); esp_phy_disable(PHY_MODEM_BT);
@@ -1091,7 +1091,6 @@ esp_err_t esp_bt_controller_disable(void)
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE
coex_disable(); coex_disable();
#endif #endif
ble_controller_status = ESP_BT_CONTROLLER_STATUS_INITED;
return ESP_OK; return ESP_OK;
} }