kopia lustrzana https://github.com/espressif/esp-idf
Merge branch 'bugfix/fix_crash_when_shutdown_bt' into 'master'
component/bt: fix crash when shutdown bt See merge request espressif/esp-idf!15705pull/7855/head
commit
579aa4bd90
|
@ -239,6 +239,8 @@ extern uint8_t coex_schm_curr_period_get(void);
|
||||||
extern void * coex_schm_curr_phase_get(void);
|
extern void * coex_schm_curr_phase_get(void);
|
||||||
extern int coex_wifi_channel_get(uint8_t *primary, uint8_t *secondary);
|
extern int coex_wifi_channel_get(uint8_t *primary, uint8_t *secondary);
|
||||||
extern int coex_register_wifi_channel_change_callback(void *cb);
|
extern int coex_register_wifi_channel_change_callback(void *cb);
|
||||||
|
/* Shutdown */
|
||||||
|
extern void esp_bt_controller_shutdown(void);
|
||||||
|
|
||||||
extern char _bss_start_btdm;
|
extern char _bss_start_btdm;
|
||||||
extern char _bss_end_btdm;
|
extern char _bss_end_btdm;
|
||||||
|
@ -1787,13 +1789,13 @@ esp_err_t esp_bt_controller_deinit(void)
|
||||||
|
|
||||||
static void bt_shutdown(void)
|
static void bt_shutdown(void)
|
||||||
{
|
{
|
||||||
esp_err_t ret = ESP_OK;
|
if (btdm_controller_status != ESP_BT_CONTROLLER_STATUS_ENABLED) {
|
||||||
ESP_LOGD(BTDM_LOG_TAG, "stop Bluetooth");
|
return;
|
||||||
|
|
||||||
ret = esp_bt_controller_disable();
|
|
||||||
if (ESP_OK != ret) {
|
|
||||||
ESP_LOGW(BTDM_LOG_TAG, "controller disable ret=%d", ret);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
esp_bt_controller_shutdown();
|
||||||
|
esp_phy_disable();
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit f26e741554f70f0fe0621924c26e89fb9ee8f765
|
Subproject commit fe048744fce335ab75777f4a386885faf4acc250
|
Ładowanie…
Reference in New Issue