mirror of
https://github.com/espressif/esp-idf.git
synced 2024-09-20 00:36:01 -04:00
Merge branch 'bugfix/wifi_sta_and_ble_disconnect_BCI-303_master' into 'master'
component_bt: Fix wifi is initialized before bluetooth initialization, bluetooth can't stay connected Closes BCI-303 See merge request espressif/esp-idf!18643
This commit is contained in:
commit
9ec829f352
@ -235,6 +235,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);
|
||||||
@ -1126,6 +1127,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;
|
||||||
|
|
||||||
|
@ -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);
|
||||||
@ -1094,6 +1095,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;
|
||||||
|
|
||||||
|
@ -248,12 +248,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++;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user