Skip to content

Commit 9ddef27

Browse files
author
Jiang Jiang Jian
committed
Merge branch 'test/bugfix/offchan_action_tx_failure_scan_rebase_master' into 'master'
feat(coex): support backgorund scan for coex, fix some issues of scan when connected Closes WIFI-6729, WIFI-6730, WIFIBUG-740, and WIFIBUG-387 See merge request espressif/esp-idf!38413
2 parents 304b561 + 7191595 commit 9ddef27

File tree

10 files changed

+12
-11
lines changed

10 files changed

+12
-11
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
@@ -19,7 +19,7 @@ lmacDiscardMSDU = 0x40001b18;
1919
lmacEndFrameExchangeSequence = 0x40001b1c;
2020
lmacMSDUAged = 0x40001b28;
2121
//lmacSetTxFrame = 0x40001b4c;
22-
pm_check_state = 0x40001b6c;
22+
/* pm_check_state = 0x40001b6c; */
2323
pm_dream = 0x40001b78;
2424
pm_on_beacon_rx = 0x40001ba0;
2525
//pm_parse_beacon = 0x40001bac;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ hal_mac_tx_get_blockack = 0x40001af4;
493493
/*hal_mac_tx_set_ppdu = 0x40001af8;*/
494494
ic_get_trc = 0x40001afc;
495495
/* ic_mac_deinit = 0x40001b00; */
496-
ic_mac_init = 0x40001b04;
496+
/* ic_mac_init = 0x40001b04; */
497497
ic_interface_enabled = 0x40001b08;
498498
is_lmac_idle = 0x40001b0c;
499499
/*lmacAdjustTimestamp = 0x40001b10;*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ lmacTxDone = 0x4000162c;
1414
/*lmacTxFrame = 0x40001630;*/
1515
mac_tx_set_htsig = 0x40001638;
1616
mac_tx_set_plcp1 = 0x40001640;
17-
pm_check_state = 0x40001648;
17+
/* pm_check_state = 0x40001648; */
1818
/*pm_on_beacon_rx = 0x4000167c;*/
1919
/*pm_parse_beacon = 0x40001688;*/
2020
/*pm_process_tim = 0x4000168c;*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ hal_mac_tx_get_blockack = 0x400015d0;
683683
/* hal_mac_tx_set_ppdu = 0x400015d4;*/
684684
ic_get_trc = 0x400015d8;
685685
/* ic_mac_deinit = 0x400015dc; */
686-
ic_mac_init = 0x400015e0;
686+
/* ic_mac_init = 0x400015e0; */
687687
ic_interface_enabled = 0x400015e4;
688688
is_lmac_idle = 0x400015e8;
689689
/*lmacAdjustTimestamp = 0x400015ec;*/

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ hal_get_tsf_time = 0x40000c64;
5353
hal_get_sta_tsf = 0x40000c68;
5454
ic_get_trc = 0x40000c74;
5555
ic_mac_deinit = 0x40000c78;
56-
ic_mac_init = 0x40000c7c;
56+
/* ic_mac_init = 0x40000c7c; */
5757
ic_interface_enabled = 0x40000c80;
5858
is_lmac_idle = 0x40000c84;
5959
ic_get_he_rts_threshold_bytes = 0x40000c88;
@@ -104,7 +104,7 @@ mac_tx_set_tb = 0x40000d38;
104104
mac_tx_set_mplen = 0x40000d3c;
105105
mac_tx_set_txop_q = 0x40000d40;
106106
mac_tx_set_pti = 0x40000d44;
107-
pm_check_state = 0x40000d48;
107+
/*pm_check_state = 0x40000d48;*/
108108
pm_disable_dream_timer = 0x40000d4c;
109109
pm_disable_sleep_delay_timer = 0x40000d50;
110110
pm_dream = 0x40000d54;

components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ hal_mac_tx_get_blockack = 0x40000bfc;
3131
//hal_mac_tx_set_ppdu = 0x40000c00;
3232
ic_get_trc = 0x40000c04;
3333
//ic_mac_deinit = 0x40000c08;
34-
ic_mac_init = 0x40000c0c;
34+
/* ic_mac_init = 0x40000c0c; */
3535
ic_interface_enabled = 0x40000c10;
3636
is_lmac_idle = 0x40000c14;
3737
/*lmacAdjustTimestamp = 0x40000c18;*/

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ hal_get_sta_tsf = 0x40000bd4;
5151
tsf_hal_get_tbtt_interval = 0x40000bd8;
5252
ic_get_trc = 0x40000be4;
5353
ic_mac_deinit = 0x40000be8;
54-
ic_mac_init = 0x40000bec;
54+
/* ic_mac_init = 0x40000bec; */
5555
ic_interface_enabled = 0x40000bf0;
5656
is_lmac_idle = 0x40000bf4;
5757
ic_get_he_rts_threshold_bytes = 0x40000bf8;
@@ -101,7 +101,7 @@ mac_tx_set_tb = 0x40000ca4;
101101
mac_tx_set_mplen = 0x40000ca8;
102102
mac_tx_set_txop_q = 0x40000cac;
103103
mac_tx_set_pti = 0x40000cb0;
104-
pm_check_state = 0x40000cb4;
104+
/* pm_check_state = 0x40000cb4; */
105105
pm_disable_dream_timer = 0x40000cb8;
106106
pm_disable_sleep_delay_timer = 0x40000cbc;
107107
pm_dream = 0x40000cc0;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ hal_mac_tx_get_blockack = 0x400052b0;
936936
/* hal_mac_tx_set_ppdu = 0x400052bc;*/
937937
ic_get_trc = 0x400052c8;
938938
/* ic_mac_deinit = 0x400052d4; */
939-
ic_mac_init = 0x400052e0;
939+
/* ic_mac_init = 0x400052e0; */
940940
ic_interface_enabled = 0x400052ec;
941941
is_lmac_idle = 0x400052f8;
942942
/*lmacAdjustTimestamp = 0x40005304;*/

components/esp_wifi/include/esp_wifi_types_generic.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ typedef struct {
246246
wifi_scan_channel_bitmap_t channel_bitmap; /**< Channel bitmap for setting specific channels to be scanned.
247247
Please note that the 'channel' parameter above needs to be set to 0 to allow scanning by bitmap.
248248
Also, note that only allowed channels configured by wifi_country_t can be scanned. */
249+
bool coex_background_scan; /**< Enable it to scan return home channel under coexist */
249250
} wifi_scan_config_t;
250251

251252
/**

0 commit comments

Comments
 (0)