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

Merge branch 'bugfix/wifi_sta_and_ble_disconnect_BCI-303_v4.3' into 'release/v4.3'

Browse Source 
component_bt: Fix wifi is initialized before bluetooth initialization, bluetooth can't stay connected(v4.3)

See merge request espressif/esp-idf!19001
This commit is contained in:
Jiang Jiang Jian
2022-07-13 11:00:23 +08:00
parent 971e3b139b 5cf696a714
commit 47c20c4294
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/controller/esp32c3/bt.c
View File

@ -234,6 +234,7 @@ extern int ble_txpwr_get(int power_type);
extern uint16_t l2c_ble_link_get_tx_buf_num(void); extern uint16_t l2c_ble_link_get_tx_buf_num(void);
extern int coex_core_ble_conn_dyn_prio_get(bool *low, bool *high); extern int coex_core_ble_conn_dyn_prio_get(bool *low, bool *high);
extern void coex_pti_v2(void);
extern bool btdm_deep_sleep_mem_init(void); extern bool btdm_deep_sleep_mem_init(void);
extern void btdm_deep_sleep_mem_deinit(void); extern void btdm_deep_sleep_mem_deinit(void);
@ -1127,6 +1128,7 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
err = ESP_ERR_NO_MEM; err = ESP_ERR_NO_MEM;
goto error; goto error;
} }
coex_pti_v2();
btdm_controller_status = ESP_BT_CONTROLLER_STATUS_INITED; btdm_controller_status = ESP_BT_CONTROLLER_STATUS_INITED;

2
components/bt/controller/esp32s3/bt.c
View File

@ -196,6 +196,7 @@ extern int API_vhci_host_register_callback(const vhci_host_callback_t *callback)
extern int ble_txpwr_set(int power_type, int power_level); extern int ble_txpwr_set(int power_type, int power_level);
extern int ble_txpwr_get(int power_type); extern int ble_txpwr_get(int power_type);
extern void coex_pti_v2(void);
extern uint16_t l2c_ble_link_get_tx_buf_num(void); extern uint16_t l2c_ble_link_get_tx_buf_num(void);
extern char _bss_start_btdm; extern char _bss_start_btdm;
@ -1019,6 +1020,7 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
err = ESP_ERR_NO_MEM; err = ESP_ERR_NO_MEM;
goto error; goto error;
} }
coex_pti_v2();
btdm_controller_status = ESP_BT_CONTROLLER_STATUS_INITED; btdm_controller_status = ESP_BT_CONTROLLER_STATUS_INITED;

6
components/esp_wifi/src/phy_init.c
View File

@ -255,12 +255,6 @@ void esp_phy_enable(void)
#if CONFIG_IDF_TARGET_ESP32 #if CONFIG_IDF_TARGET_ESP32
coex_bt_high_prio(); coex_bt_high_prio();
#endif #endif
#if CONFIG_BT_ENABLED && (CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3)
extern void coex_pti_v2(void);
coex_pti_v2();
#endif
} }
s_phy_access_ref++; s_phy_access_ref++;