Merge branch 'backport/backport_some_wifi_changes_250526_v5.1' into 'release/v5.1'

fix(wifi): fix some wifi bugs(backport v5.1)

See merge request espressif/esp-idf!39422
This commit is contained in:
Jiang Jiang Jian
2025-05-29 10:52:21 +08:00
4 changed files with 59 additions and 59 deletions

View File

@@ -37,8 +37,8 @@ static const char __attribute__((section(".rodata"))) phy_init_magic_pre[] = PHY
* @brief Structure containing default recommended PHY initialization parameters. * @brief Structure containing default recommended PHY initialization parameters.
*/ */
static const esp_phy_init_data_t phy_init_data= { { static const esp_phy_init_data_t phy_init_data= { {
0x01, 0xa,
0x00, 0x0,
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x54), LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x54),
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x54), LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x54),
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x50), LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x50),
@@ -53,60 +53,62 @@ static const esp_phy_init_data_t phy_init_data= { {
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x3C), LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x3C),
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x3C), LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x3C),
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x3C), LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x3C),
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x4c),
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x4c),
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x4c),
LIMIT(CONFIG_ESP_PHY_MAX_TX_POWER * 4, 0, 0x48),
0x0,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00,
0x00, 0x00,
0x00, 0x00,
0x00, 0x00,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0xff,
0, 0,
0, 0,
0, 0,
@@ -162,9 +164,7 @@ static const esp_phy_init_data_t phy_init_data= { {
0, 0,
0, 0,
0, 0,
0, 0x51
0,
0x70
} }; } };
static const char __attribute__((section(".rodata"))) phy_init_magic_post[] = PHY_INIT_MAGIC; static const char __attribute__((section(".rodata"))) phy_init_magic_post[] = PHY_INIT_MAGIC;

View File

@@ -24,7 +24,7 @@ pm_check_state = 0x40001b6c;
pm_dream = 0x40001b78; pm_dream = 0x40001b78;
pm_on_beacon_rx = 0x40001ba0; pm_on_beacon_rx = 0x40001ba0;
//pm_parse_beacon = 0x40001bac; //pm_parse_beacon = 0x40001bac;
pm_process_tim = 0x40001bb0; //pm_process_tim = 0x40001bb0;
pm_rx_beacon_process = 0x40001bb4; pm_rx_beacon_process = 0x40001bb4;
pm_rx_data_process = 0x40001bb8; pm_rx_data_process = 0x40001bb8;
pm_sleep = 0x40001bbc; pm_sleep = 0x40001bbc;

View File

@@ -17,7 +17,7 @@ mac_tx_set_plcp1 = 0x40001640;
pm_check_state = 0x40001648; pm_check_state = 0x40001648;
/*pm_on_beacon_rx = 0x4000167c;*/ /*pm_on_beacon_rx = 0x4000167c;*/
/*pm_parse_beacon = 0x40001688;*/ /*pm_parse_beacon = 0x40001688;*/
pm_process_tim = 0x4000168c; /*pm_process_tim = 0x4000168c;*/
pm_rx_beacon_process = 0x40001690; pm_rx_beacon_process = 0x40001690;
pm_rx_data_process = 0x40001694; pm_rx_data_process = 0x40001694;
/* pm_sleep = 0x40001698;*/ /* pm_sleep = 0x40001698;*/