Skip to content

Commit 28980b6

Browse files
author
Jiang Jiang Jian
committed
Merge branch 'bugfix/add_more_checks_when_receiving_espnow_v5.4' into 'release/v5.4'
fix(wifi): Added more check when receiving espnow data (v5.4) See merge request espressif/esp-idf!39518
2 parents 306f101 + b369c44 commit 28980b6

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

components/esp_rom/esp32c2/ld/esp32c2.rom.eco4.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ pm_beacon_offset_init = 0x400030b0;
202202
pm_beacon_offset_deinit = 0x400030b4;
203203
pm_get_tbtt_count = 0x400030b8;
204204
pm_coex_schm_overall_period_get = 0x400030bc;
205-
pm_coex_pwr_update = 0x400030c0;
205+
//pm_coex_pwr_update = 0x400030c0;
206206
/* Data (.data, .bss, .rodata) */
207207
s_pm_beacon_offset_ptr = 0x3fcdfa64;
208208
s_pm_beacon_offset_config_ptr = 0x3fcdfa60;

components/esp_rom/esp32c2/ld/esp32c2.rom.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ pm_mac_sleep = 0x40001b80;
528528
pm_enable_active_timer = 0x40001b84;
529529
pm_enable_sleep_delay_timer = 0x40001b88;
530530
pm_local_tsf_process = 0x40001b8c;
531-
pm_set_beacon_filter = 0x40001b90;
531+
//pm_set_beacon_filter = 0x40001b90;
532532
/*pm_is_in_wifi_slice_threshold = 0x40001b94;*/
533533
pm_is_waked = 0x40001b98;
534534
/*pm_keep_alive = 0x40001b9c;*/

components/esp_rom/esp32c3/ld/esp32c3.rom.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@ pm_mac_sleep = 0x4000165c;
717717
pm_enable_active_timer = 0x40001660;
718718
pm_enable_sleep_delay_timer = 0x40001664;
719719
pm_local_tsf_process = 0x40001668;
720-
pm_set_beacon_filter = 0x4000166c;
720+
//pm_set_beacon_filter = 0x4000166c;
721721
/*pm_is_in_wifi_slice_threshold = 0x40001670;*/
722722
pm_is_waked = 0x40001674;
723723
/*pm_keep_alive = 0x40001678;*/

components/esp_rom/esp32c5/ld/esp32c5.rom.pp.ld

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -115,7 +115,7 @@ pm_mac_sleep = 0x40000d5c;
115115
/*pm_enable_active_timer = 0x40000d60;*/
116116
pm_enable_sleep_delay_timer = 0x40000d64;
117117
pm_local_tsf_process = 0x40000d68;
118-
pm_set_beacon_filter = 0x40000d6c;
118+
//pm_set_beacon_filter = 0x40000d6c;
119119
/*pm_is_in_wifi_slice_threshold = 0x40000d70;*/
120120
pm_is_waked = 0x40000d74;
121121
/*pm_keep_alive = 0x40000d78;*/
@@ -158,9 +158,9 @@ pm_twt_disallow_tx = 0x40000e08;
158158
pm_clear_wakeup_signal = 0x40000e0c;
159159
pm_mac_disable_tsf_tbtt_soc_wakeup = 0x40000e10;
160160
pm_mac_disable_tsf_tbtt_modem_wakeup = 0x40000e14;
161-
pm_mac_enable_tsf_tbtt_soc_wakeup = 0x40000e18;
162-
pm_mac_enable_tsf_tbtt_modem_wakeup = 0x40000e1c;
163-
pm_mac_modem_params_rt_update = 0x40000e20;
161+
//pm_mac_enable_tsf_tbtt_soc_wakeup = 0x40000e18;
162+
//pm_mac_enable_tsf_tbtt_modem_wakeup = 0x40000e1c;
163+
//pm_mac_modem_params_rt_update = 0x40000e20;
164164
pm_update_at_next_beacon = 0x40000e24;
165165
tbtt_adaptive_setup = 0x40000e28;
166166
tbtt_adaptive_servo = 0x40000e2c;

components/esp_rom/esp32c61/ld/esp32c61.rom.pp.ld

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -119,7 +119,7 @@ pm_mac_sleep = 0x40000cc8;
119119
/*pm_enable_active_timer = 0x40000ccc;*/
120120
pm_enable_sleep_delay_timer = 0x40000cd0;
121121
pm_local_tsf_process = 0x40000cd4;
122-
pm_set_beacon_filter = 0x40000cd8;
122+
//pm_set_beacon_filter = 0x40000cd8;
123123
/*pm_is_in_wifi_slice_threshold = 0x40000cdc;*/
124124
pm_is_waked = 0x40000ce0;
125125
//pm_keep_alive = 0x40000ce4;
@@ -162,13 +162,13 @@ pm_twt_disallow_tx = 0x40000d74;
162162
pm_clear_wakeup_signal = 0x40000d78;
163163
pm_mac_disable_tsf_tbtt_soc_wakeup = 0x40000d7c;
164164
pm_mac_disable_tsf_tbtt_modem_wakeup = 0x40000d80;
165-
pm_mac_enable_tsf_tbtt_soc_wakeup = 0x40000d84;
166-
pm_mac_enable_tsf_tbtt_modem_wakeup = 0x40000d88;
167-
pm_mac_modem_params_rt_update = 0x40000d8c;
165+
//pm_mac_enable_tsf_tbtt_soc_wakeup = 0x40000d84;
166+
//pm_mac_enable_tsf_tbtt_modem_wakeup = 0x40000d88;
167+
//pm_mac_modem_params_rt_update = 0x40000d8c;
168168
pm_update_at_next_beacon = 0x40000d90;
169169
pm_get_null_max_tx_time = 0x40000d94;
170170
pm_coex_schm_overall_period_get = 0x40000d98;
171-
pm_coex_pwr_update = 0x40000d9c;
171+
//pm_coex_pwr_update = 0x40000d9c;
172172
tbtt_adaptive_setup = 0x40000da0;
173173
tbtt_adaptive_servo = 0x40000da4;
174174
ppAMPDU2Normal = 0x40000da8;

components/esp_rom/esp32s3/ld/esp32s3.rom.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,7 @@ pm_mac_sleep = 0x40005454;
971971
pm_enable_active_timer = 0x40005460;
972972
pm_enable_sleep_delay_timer = 0x4000546c;
973973
pm_local_tsf_process = 0x40005478;
974-
pm_set_beacon_filter = 0x40005484;
974+
//pm_set_beacon_filter = 0x40005484;
975975
/*pm_is_in_wifi_slice_threshold = 0x40005490;*/
976976
pm_is_waked = 0x4000549c;
977977
/*pm_keep_alive = 0x400054a8;*/

0 commit comments

Comments
 (0)