feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/btdm_prevent_light_sleep' into 'master'

Browse Source 
bugfix/btdm_prevent_light_sleep

See merge request idf/esp-idf!3980
This commit is contained in:
Jiang Jiang Jian
2018-12-18 11:34:50 +08:00
parent d8b625a32c 561021e7f7
commit 9eb2287729
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/bt/bt.c
View File

@@ -356,6 +356,7 @@ static DRAM_ATTR uint8_t btdm_lpcycle_us_frac = 0; // number of fractional bit f
#ifdef CONFIG_PM_ENABLE #ifdef CONFIG_PM_ENABLE
static DRAM_ATTR esp_timer_handle_t s_btdm_slp_tmr; static DRAM_ATTR esp_timer_handle_t s_btdm_slp_tmr;
static DRAM_ATTR esp_pm_lock_handle_t s_pm_lock; static DRAM_ATTR esp_pm_lock_handle_t s_pm_lock;
static DRAM_ATTR esp_pm_lock_handle_t s_light_sleep_pm_lock; // pm_lock to prevent light sleep due to incompatibility currently
static DRAM_ATTR QueueHandle_t s_pm_lock_sem = NULL; static DRAM_ATTR QueueHandle_t s_pm_lock_sem = NULL;
static void btdm_slp_tmr_callback(void *arg); static void btdm_slp_tmr_callback(void *arg);
#endif #endif
@@ -1075,6 +1076,9 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
#endif #endif
#ifdef CONFIG_PM_ENABLE #ifdef CONFIG_PM_ENABLE
if ((err = esp_pm_lock_create(ESP_PM_NO_LIGHT_SLEEP, 0, "btLS", &s_light_sleep_pm_lock)) != ESP_OK) {
goto error;
}
if ((err = esp_pm_lock_create(ESP_PM_APB_FREQ_MAX, 0, "bt", &s_pm_lock)) != ESP_OK) { if ((err = esp_pm_lock_create(ESP_PM_APB_FREQ_MAX, 0, "bt", &s_pm_lock)) != ESP_OK) {
goto error; goto error;
} }
@@ -1137,6 +1141,10 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
error: error:
#ifdef CONFIG_PM_ENABLE #ifdef CONFIG_PM_ENABLE
if (s_light_sleep_pm_lock != NULL) {
esp_pm_lock_delete(s_light_sleep_pm_lock);
s_light_sleep_pm_lock = NULL;
}
if (s_pm_lock != NULL) { if (s_pm_lock != NULL) {
esp_pm_lock_delete(s_pm_lock); esp_pm_lock_delete(s_pm_lock);
s_pm_lock = NULL; s_pm_lock = NULL;
@@ -1164,6 +1172,8 @@ esp_err_t esp_bt_controller_deinit(void)
periph_module_disable(PERIPH_BT_MODULE); periph_module_disable(PERIPH_BT_MODULE);
#ifdef CONFIG_PM_ENABLE #ifdef CONFIG_PM_ENABLE
esp_pm_lock_delete(s_light_sleep_pm_lock);
s_light_sleep_pm_lock = NULL;
esp_pm_lock_delete(s_pm_lock); esp_pm_lock_delete(s_pm_lock);
s_pm_lock = NULL; s_pm_lock = NULL;
esp_timer_stop(s_btdm_slp_tmr); esp_timer_stop(s_btdm_slp_tmr);
@@ -1204,6 +1214,7 @@ esp_err_t esp_bt_controller_enable(esp_bt_mode_t mode)
} }
#ifdef CONFIG_PM_ENABLE #ifdef CONFIG_PM_ENABLE
esp_pm_lock_acquire(s_light_sleep_pm_lock);
esp_pm_lock_acquire(s_pm_lock); esp_pm_lock_acquire(s_pm_lock);
#endif #endif
@@ -1241,6 +1252,7 @@ esp_err_t esp_bt_controller_enable(esp_bt_mode_t mode)
} }
esp_phy_rf_deinit(PHY_BT_MODULE); esp_phy_rf_deinit(PHY_BT_MODULE);
#ifdef CONFIG_PM_ENABLE #ifdef CONFIG_PM_ENABLE
esp_pm_lock_release(s_light_sleep_pm_lock);
esp_pm_lock_release(s_pm_lock); esp_pm_lock_release(s_pm_lock);
#endif #endif
return ESP_ERR_INVALID_STATE; return ESP_ERR_INVALID_STATE;
@@ -1281,6 +1293,7 @@ esp_err_t esp_bt_controller_disable(void)
btdm_controller_status = ESP_BT_CONTROLLER_STATUS_INITED; btdm_controller_status = ESP_BT_CONTROLLER_STATUS_INITED;
#ifdef CONFIG_PM_ENABLE #ifdef CONFIG_PM_ENABLE
esp_pm_lock_release(s_light_sleep_pm_lock);
esp_pm_lock_release(s_pm_lock); esp_pm_lock_release(s_pm_lock);
#endif #endif