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
This commit is contained in:
Jiang Jiang Jian
2025-06-18 19:35:43 +08:00
10 changed files with 12 additions and 11 deletions

View File

@@ -19,7 +19,7 @@ lmacDiscardMSDU = 0x40001b18;
lmacEndFrameExchangeSequence = 0x40001b1c;
lmacMSDUAged = 0x40001b28;
//lmacSetTxFrame = 0x40001b4c;
pm_check_state = 0x40001b6c;
/* pm_check_state = 0x40001b6c; */
pm_dream = 0x40001b78;
pm_on_beacon_rx = 0x40001ba0;
//pm_parse_beacon = 0x40001bac;

View File

@@ -493,7 +493,7 @@ hal_mac_tx_get_blockack = 0x40001af4;
/*hal_mac_tx_set_ppdu = 0x40001af8;*/
ic_get_trc = 0x40001afc;
/* ic_mac_deinit = 0x40001b00; */
ic_mac_init = 0x40001b04;
/* ic_mac_init = 0x40001b04; */
ic_interface_enabled = 0x40001b08;
is_lmac_idle = 0x40001b0c;
/*lmacAdjustTimestamp = 0x40001b10;*/

View File

@@ -14,7 +14,7 @@ lmacTxDone = 0x4000162c;
/*lmacTxFrame = 0x40001630;*/
mac_tx_set_htsig = 0x40001638;
mac_tx_set_plcp1 = 0x40001640;
pm_check_state = 0x40001648;
/* pm_check_state = 0x40001648; */
/*pm_on_beacon_rx = 0x4000167c;*/
/*pm_parse_beacon = 0x40001688;*/
/*pm_process_tim = 0x4000168c;*/

View File

@@ -683,7 +683,7 @@ hal_mac_tx_get_blockack = 0x400015d0;
/* hal_mac_tx_set_ppdu = 0x400015d4;*/
ic_get_trc = 0x400015d8;
/* ic_mac_deinit = 0x400015dc; */
ic_mac_init = 0x400015e0;
/* ic_mac_init = 0x400015e0; */
ic_interface_enabled = 0x400015e4;
is_lmac_idle = 0x400015e8;
/*lmacAdjustTimestamp = 0x400015ec;*/

View File

@@ -53,7 +53,7 @@ hal_get_tsf_time = 0x40000c64;
hal_get_sta_tsf = 0x40000c68;
ic_get_trc = 0x40000c74;
ic_mac_deinit = 0x40000c78;
ic_mac_init = 0x40000c7c;
/* ic_mac_init = 0x40000c7c; */
ic_interface_enabled = 0x40000c80;
is_lmac_idle = 0x40000c84;
ic_get_he_rts_threshold_bytes = 0x40000c88;
@@ -104,7 +104,7 @@ mac_tx_set_tb = 0x40000d38;
mac_tx_set_mplen = 0x40000d3c;
mac_tx_set_txop_q = 0x40000d40;
mac_tx_set_pti = 0x40000d44;
pm_check_state = 0x40000d48;
/*pm_check_state = 0x40000d48;*/
pm_disable_dream_timer = 0x40000d4c;
pm_disable_sleep_delay_timer = 0x40000d50;
pm_dream = 0x40000d54;

View File

@@ -31,7 +31,7 @@ hal_mac_tx_get_blockack = 0x40000bfc;
//hal_mac_tx_set_ppdu = 0x40000c00;
ic_get_trc = 0x40000c04;
//ic_mac_deinit = 0x40000c08;
ic_mac_init = 0x40000c0c;
/* ic_mac_init = 0x40000c0c; */
ic_interface_enabled = 0x40000c10;
is_lmac_idle = 0x40000c14;
/*lmacAdjustTimestamp = 0x40000c18;*/

View File

@@ -51,7 +51,7 @@ hal_get_sta_tsf = 0x40000bd4;
tsf_hal_get_tbtt_interval = 0x40000bd8;
ic_get_trc = 0x40000be4;
ic_mac_deinit = 0x40000be8;
ic_mac_init = 0x40000bec;
/* ic_mac_init = 0x40000bec; */
ic_interface_enabled = 0x40000bf0;
is_lmac_idle = 0x40000bf4;
ic_get_he_rts_threshold_bytes = 0x40000bf8;
@@ -101,7 +101,7 @@ mac_tx_set_tb = 0x40000ca4;
mac_tx_set_mplen = 0x40000ca8;
mac_tx_set_txop_q = 0x40000cac;
mac_tx_set_pti = 0x40000cb0;
pm_check_state = 0x40000cb4;
/* pm_check_state = 0x40000cb4; */
pm_disable_dream_timer = 0x40000cb8;
pm_disable_sleep_delay_timer = 0x40000cbc;
pm_dream = 0x40000cc0;

View File

@@ -936,7 +936,7 @@ hal_mac_tx_get_blockack = 0x400052b0;
/* hal_mac_tx_set_ppdu = 0x400052bc;*/
ic_get_trc = 0x400052c8;
/* ic_mac_deinit = 0x400052d4; */
ic_mac_init = 0x400052e0;
/* ic_mac_init = 0x400052e0; */
ic_interface_enabled = 0x400052ec;
is_lmac_idle = 0x400052f8;
/*lmacAdjustTimestamp = 0x40005304;*/

View File

@@ -246,6 +246,7 @@ typedef struct {
wifi_scan_channel_bitmap_t channel_bitmap; /**< Channel bitmap for setting specific channels to be scanned.
Please note that the 'channel' parameter above needs to be set to 0 to allow scanning by bitmap.
Also, note that only allowed channels configured by wifi_country_t can be scanned. */
bool coex_background_scan; /**< Enable it to scan return home channel under coexist */
} wifi_scan_config_t;
/**