alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-19 14:26:01 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix(CI): fix CI build

Browse Source
This commit is contained in:
zhangwenxu 2023-09-07 15:30:48 +08:00
parent 9e07fa9312
commit e5b96c94b5
6 changed files with 28 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
components/bt/controller/esp32/bt.c
View File

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -938,7 +938,7 @@ static void btdm_sleep_enter_phase1_wrapper(uint32_t lpcycles)
static void btdm_sleep_enter_phase2_wrapper(void) static void btdm_sleep_enter_phase2_wrapper(void)
{ {
if (btdm_controller_get_sleep_mode() == BTDM_MODEM_SLEEP_MODE_ORIG) { if (btdm_controller_get_sleep_mode() == BTDM_MODEM_SLEEP_MODE_ORIG) {
esp_phy_disable(); esp_phy_disable(PHY_MODEM_BT);
#ifdef CONFIG_PM_ENABLE #ifdef CONFIG_PM_ENABLE
if (s_pm_lock_acquired) { if (s_pm_lock_acquired) {
esp_pm_lock_release(s_pm_lock); esp_pm_lock_release(s_pm_lock);
@ -946,7 +946,7 @@ static void btdm_sleep_enter_phase2_wrapper(void)
} }
#endif #endif
} else if (btdm_controller_get_sleep_mode() == BTDM_MODEM_SLEEP_MODE_EVED) { } else if (btdm_controller_get_sleep_mode() == BTDM_MODEM_SLEEP_MODE_EVED) {
esp_phy_disable(); esp_phy_disable(PHY_MODEM_BT);
// pause bluetooth baseband // pause bluetooth baseband
periph_module_disable(PERIPH_BT_BASEBAND_MODULE); periph_module_disable(PERIPH_BT_BASEBAND_MODULE);
} }
@ -962,7 +962,7 @@ static void btdm_sleep_exit_phase3_wrapper(void)
#endif #endif
if (btdm_controller_get_sleep_mode() == BTDM_MODEM_SLEEP_MODE_ORIG) { if (btdm_controller_get_sleep_mode() == BTDM_MODEM_SLEEP_MODE_ORIG) {
esp_phy_enable(); esp_phy_enable(PHY_MODEM_BT);
btdm_check_and_init_bb(); btdm_check_and_init_bb();
#ifdef CONFIG_PM_ENABLE #ifdef CONFIG_PM_ENABLE
esp_timer_stop(s_btdm_slp_tmr); esp_timer_stop(s_btdm_slp_tmr);
@ -970,7 +970,7 @@ static void btdm_sleep_exit_phase3_wrapper(void)
} else if (btdm_controller_get_sleep_mode() == BTDM_MODEM_SLEEP_MODE_EVED) { } else if (btdm_controller_get_sleep_mode() == BTDM_MODEM_SLEEP_MODE_EVED) {
// resume bluetooth baseband // resume bluetooth baseband
periph_module_enable(PERIPH_BT_BASEBAND_MODULE); periph_module_enable(PERIPH_BT_BASEBAND_MODULE);
esp_phy_enable(); esp_phy_enable(PHY_MODEM_BT);
} }
} }
@ -1642,7 +1642,7 @@ static void bt_shutdown(void)
#else #else
bt_controller_shutdown(NULL); bt_controller_shutdown(NULL);
#endif #endif
esp_phy_disable(); esp_phy_disable(PHY_MODEM_BT);
return; return;
} }
@ -1668,7 +1668,7 @@ esp_err_t esp_bt_controller_enable(esp_bt_mode_t mode)
esp_pm_lock_acquire(s_pm_lock); esp_pm_lock_acquire(s_pm_lock);
#endif #endif
esp_phy_enable(); esp_phy_enable(PHY_MODEM_BT);
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE
coex_enable(); coex_enable();
@ -1688,7 +1688,7 @@ esp_err_t esp_bt_controller_enable(esp_bt_mode_t mode)
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE
coex_disable(); coex_disable();
#endif #endif
esp_phy_disable(); esp_phy_disable(PHY_MODEM_BT);
#ifdef CONFIG_PM_ENABLE #ifdef CONFIG_PM_ENABLE
if (!s_btdm_allow_light_sleep) { if (!s_btdm_allow_light_sleep) {
esp_pm_lock_release(s_light_sleep_pm_lock); esp_pm_lock_release(s_light_sleep_pm_lock);
@ -1728,7 +1728,7 @@ esp_err_t esp_bt_controller_disable(void)
coex_disable(); coex_disable();
#endif #endif
esp_phy_disable(); esp_phy_disable(PHY_MODEM_BT);
btdm_controller_status = ESP_BT_CONTROLLER_STATUS_INITED; btdm_controller_status = ESP_BT_CONTROLLER_STATUS_INITED;
esp_unregister_shutdown_handler(bt_shutdown); esp_unregister_shutdown_handler(bt_shutdown);

10
components/bt/controller/esp32c3/bt.c
View File

@ -747,7 +747,7 @@ static void btdm_sleep_enter_phase2_wrapper(void)
{ {
if (btdm_controller_get_sleep_mode() == ESP_BT_SLEEP_MODE_1) { if (btdm_controller_get_sleep_mode() == ESP_BT_SLEEP_MODE_1) {
if (s_lp_stat.phy_enabled) { if (s_lp_stat.phy_enabled) {
esp_phy_disable(); esp_phy_disable(PHY_MODEM_BT);
s_lp_stat.phy_enabled = 0; s_lp_stat.phy_enabled = 0;
} else { } else {
assert(0); assert(0);
@ -776,7 +776,7 @@ static void btdm_sleep_exit_phase3_wrapper(void)
if (btdm_controller_get_sleep_mode() == ESP_BT_SLEEP_MODE_1) { if (btdm_controller_get_sleep_mode() == ESP_BT_SLEEP_MODE_1) {
if (s_lp_stat.phy_enabled == 0) { if (s_lp_stat.phy_enabled == 0) {
esp_phy_enable(); esp_phy_enable(PHY_MODEM_BT);
s_lp_stat.phy_enabled = 1; s_lp_stat.phy_enabled = 1;
} }
} }
@ -1442,7 +1442,7 @@ esp_err_t esp_bt_controller_enable(esp_bt_mode_t mode)
/* Enable PHY when enabling controller to reduce power dissipation after controller init /* Enable PHY when enabling controller to reduce power dissipation after controller init
* Notice the init order: esp_phy_enable() -> bt_bb_v2_init_cmplx() -> coex_pti_v2() * Notice the init order: esp_phy_enable() -> bt_bb_v2_init_cmplx() -> coex_pti_v2()
*/ */
esp_phy_enable(); esp_phy_enable(PHY_MODEM_BT);
s_lp_stat.phy_enabled = 1; s_lp_stat.phy_enabled = 1;
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE
@ -1494,7 +1494,7 @@ error:
coex_disable(); coex_disable();
#endif #endif
if (s_lp_stat.phy_enabled) { if (s_lp_stat.phy_enabled) {
esp_phy_disable(); esp_phy_disable(PHY_MODEM_BT);
s_lp_stat.phy_enabled = 0; s_lp_stat.phy_enabled = 0;
} }
return ret; return ret;
@ -1516,7 +1516,7 @@ esp_err_t esp_bt_controller_disable(void)
coex_disable(); coex_disable();
#endif #endif
if (s_lp_stat.phy_enabled) { if (s_lp_stat.phy_enabled) {
esp_phy_disable(); esp_phy_disable(PHY_MODEM_BT);
s_lp_stat.phy_enabled = 0; s_lp_stat.phy_enabled = 0;
} }

19
components/esp_phy/include/esp_phy_init.h
View File

@ -269,18 +269,6 @@ esp_err_t esp_phy_apply_phy_init_data(uint8_t *init_data);
*/ */
char * get_phy_version_str(void); char * get_phy_version_str(void);
/**
* @brief Enable phy track pll
*
*/
void phy_track_pll_init(void);
/**
* @brief Disable phy track pll
*
*/
void phy_track_pll_deinit(void);
/** /**
* @brief Set PHY init parameters * @brief Set PHY init parameters
* @param param is 1 means combo module * @param param is 1 means combo module
@ -289,15 +277,10 @@ void phy_init_param_set(uint8_t param);
/** /**
* @brief Wi-Fi RX enable * @brief Wi-Fi RX enable
* @param enable True for enable wifi receiving mode as default, false for closing wifi receiving mode as default.
*/ */
void phy_wifi_enable_set(uint8_t enable); void phy_wifi_enable_set(uint8_t enable);
/**
* @brief PHY temperature track
*/
void phy_param_track_tot(bool en_wifi, bool en_bt_154);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

4
components/esp_phy/src/phy_common.c
View File

@ -12,8 +12,12 @@ static volatile uint16_t s_phy_modem_flag = 0;
extern void phy_param_track_tot(bool en_wifi, bool en_ble_154); extern void phy_param_track_tot(bool en_wifi, bool en_ble_154);
static esp_timer_handle_t phy_track_pll_timer; static esp_timer_handle_t phy_track_pll_timer;
#if CONFIG_WIFI_ENABLED
static volatile int64_t s_wifi_prev_timestamp; static volatile int64_t s_wifi_prev_timestamp;
#endif
#if CONFIG_IEEE802154_ENABLED || CONFIG_BT_ENABLED
static volatile int64_t s_bt_154_prev_timestamp; static volatile int64_t s_bt_154_prev_timestamp;
#endif
#define PHY_TRACK_PLL_PERIOD_IN_US 1000000 #define PHY_TRACK_PLL_PERIOD_IN_US 1000000
#if CONFIG_IEEE802154_ENABLED || CONFIG_BT_ENABLED || CONFIG_WIFI_ENABLED #if CONFIG_IEEE802154_ENABLED || CONFIG_BT_ENABLED || CONFIG_WIFI_ENABLED

12
components/esp_phy/test/test_phy_rtc.c
View File

@ -46,9 +46,15 @@ static void test_phy_rtc_init(void)
ret = nvs_flash_init(); ret = nvs_flash_init();
} }
TEST_ESP_OK(ret); TEST_ESP_OK(ret);
#if CONFIG_WIFI_ENABLED
esp_phy_enable(); esp_phy_enable(PHY_MODEM_WIFI);
#endif
#if CONFIG_BT_ENABLED
esp_phy_enable(PHY_MODEM_BT);
#endif
#if CONFIG_IEEE802154_ENABLED
esp_phy_enable(PHY_MODEM_IEEE802154);
#endif
//must run here, not blocking in above code //must run here, not blocking in above code
TEST_ASSERT(1); TEST_ASSERT(1);
nvs_flash_deinit(); nvs_flash_deinit();

1
components/ieee802154/test_apps/test_ieee802154/main/test_app_main.c
View File

@ -31,7 +31,6 @@ static void initialize_nvs(void)
void app_main(void) void app_main(void)
{ {
esp_ieee802154_enable(); esp_ieee802154_enable();
esp_phy_enable();
esp_console_repl_t *repl = NULL; esp_console_repl_t *repl = NULL;
esp_console_repl_config_t repl_config = ESP_CONSOLE_REPL_CONFIG_DEFAULT(); esp_console_repl_config_t repl_config = ESP_CONSOLE_REPL_CONFIG_DEFAULT();
/* Prompt to be printed before each line. /* Prompt to be printed before each line.