Merge branch 'bugfix/btdm_controller_deinit' into 'master'
bt : fix bug that bluetooth controller init/disable/enable/disable may cause exception See merge request idf/esp-idf!2800
This commit is contained in:
commit
b3dd6ff9fc
3 changed files with 21 additions and 22 deletions
|
@ -97,6 +97,7 @@ static void hci_hal_env_init(
|
|||
static void hci_hal_env_deinit(void)
|
||||
{
|
||||
fixed_queue_free(hci_hal_env.rx_q, hci_hal_env.allocator->free);
|
||||
hci_hal_env.rx_q = NULL;
|
||||
}
|
||||
|
||||
static bool hal_open(const hci_hal_callbacks_t *upper_callbacks)
|
||||
|
@ -302,6 +303,10 @@ static int host_recv_pkt_cb(uint8_t *data, uint16_t len)
|
|||
BT_HDR *pkt;
|
||||
size_t pkt_size;
|
||||
|
||||
if (hci_hal_env.rx_q == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
pkt_size = BT_HDR_SIZE + len;
|
||||
pkt = (BT_HDR *)hci_hal_env.allocator->alloc(pkt_size);
|
||||
if (!pkt) {
|
||||
|
|
|
@ -61,9 +61,9 @@
|
|||
/* not for user call, so don't put to include file */
|
||||
extern void btdm_osi_funcs_register(void *osi_funcs);
|
||||
extern int btdm_controller_init(uint32_t config_mask, esp_bt_controller_config_t *config_opts);
|
||||
extern int btdm_controller_deinit(void);
|
||||
extern void btdm_controller_deinit(void);
|
||||
extern int btdm_controller_enable(esp_bt_mode_t mode);
|
||||
extern int btdm_controller_disable(esp_bt_mode_t mode);
|
||||
extern void btdm_controller_disable(void);
|
||||
extern uint8_t btdm_controller_get_mode(void);
|
||||
extern const char *btdm_controller_get_compile_version(void);
|
||||
extern void btdm_rf_bb_init(void);
|
||||
|
@ -921,9 +921,7 @@ esp_err_t esp_bt_controller_deinit(void)
|
|||
return ESP_ERR_INVALID_STATE;
|
||||
}
|
||||
|
||||
if (btdm_controller_deinit() != 0) {
|
||||
return ESP_ERR_NO_MEM;
|
||||
}
|
||||
btdm_controller_deinit();
|
||||
|
||||
periph_module_disable(PERIPH_BT_MODULE);
|
||||
|
||||
|
@ -997,6 +995,9 @@ esp_err_t esp_bt_controller_enable(esp_bt_mode_t mode)
|
|||
esp_modem_sleep_deregister(MODEM_BLE_MODULE);
|
||||
}
|
||||
esp_phy_rf_deinit(PHY_BT_MODULE);
|
||||
#ifdef CONFIG_PM_ENABLE
|
||||
esp_pm_lock_release(s_pm_lock);
|
||||
#endif
|
||||
return ESP_ERR_INVALID_STATE;
|
||||
}
|
||||
|
||||
|
@ -1007,8 +1008,6 @@ esp_err_t esp_bt_controller_enable(esp_bt_mode_t mode)
|
|||
|
||||
esp_err_t esp_bt_controller_disable(void)
|
||||
{
|
||||
int ret;
|
||||
|
||||
if (btdm_controller_status != ESP_BT_CONTROLLER_STATUS_ENABLED) {
|
||||
return ESP_ERR_INVALID_STATE;
|
||||
}
|
||||
|
@ -1024,12 +1023,8 @@ esp_err_t esp_bt_controller_disable(void)
|
|||
}
|
||||
}
|
||||
|
||||
ret = btdm_controller_disable(btdm_controller_get_mode());
|
||||
if (ret < 0) {
|
||||
return ESP_ERR_INVALID_STATE;
|
||||
}
|
||||
btdm_controller_disable();
|
||||
|
||||
if (ret == ESP_BT_MODE_IDLE) {
|
||||
if (btdm_controller_get_sleep_mode() == BTDM_MODEM_SLEEP_MODE_NONE
|
||||
|| btdm_controller_get_sleep_mode() == BTDM_MODEM_SLEEP_MODE_ORIG) {
|
||||
esp_modem_sleep_deregister(MODEM_BLE_MODULE);
|
||||
|
@ -1039,7 +1034,6 @@ esp_err_t esp_bt_controller_disable(void)
|
|||
}
|
||||
esp_phy_rf_deinit(PHY_BT_MODULE);
|
||||
btdm_controller_status = ESP_BT_CONTROLLER_STATUS_INITED;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_ENABLE
|
||||
esp_pm_lock_release(s_pm_lock);
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit e554aab8844208a3660f7c38b189834b0d463592
|
||||
Subproject commit 0a6019ccd3c006b9913712c765cb3f4094baf72f
|
Loading…
Reference in a new issue