mirror of
https://github.com/espressif/esp-idf.git
synced 2025-07-30 18:57:19 +02:00
Merge branch 'bugfix/fix_c3_s3_ble_temperature_performance_v4.4' into 'release/v4.4'
Fixed bluetooth disconnection caused by HW temperature rise or fall(backport v4.4) See merge request espressif/esp-idf!21371
This commit is contained in:
@ -241,7 +241,6 @@ 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);
|
||||||
@ -1091,8 +1090,6 @@ 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
|
||||||
|
@ -246,7 +246,6 @@ 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);
|
||||||
@ -1137,8 +1136,6 @@ 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
|
||||||
|
Submodule components/esp_phy/lib updated: ff0d771b8e...9a94277c0d
@ -77,12 +77,15 @@ static IRAM_ATTR void test_phy_rtc_cache_task(void *arg)
|
|||||||
|
|
||||||
#if SOC_BT_SUPPORTED
|
#if SOC_BT_SUPPORTED
|
||||||
|
|
||||||
|
#if CONFIG_IDF_TARGET_ESP32
|
||||||
|
/* Only esp32 will call bt_track_pll_cap() in the interrupt
|
||||||
|
handler, other chips will call this function in the task
|
||||||
|
*/
|
||||||
ESP_LOGI(TAG, "Test bt_track_pll_cap()...");
|
ESP_LOGI(TAG, "Test bt_track_pll_cap()...");
|
||||||
spi_flash_disable_interrupts_caches_and_other_cpu();
|
spi_flash_disable_interrupts_caches_and_other_cpu();
|
||||||
bt_track_pll_cap();
|
bt_track_pll_cap();
|
||||||
spi_flash_enable_interrupts_caches_and_other_cpu();
|
spi_flash_enable_interrupts_caches_and_other_cpu();
|
||||||
|
|
||||||
#if CONFIG_IDF_TARGET_ESP32
|
|
||||||
extern void bt_bb_init_cmplx_reg(void);
|
extern void bt_bb_init_cmplx_reg(void);
|
||||||
ESP_LOGI(TAG, "Test bt_bb_init_cmplx_reg()...");
|
ESP_LOGI(TAG, "Test bt_bb_init_cmplx_reg()...");
|
||||||
spi_flash_disable_interrupts_caches_and_other_cpu();
|
spi_flash_disable_interrupts_caches_and_other_cpu();
|
||||||
|
Reference in New Issue
Block a user