Merge branch 'bugfix/coex_fix_wifi_scan_and_connect_bugs_v3.3' into 'release/v3.3'

esp_wifi: fix WiFi scan and connect bugs when coexist with Bluetooth (backport v3.3)

See merge request espressif/esp-idf!6707
This commit is contained in:
Jiang Jiang Jian 2019-12-04 14:57:09 +08:00
commit 50737018cc
3 changed files with 10 additions and 1 deletions

View File

@ -421,6 +421,7 @@ void start_cpu0_default(void)
#if CONFIG_SW_COEXIST_ENABLE
esp_coex_adapter_register(&g_coex_adapter_funcs);
coex_pre_init();
#endif
bootloader_flash_update_id();

View File

@ -31,6 +31,14 @@ typedef enum {
typedef void (* coex_func_cb_t)(uint32_t event, int sched_cnt);
/**
* @brief Pre-Init software coexist
* extern function for internal use.
*
* @return Init ok or failed.
*/
esp_err_t coex_pre_init(void);
/**
* @brief Init software coexist
* extern function for internal use.

@ -1 +1 @@
Subproject commit fd85a826728dc41dc357263ca38e3341abd6949f
Subproject commit f50b25d69a3b04d70acf249705382a6b57f81954