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

Merge branch 'bugfix/phy_init_failed_when_wifi_deinit_4.3' into 'release/v4.3'

Browse Source 
esp_wifi:bugfix for phy init failed when wifi deinit(4.3)

See merge request espressif/esp-idf!19138
This commit is contained in:
Jiang Jiang Jian
2022-07-22 12:01:06 +08:00
parent 182af34da8 78ba8d406d
commit cbeb9ae14b
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/esp_wifi/src/phy_init.c
View File

@@ -66,6 +66,8 @@ static DRAM_ATTR struct {
/* Indicate PHY is calibrated or not */ /* Indicate PHY is calibrated or not */
static bool s_is_phy_calibrated = false; static bool s_is_phy_calibrated = false;
static bool s_is_phy_reg_stored = false;
/* Reference count of enabling PHY */ /* Reference count of enabling PHY */
static uint8_t s_phy_access_ref = 0; static uint8_t s_phy_access_ref = 0;
@@ -220,12 +222,13 @@ static inline void phy_digital_regs_store(void)
{ {
if (s_phy_digital_regs_mem != NULL) { if (s_phy_digital_regs_mem != NULL) {
phy_dig_reg_backup(true, s_phy_digital_regs_mem); phy_dig_reg_backup(true, s_phy_digital_regs_mem);
s_is_phy_reg_stored = true;
} }
} }
static inline void phy_digital_regs_load(void) static inline void phy_digital_regs_load(void)
{ {
if (s_phy_digital_regs_mem != NULL) { if (s_is_phy_reg_stored && s_phy_digital_regs_mem != NULL) {
phy_dig_reg_backup(false, s_phy_digital_regs_mem); phy_dig_reg_backup(false, s_phy_digital_regs_mem);
} }
} }
@@ -328,7 +331,7 @@ void esp_phy_pd_mem_deinit(void)
s_phy_backup_mem_ref--; s_phy_backup_mem_ref--;
if (s_phy_backup_mem_ref == 0) { if (s_phy_backup_mem_ref == 0) {
s_is_phy_calibrated = false; s_is_phy_reg_stored = false;
free(s_phy_digital_regs_mem); free(s_phy_digital_regs_mem);
s_phy_digital_regs_mem = NULL; s_phy_digital_regs_mem = NULL;
} }