Merge branch 'bugfix/btdm_delete_adv_priority_high' into 'master'

components/bt: Delete BLE ADV priority high

Closes BT-1573

See merge request espressif/esp-idf!13054

components/bt/controller/esp32/Kconfig.in

@@ -415,18 +415,3 @@ config BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD
         of ADV packets lost in the controller reaches this threshold. It is better to set a larger value.
         If you set `BTDM_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 ESP32_WIFI_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.

components/bt/controller/esp32/bt.c

@@ -240,7 +240,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;
@@ -1465,12 +1464,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;

components/bt/controller/lib_esp32

@@ -1 +1 @@
-Subproject commit 606e0f422ce612936b857b1599bff2662544e12b
+Subproject commit 1f7e45e2f645f115fc4ca7fc35ecee2d894ff2ea