mirror of
https://github.com/espressif/esp-idf.git
synced 2025-07-30 18:57:19 +02:00
Merge branch 'bugfix/disable_bt_pll_track_v4.4' into 'release/v4.4'
Bluetooth: disable PLL track function for ESP32-C3/ESP32-S3 as it introduced coexistence issues(bacport v4.4) See merge request espressif/esp-idf!18139
This commit is contained in:
@ -239,6 +239,7 @@ extern bool btdm_deep_sleep_mem_init(void);
|
|||||||
extern void btdm_deep_sleep_mem_deinit(void);
|
extern void btdm_deep_sleep_mem_deinit(void);
|
||||||
extern void btdm_ble_power_down_dma_copy(bool copy);
|
extern void btdm_ble_power_down_dma_copy(bool copy);
|
||||||
extern uint8_t btdm_sleep_clock_sync(void);
|
extern uint8_t btdm_sleep_clock_sync(void);
|
||||||
|
extern void sdk_config_extend_set_pll_track(bool enable);
|
||||||
|
|
||||||
#if CONFIG_MAC_BB_PD
|
#if CONFIG_MAC_BB_PD
|
||||||
extern void esp_mac_bb_power_down(void);
|
extern void esp_mac_bb_power_down(void);
|
||||||
@ -961,6 +962,8 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
|
|||||||
// overwrite some parameters
|
// overwrite some parameters
|
||||||
cfg->magic = ESP_BT_CTRL_CONFIG_MAGIC_VAL;
|
cfg->magic = ESP_BT_CTRL_CONFIG_MAGIC_VAL;
|
||||||
|
|
||||||
|
sdk_config_extend_set_pll_track(false);
|
||||||
|
|
||||||
#if CONFIG_MAC_BB_PD
|
#if CONFIG_MAC_BB_PD
|
||||||
esp_mac_bb_pd_mem_init();
|
esp_mac_bb_pd_mem_init();
|
||||||
#endif
|
#endif
|
||||||
|
@ -237,6 +237,7 @@ extern bool btdm_deep_sleep_mem_init(void);
|
|||||||
extern void btdm_deep_sleep_mem_deinit(void);
|
extern void btdm_deep_sleep_mem_deinit(void);
|
||||||
extern void btdm_ble_power_down_dma_copy(bool copy);
|
extern void btdm_ble_power_down_dma_copy(bool copy);
|
||||||
extern uint8_t btdm_sleep_clock_sync(void);
|
extern uint8_t btdm_sleep_clock_sync(void);
|
||||||
|
extern void sdk_config_extend_set_pll_track(bool enable);
|
||||||
|
|
||||||
#if CONFIG_MAC_BB_PD
|
#if CONFIG_MAC_BB_PD
|
||||||
extern void esp_mac_bb_power_down(void);
|
extern void esp_mac_bb_power_down(void);
|
||||||
@ -928,6 +929,8 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
|
|||||||
// overwrite some parameters
|
// overwrite some parameters
|
||||||
cfg->magic = ESP_BT_CTRL_CONFIG_MAGIC_VAL;
|
cfg->magic = ESP_BT_CTRL_CONFIG_MAGIC_VAL;
|
||||||
|
|
||||||
|
sdk_config_extend_set_pll_track(false);
|
||||||
|
|
||||||
#if CONFIG_MAC_BB_PD
|
#if CONFIG_MAC_BB_PD
|
||||||
esp_mac_bb_pd_mem_init();
|
esp_mac_bb_pd_mem_init();
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user