1. Wi-Fi: update tsf tick interval when lpclk is modified

2. Move register_lpclk_callback to coexistence
This commit is contained in:
Li Shuai
2021-10-25 21:19:47 +08:00
committed by xiongweichao
parent 4afc115397
commit 4f2cec8495
10 changed files with 64 additions and 67 deletions

View File

@@ -395,8 +395,6 @@ static DRAM_ATTR uint8_t btdm_lpcycle_us_frac = 0;
static DRAM_ATTR QueueHandle_t s_wakeup_req_sem = NULL;
// wakeup timer
static DRAM_ATTR esp_timer_handle_t s_btdm_slp_tmr;
// set low power clock source callback
static esp_set_lpclk_source_callback_t s_set_lpclk_source_cb = NULL;
#ifdef CONFIG_PM_ENABLE
static DRAM_ATTR esp_pm_lock_handle_t s_pm_lock;
@@ -927,11 +925,6 @@ static void IRAM_ATTR btdm_mac_bb_power_up_cb(void)
}
#endif
void esp_wifi_set_lpclk_register_callback(esp_set_lpclk_source_callback_t callback)
{
s_set_lpclk_source_cb = callback;
}
esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
{
esp_err_t err = ESP_FAIL;
@@ -1113,10 +1106,9 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
err = ESP_ERR_INVALID_ARG;
goto error;
}
if (s_set_lpclk_source_cb) {
s_set_lpclk_source_cb();
}
#if CONFIG_SW_COEXIST_ENABLE
coex_update_lpclk_interval();
#endif
#ifdef CONFIG_PM_ENABLE
if (s_lp_cntl.no_light_sleep) {
@@ -1205,13 +1197,12 @@ error:
#endif
btdm_lpclk_select_src(BTDM_LPCLK_SEL_RTC_SLOW);
btdm_lpclk_set_div(0);
if (s_set_lpclk_source_cb) {
s_set_lpclk_source_cb();
}
#if CONFIG_SW_COEXIST_ENABLE
coex_update_lpclk_interval();
#endif
}
btdm_lpcycle_us = 0;
s_set_lpclk_source_cb = NULL;
} while (0);
#if CONFIG_MAC_BB_PD
@@ -1283,13 +1274,12 @@ esp_err_t esp_bt_controller_deinit(void)
#endif
btdm_lpclk_select_src(BTDM_LPCLK_SEL_RTC_SLOW);
btdm_lpclk_set_div(0);
if (s_set_lpclk_source_cb) {
s_set_lpclk_source_cb();
}
#if CONFIG_SW_COEXIST_ENABLE
coex_update_lpclk_interval();
#endif
}
btdm_lpcycle_us = 0;
s_set_lpclk_source_cb = NULL;
} while (0);
#if CONFIG_MAC_BB_PD