feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Fixed some memory was not released after bluetooth controller initialization failed on ESP32

Browse Source
This commit is contained in:
zwj
2022-12-07 11:37:22 +08:00
parent dfa9a81233
commit 5fff471b50
2 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
components/bt/controller/esp32/bt.c
View File

@ -325,6 +325,7 @@ static void *customer_queue_create_hlevel_wrapper(uint32_t queue_len, uint32_t i
#endif /* CONFIG_BTDM_CTRL_HLI */ #endif /* CONFIG_BTDM_CTRL_HLI */
static void interrupt_l3_disable(void); static void interrupt_l3_disable(void);
static void interrupt_l3_restore(void); static void interrupt_l3_restore(void);
static void bt_controller_deinit_internal(void);
/* Local variable definition /* Local variable definition
*************************************************************************** ***************************************************************************
@ -1576,26 +1577,9 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
return ESP_OK; return ESP_OK;
error: error:
#ifdef CONFIG_PM_ENABLE
if (!s_btdm_allow_light_sleep) { bt_controller_deinit_internal();
if (s_light_sleep_pm_lock != NULL) {
esp_pm_lock_delete(s_light_sleep_pm_lock);
s_light_sleep_pm_lock = NULL;
}
}
if (s_pm_lock != NULL) {
esp_pm_lock_delete(s_pm_lock);
s_pm_lock = NULL;
}
if (s_btdm_slp_tmr != NULL) {
esp_timer_delete(s_btdm_slp_tmr);
s_btdm_slp_tmr = NULL;
}
#endif
if (s_wakeup_req_sem) {
semphr_delete_wrapper(s_wakeup_req_sem);
s_wakeup_req_sem = NULL;
}
return err; return err;
} }
@ -1607,6 +1591,13 @@ esp_err_t esp_bt_controller_deinit(void)
btdm_controller_deinit(); btdm_controller_deinit();
bt_controller_deinit_internal();
return ESP_OK;
}
static void bt_controller_deinit_internal(void)
{
periph_module_disable(PERIPH_BT_MODULE); periph_module_disable(PERIPH_BT_MODULE);
#ifdef CONFIG_PM_ENABLE #ifdef CONFIG_PM_ENABLE
@ -1628,11 +1619,16 @@ esp_err_t esp_bt_controller_deinit(void)
s_pm_lock_acquired = false; s_pm_lock_acquired = false;
#endif #endif
semphr_delete_wrapper(s_wakeup_req_sem);
s_wakeup_req_sem = NULL;
free(osi_funcs_p); if (s_wakeup_req_sem) {
osi_funcs_p = NULL; semphr_delete_wrapper(s_wakeup_req_sem);
s_wakeup_req_sem = NULL;
}
if (osi_funcs_p) {
free(osi_funcs_p);
osi_funcs_p = NULL;
}
btdm_controller_status = ESP_BT_CONTROLLER_STATUS_IDLE; btdm_controller_status = ESP_BT_CONTROLLER_STATUS_IDLE;
@ -1642,8 +1638,6 @@ esp_err_t esp_bt_controller_deinit(void)
esp_bt_power_domain_off(); esp_bt_power_domain_off();
esp_phy_modem_deinit(); esp_phy_modem_deinit();
return ESP_OK;
} }
static void bt_controller_shutdown(void* arg) static void bt_controller_shutdown(void* arg)

2
components/bt/controller/lib_esp32

Submodule components/bt/controller/lib_esp32 updated: dbaeb136ca...9c5686aaa3