From 62a4a0dcaf1beadfb56ac31533a7f32db8869dd4 Mon Sep 17 00:00:00 2001 From: baohongde Date: Wed, 2 Jun 2021 14:44:09 +0800 Subject: [PATCH] Delete the option BLE ADV priority high Fix controller task watchdog in Wi-Fi test --- components/bt/Kconfig | 15 --------------- components/bt/bt.c | 7 ------- components/bt/lib | 2 +- 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/components/bt/Kconfig b/components/bt/Kconfig index 59daad3048..4909ecc970 100644 --- a/components/bt/Kconfig +++ b/components/bt/Kconfig @@ -342,21 +342,6 @@ menu Bluetooth If you set `BLE_ADV_REPORT_DISCARD_THRSHOLD` to a small value or printf every adv lost event, it may cause adv packets lost more. - menuconfig BTDM_COEX_BT_OPTIONS - bool "Coexistence Bluetooth Side Options" - depends on SW_COEXIST_ENABLE - default n - help - Options of Bluetooth Side of WiFi and bluetooth coexistence. - - config BTDM_COEX_BLE_ADV_HIGH_PRIORITY - bool "Improve BLE ADV priority for WiFi & BLE coexistence" - depends on BTDM_COEX_BT_OPTIONS - default n - help - Improve BLE ADV coexistence priority to make it better performance. - For example, BLE mesh need to enable this option to improve BLE adv performance. - endmenu menuconfig BLUEDROID_ENABLED diff --git a/components/bt/bt.c b/components/bt/bt.c index 73931bafab..4372503747 100644 --- a/components/bt/bt.c +++ b/components/bt/bt.c @@ -239,7 +239,6 @@ extern uint8_t coex_schm_curr_period_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_register_wifi_channel_change_callback(void *cb); -extern void coex_ble_adv_priority_high_set(bool high); extern char _bss_start_btdm; extern char _bss_end_btdm; @@ -1430,12 +1429,6 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg) goto error; } -#ifdef CONFIG_BTDM_COEX_BLE_ADV_HIGH_PRIORITY - coex_ble_adv_priority_high_set(true); -#else - coex_ble_adv_priority_high_set(false); -#endif - btdm_controller_status = ESP_BT_CONTROLLER_STATUS_INITED; return ESP_OK; diff --git a/components/bt/lib b/components/bt/lib index 8ccb84838d..e81ca744d7 160000 --- a/components/bt/lib +++ b/components/bt/lib @@ -1 +1 @@ -Subproject commit 8ccb84838d882f1139e92080e36d01e487d39d6a +Subproject commit e81ca744d7f36773c02dc57d4a61af6fca33f91c