Merge branch 'feat/support_esp32c3_eco7_wifi_v5.0' into 'release/v5.0'

Backport/support esp32c3 v1.1 WiFi/BT/BLE(v5.0)

See merge request espressif/esp-idf!26756

components/esp_hw_support/port/esp32c3/Kconfig.hw_support

@@ -19,6 +19,8 @@ choice ESP32C3_REV_MIN
         bool "Rev v0.3 (ECO3)"
     config ESP32C3_REV_MIN_4
         bool "Rev v0.4 (ECO4)"
+    config ESP32C3_REV_MIN_101
+        bool "Rev v1.1"
 endchoice
 
 config ESP32C3_REV_MIN_FULL
@@ -28,6 +30,7 @@ config ESP32C3_REV_MIN_FULL
     default 2 if ESP32C3_REV_MIN_2
     default 3 if ESP32C3_REV_MIN_3
     default 4 if ESP32C3_REV_MIN_4
+    default 101 if ESP32C3_REV_MIN_101
 
 config ESP_REV_MIN_FULL
     int
@@ -45,9 +48,14 @@ config ESP_REV_MIN_FULL
 
 config ESP32C3_REV_MAX_FULL
     int
-    default 99
+    default 199 if ESP32C3_REV101_DEVELOPMENT
+    default 99 if !ESP32C3_REV101_DEVELOPMENT
     # keep in sync the "Maximum Supported Revision" description with this value
 
 config ESP_REV_MAX_FULL
     int
     default ESP32C3_REV_MAX_FULL
+
+config ESP32C3_REV101_DEVELOPMENT
+    bool "Develop on ESP32-C3 v1.1 (Preview)"
+    default y if IDF_CI_BUILD

components/esp_rom/CMakeLists.txt

@@ -201,6 +201,10 @@ else() # Regular app build
             rom_linker_script("eco3")
         endif()
 
+        if(CONFIG_ESP32C3_REV_MIN_FULL GREATER_EQUAL 101)
+            rom_linker_script("eco7")
+        endif()
+
     elseif(target STREQUAL "esp32h2")
         rom_linker_script("newlib")
         rom_linker_script("version")

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

@@ -1497,13 +1497,13 @@ ic_get_trc = 0x40001afc;
 ic_mac_init = 0x40001b04;
 ic_interface_enabled = 0x40001b08;
 is_lmac_idle = 0x40001b0c;
-lmacAdjustTimestamp = 0x40001b10;
+/*lmacAdjustTimestamp = 0x40001b10;*/
 lmacDiscardAgedMSDU = 0x40001b14;
 /*lmacDiscardMSDU = 0x40001b18;*/
 lmacEndFrameExchangeSequence = 0x40001b1c;
 lmacIsIdle = 0x40001b20;
 lmacIsLongFrame = 0x40001b24;
-lmacMSDUAged = 0x40001b28;
+/*lmacMSDUAged = 0x40001b28;*/
 lmacPostTxComplete = 0x40001b2c;
 lmacProcessAllTxTimeout = 0x40001b30;
 lmacProcessCollisions = 0x40001b34;
@@ -1520,7 +1520,7 @@ mac_tx_set_htsig = 0x40001b5c;
 mac_tx_set_plcp0 = 0x40001b60;
 mac_tx_set_plcp1 = 0x40001b64;
 mac_tx_set_plcp2 = 0x40001b68;
-pm_check_state = 0x40001b6c;
+/* pm_check_state = 0x40001b6c; */
 pm_disable_dream_timer = 0x40001b70;
 pm_disable_sleep_delay_timer = 0x40001b74;
 pm_dream = 0x40001b78;
@@ -1537,7 +1537,7 @@ pm_on_beacon_rx = 0x40001ba0;
 pm_on_data_rx = 0x40001ba4;
 pm_on_tbtt = 0x40001ba8;
 /* pm_parse_beacon = 0x40001bac;*/
-pm_process_tim = 0x40001bb0;
+/* pm_process_tim = 0x40001bb0; */
 /*pm_rx_beacon_process = 0x40001bb4;*/
 pm_rx_data_process = 0x40001bb8;
 /*pm_sleep = 0x40001bbc;*/
@@ -1631,7 +1631,7 @@ ppDequeueTxDone_Locked = 0x40001d18;
 ppProcTxDone = 0x40001d1c;
 /*pm_tx_data_done_process = 0x40001d20;*/
 config_is_cache_tx_buf_enabled = 0x40001d24;
-ppMapWaitTxq = 0x40001d28;
+/* ppMapWaitTxq = 0x40001d28; */
 ppProcessWaitingQueue = 0x40001d2c;
 ppDisableQueue = 0x40001d30;
 pm_allow_tx = 0x40001d34;
@@ -1729,18 +1729,18 @@ pp_timer_do_process = 0x40001ea0;
 rcUpdateAMPDUParam = 0x40001ea4;
 rcUpdatePhyMode = 0x40001ea8;
 rcGetHighestRateIdx = 0x40001eac;
-pm_tx_null_data_done_process = 0x40001eb0;
+/* pm_tx_null_data_done_process = 0x40001eb0; */
-pm_tx_data_process = 0x40001eb4;
+/* pm_tx_data_process = 0x40001eb4; */
 /* pm_attach = 0x40001eb8;*/
 pm_coex_schm_process = 0x40001ebc;
 ppInitTxq = 0x40001ec0;
 pp_attach = 0x40001ec4;
 pp_deattach = 0x40001ec8;
-pm_on_probe_resp_rx = 0x40001ecc;
+/* pm_on_probe_resp_rx = 0x40001ecc; */
 hal_set_sta_tsf = 0x40001ed0;
 ic_update_sta_tsf = 0x40001ed4;
 ic_tx_pkt = 0x40001ed8;
-pm_send_probe_stop = 0x40001edc;
+/* pm_send_probe_stop = 0x40001edc; */
 pm_send_probe_start = 0x40001ee0;
 pm_on_coex_schm_process_restart = 0x40001ee4;
 hal_mac_set_rxq_policy = 0x40001ee8;
@@ -1880,7 +1880,7 @@ ieee80211_recycle_cache_eb = 0x40001fe8;
 ieee80211_search_node = 0x40001fec;
 roundup2 = 0x40001ff0;
 ieee80211_crypto_encap = 0x40001ff4;
-ieee80211_crypto_decap = 0x40001ff8;
+/* ieee80211_crypto_decap = 0x40001ff8; */
 ieee80211_decap = 0x40001ffc;
 ieee80211_set_tx_pti = 0x40002000;
 wifi_is_started = 0x40002004;
@@ -1915,7 +1915,7 @@ wifi_get_init_state = 0x40002088;
 cnx_coexist_timeout = 0x40002090;
 /* sta_recv_mgmt = 0x40002094;*/
 ieee80211_send_setup = 0x40002098;
-ieee80211_send_probereq = 0x4000209c;
+/* ieee80211_send_probereq = 0x4000209c; */
 sta_auth_shared = 0x400020a4;
 cnx_coexist_timeout_process = 0x400020ac;
 ieee80211_alloc_challenge = 0x400020b0;

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

@@ -55,22 +55,13 @@ r_lld_ext_adv_dynamic_pti_get = 0x40001b40;
 r_lld_ext_adv_dynamic_aux_pti_process = 0x40001b44;
 r_lld_ext_adv_dynamic_pti_process = 0x40001b48;
 r_lld_adv_ext_pkt_prepare_set = 0x40001b4c;
-/*
-r_lld_adv_ext_chain_none_construct = 0x40001b50;
-*/
 r_lld_adv_ext_chain_connectable_construct = 0x40001b54;
-/*
-r_lld_adv_ext_chain_scannable_construct = 0x40001b58;
-*/
 r_lld_adv_pkt_rx_connect_post = 0x40001b5c;
 r_lld_adv_start_init_evt_param = 0x40001b60;
 r_lld_adv_start_set_cs = 0x40001b64;
 r_lld_adv_start_update_filter_policy = 0x40001b68;
 r_lld_adv_start_schedule_asap = 0x40001b6c;
 r_lld_con_tx_prog_new_packet_coex = 0x40001b70;
-/*
-r_lld_con_tx_prog_new_packet = 0x40001b74;
-*/
 r_lld_per_adv_dynamic_pti_get = 0x40001b78;
 r_lld_per_adv_evt_start_chm_upd = 0x40001b7c;
 r_lld_ext_scan_dynamic_pti_get = 0x40001b80;

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

@@ -0,0 +1,245 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+esf_buf_alloc = 0x400015bc;
+esf_buf_alloc_dynamic = 0x400015c0;
+esf_buf_recycle = 0x400015c4;
+hal_mac_tx_set_ppdu = 0x400015d4;
+ic_mac_deinit = 0x400015dc;
+lmacDiscardMSDU = 0x400015f4;
+/*lmacSetTxFrame = 0x40001628;*/
+lmacTxDone = 0x4000162c;
+lmacTxFrame = 0x40001630;
+mac_tx_set_htsig = 0x40001638;
+mac_tx_set_plcp1 = 0x40001640;
+pm_check_state = 0x40001648;
+pm_on_beacon_rx = 0x4000167c;
+/*pm_parse_beacon = 0x40001688;*/
+pm_process_tim = 0x4000168c;
+pm_rx_beacon_process = 0x40001690;
+pm_rx_data_process = 0x40001694;
+/*pm_sleep = 0x40001698;*/
+/*pm_tbtt_process = 0x400016a0;*/
+ppMapTxQueue = 0x400016d8;
+ppProcTxSecFrame = 0x400016dc;
+ppRxFragmentProc = 0x40001704;
+/*rcGetSched = 0x40001764;*/
+rcTxUpdatePer = 0x40001770;
+rcUpdateTxDone = 0x4000177c;
+wDevCheckBlockError = 0x400017b4;
+/*wDev_IndicateFrame = 0x400017c8;*/
+wDev_ProcessFiq = 0x400017f0;
+wDev_ProcessRxSucData = 0x400017f4;
+ppProcTxDone = 0x40001804;
+pm_tx_data_done_process = 0x40001808;
+ppMapWaitTxq = 0x40001810;
+ieee80211_encap_esfbuf = 0x4000185c;
+sta_input = 0x40001870;
+ieee80211_crypto_decap = 0x4000189c;
+ieee80211_decap = 0x400018a0;
+coex_core_timer_idx_get = 0x400018d0;
+rom1_chip_i2c_readReg = 0x40001924;
+rom1_chip_i2c_writeReg = 0x40001928;
+rom_index_to_txbbgain = 0x40001964;
+rom_pbus_xpd_tx_on = 0x400019b0;
+rom1_set_noise_floor = 0x400019e8;
+rom_set_tx_dig_gain = 0x400019f0;
+rom_set_txcap_reg = 0x400019f4;
+rom_txbbgain_to_index = 0x40001a0c;
+rom1_disable_wifi_agc = 0x40001a1c;
+rom1_enable_wifi_agc = 0x40001a20;
+rom1_tx_paon_set = 0x40001a44;
+rom_agc_reg_init = 0x40001a54;
+rom_bb_reg_init = 0x40001a58;
+rom1_set_pbus_reg = 0x40001a70;
+rom_phy_xpd_rf = 0x40001a78;
+rom_write_txrate_power_offset = 0x40001a8c;
+rom1_get_rate_fcc_index = 0x40001a90;
+rom1_read_sar2_code = 0x40001aa4;
+rom2_temp_to_power1 = 0x40001ab4;
+rom1_get_i2c_hostid = 0x40001ac8;
+rom_open_i2c_xpd = 0x40001af8;
+rom2_tsens_read_init1 = 0x40001b00;
+rom_tsens_code_read = 0x40001b04;
+rom_tsens_dac_cal = 0x40001b10;
+rom1_phy_en_hw_set_freq = 0x40001b20;
+rom1_phy_dis_hw_set_freq = 0x40001b24;
+rom_pll_vol_cal = 0x40001b28;
+
+rom1_bt_get_tx_gain = 0x40001bb8;
+rom1_get_chan_target_power = 0x40001bbc;
+rom2_get_tx_gain_value1 = 0x40001bc0;
+rom1_wifi_tx_dig_gain = 0x40001bc4;
+rom1_wifi_get_tx_gain = 0x40001bc8;
+rom1_fe_i2c_reg_renew = 0x40001bcc;
+rom1_i2c_master_reset = 0x40001bd4;
+rom1_phy_wakeup_init = 0x40001bf0;
+rom1_phy_i2c_init1 = 0x40001bf4;
+rom1_tsens_temp_read = 0x40001bf8;
+rom1_bt_track_pll_cap = 0x40001bfc;
+rom1_wifi_set_tx_gain = 0x40001c04;
+rom1_txpwr_cal_track = 0x40001c08;
+rom1_bt_set_tx_gain = 0x40001c10;
+rom1_phy_close_rf = 0x40001c18;
+
+
+/***************************************
+ Group eco7_uart
+ ***************************************/
+
+/* Functions */
+uart_tx_switch = 0x40001c44;
+
+
+/***************************************
+ Group eco7_bluetooth
+ ***************************************/
+
+/* Functions */
+r_lld_con_count_get = 0x40001c48;
+r_lld_update_con_offset = 0x40001c4c;
+r_lld_con_update_last_clock = 0x40001c50;
+r_lld_con_llcp_ind_info_clear = 0x40001c54;
+r_lld_con_update_terminte_info_init = 0x40001c58;
+r_lld_con_terminate_max_evt_update = 0x40001c5c;
+r_llc_pref_param_compute_eco = 0x40001ce8;
+r_llc_hci_con_upd_info_send_eco = 0x40001cec;
+r_llc_rem_encrypt_proc_continue_eco = 0x40001cf0;
+r_llc_llcp_send_eco = 0x40001cf4;
+r_llc_start_eco = 0x40001cf8;
+r_lld_ext_adv_dynamic_aux_pti_process_eco = 0x40001cfc;
+r_lld_adv_start_eco = 0x40001d04;
+r_lld_con_evt_canceled_cbk_eco = 0x40001d08;
+r_lld_con_evt_time_update_eco = 0x40001d0c;
+r_lld_con_start_eco = 0x40001d10;
+r_lld_con_frm_isr_eco = 0x40001d14;
+r_lld_con_tx_eco = 0x40001d18;
+r_lld_con_evt_start_cbk_eco = 0x40001d1c;
+r_lld_scan_evt_start_cbk_eco = 0x40001d20;
+r_lld_scan_start_eco = 0x40001d24;
+r_lld_ext_scan_dynamic_pti_process_eco = 0x40001d28;
+r_lld_scan_frm_eof_isr_eco = 0x40001d2c;
+r_lld_sync_start_eco = 0x40001d30;
+r_lld_sync_insert_eco = 0x40001d34;
+r_llm_adv_rep_flow_control_update_eco = 0x40001d38;
+r_llm_env_adv_dup_filt_init_eco = 0x40001d3c;
+r_llm_env_adv_dup_filt_deinit_eco = 0x40001d40;
+r_llm_adv_rep_flow_control_check_eco = 0x40001d44;
+r_llm_scan_start_eco = 0x40001d48;
+r_llm_update_duplicate_scan_count = 0x40001d4c;
+r_llc_hci_command_handler_pre = 0x40001d50;
+r_llc_hci_command_handler_get = 0x40001d54;
+r_llc_hci_command_handler_search = 0x40001d58;
+r_llc_llcp_pdu_handler_get_overwrite = 0x40001d5c;
+r_llc_llcp_pdu_handler_pre = 0x40001d60;
+r_llc_llcp_pdu_handler_end = 0x40001d64;
+r_llc_llcp_channel_map_ind_ack = 0x40001d68;
+r_llc_con_conflict_check = 0x40001d6c;
+r_sch_prog_hw_reset_try = 0x40001d70;
+r_sch_prog_et_state_reset = 0x40001d74;
+r_sch_prog_end_isr_handler = 0x40001d78;
+r_sch_plan_conflict_check = 0x40001d7c;
+r_rwble_isr_hw_fixed = 0x40001d80;
+r_bt_bb_recorrect_is_dead = 0x40001d84;
+r_bt_bb_restart_hw_recorrect = 0x40001d88;
+r_btdm_task_post_impl = 0x40001d8c;
+r_btdm_task_post_from_isr_impl = 0x40001d90;
+r_btdm_vnd_offload_post_from_isr = 0x40001d94;
+r_btdm_vnd_offload_post = 0x40001d98;
+r_btdm_vnd_offload_process = 0x40001d9c;
+r_ke_task_handler_pre = 0x40001da0;
+r_ke_task_handler_end = 0x40001da4;
+r_ke_task_handler_get_overwrite = 0x40001da8;
+r_lld_scan_try_sched_eco = 0x40001dac;
+r_lld_scan_frm_skip_isr_eco = 0x40001db0;
+r_lld_ext_scan_dynamic_pti_reset = 0x40001db4;
+r_llc_rem_phy_upd_proc_continue_eco = 0x40001db8;
+r_llm_get_preferred_phys = 0x40001dbc;
+r_lld_hw_cca_isr_eco = 0x40001dc0;
+r_lld_sw_cca_isr_eco = 0x40001dc4;
+r_lld_cca_chan_prn_e = 0x40001dc8;
+r_lld_cca_chan_prn_s = 0x40001dcc;
+r_lld_cca_chan_sel_remap = 0x40001dd0;
+r_lld_cca_chan_sel_1 = 0x40001dd4;
+r_lld_cca_chan_sel_2 = 0x40001dd8;
+r_lld_cca_set_thresh = 0x40001ddc;
+r_lld_cca_con_start = 0x40001de0;
+r_lld_cca_con_end = 0x40001de4;
+r_lld_cca_chm_restore = 0x40001de8;
+r_lld_cca_chan_unused_check = 0x40001dec;
+r_lld_cca_chm_update_check = 0x40001df0;
+r_lld_cca_busy_mode_handle = 0x40001df4;
+r_lld_cca_lbt_handle = 0x40001df8;
+r_lld_cca_scst_timeout_check = 0x40001dfc;
+r_lld_cca_chan_avl_timeout_check = 0x40001e00;
+
+r_lld_scan_start_hook = 0x40001c74;
+r_lld_con_start_hook = 0x40001ca8;
+r_lld_init_start_hook = 0x40001cb8;
+
+/* ble Functions eco */
+r_bt_bb_isr = 0x40000b9c;
+r_bt_rf_coex_conn_phy_coded_data_time_limit_en_get = 0x40000ba8;
+r_bt_rtp_get_txpwr_idx_by_act = 0x40000c00;
+r_btdm_task_post = 0x40000c14;
+r_btdm_task_post_from_isr = 0x40000c18;
+r_btdm_task_recycle = 0x40000c1c;
+r_hci_register_vendor_desc_tab = 0x40000d9c;
+r_ke_task_schedule = 0x40000e80;
+r_llc_hci_command_handler = 0x40000ef0;
+r_llc_loc_con_upd_proc_continue = 0x40000f60;
+r_llc_loc_phy_upd_proc_continue = 0x40000f78;
+r_llc_rem_con_upd_proc_continue = 0x40000fb4;
+r_lld_con_sched = 0x40001118;
+r_lld_con_stop = 0x40001124;
+r_lld_llcp_rx_ind_handler = 0x400011b0;
+r_lld_per_adv_sched = 0x400011f8;
+r_lld_scan_process_pkt_rx_adv_rep = 0x40001284;
+r_register_esp_vendor_cmd_handler = 0x40001400;
+r_rf_txpwr_cs_get = 0x40001428;
+r_rf_txpwr_dbm_get = 0x4000142c;
+r_rwble_isr = 0x40001464;
+r_sch_arb_event_start_isr = 0x400014f8;
+r_sch_plan_set = 0x40001534;
+r_sch_prog_end_isr = 0x40001538;
+r_lld_adv_ext_chain_scannable_construct = 0x40001b58;
+r_lld_con_tx_prog_new_packet = 0x40001b74;
+
+r_lld_scan_process_pkt_rx = 0x40001280;
+r_llm_le_features_get = 0x400013b0;
+r_lld_adv_ext_chain_none_construct = 0x40001b50;
+
+/* ble functions rename */
+r_lld_init_start_hack = 0x400011a4;
+
+/* ble functions disable */
+/*
+r_lld_adv_frm_isr_eco = 0x40001d00;
+r_lld_res_list_clear = 0x40004638;
+r_lld_res_list_rem = 0x40004680;
+r_lld_adv_start_hook = 0x40001c80;
+*/
+
+
+/***************************************
+ Group eco7_phy
+ ***************************************/
+
+/* Functions */
+rom2_pll_cap_mem_update = 0x40001e04;
+rom2_phy_i2c_enter_critical = 0x40001e08;
+rom2_phy_i2c_exit_critical = 0x40001e0c;
+rom2_rfpll_cap_correct = 0x40001e10;
+rom2_write_pll_cap = 0x40001e14;
+rom2_read_pll_cap = 0x40001e18;
+rom2_tester_wifi_cali = 0x40001e1c;
+rom2_wait_hw_freq_busy = 0x40001e20;
+rom2_rfpll_cap_track = 0x40001e24;
+rom2_ulp_code_track = 0x40001e28;
+rom2_ulp_ext_code_set = 0x40001e2c;
+rom2_phy_set_tsens_power = 0x40001e30;
+rom2_phy_get_tsens_value = 0x40001e34;
+rom_mac_tx_chan_offset = 0x40001e38;
+rom_rx_gain_force = 0x40001e3c;

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

@@ -703,14 +703,8 @@ r_ble_util_data_rx_buf_reset = 0x40000b8c;
 r_bt_bb_get_intr_mask = 0x40000b90;
 r_bt_bb_intr_clear = 0x40000b94;
 r_bt_bb_intr_mask_set = 0x40000b98;
-/*
-r_bt_bb_isr = 0x40000b9c;
-*/
 r_bt_rf_coex_cfg_set = 0x40000ba0;
 r_bt_rf_coex_conn_dynamic_pti_en_get = 0x40000ba4;
-/*
-r_bt_rf_coex_conn_phy_coded_data_time_limit_en_get = 0x40000ba8;
-*/
 r_bt_rf_coex_ext_adv_dynamic_pti_en_get = 0x40000bac;
 r_bt_rf_coex_ext_scan_dynamic_pti_en_get = 0x40000bb0;
 r_bt_rf_coex_legacy_adv_dynamic_pti_en_get = 0x40000bb4;
@@ -732,18 +726,10 @@ r_bt_rtp_apply_rule_cs_fmt = 0x40000bf0;
 r_bt_rtp_apply_rule_cs_idx = 0x40000bf4;
 r_bt_rtp_deregister_rule_cs_fmt = 0x40000bf8;
 r_bt_rtp_deregister_rule_cs_idx = 0x40000bfc;
-/*
-r_bt_rtp_get_txpwr_idx_by_act = 0x40000c00;
-*/
 r_bt_rtp_init = 0x40000c04;
 r_bt_rtp_register_rule_cs_fmt = 0x40000c08;
 r_bt_rtp_register_rule_cs_idx = 0x40000c0c;
 r_btdm_isr = 0x40000c10;
-/*
-r_btdm_task_post = 0x40000c14;
-r_btdm_task_post_from_isr = 0x40000c18;
-r_btdm_task_recycle = 0x40000c1c;
-*/
 r_cali_phase_match_p = 0x40000c20;
 r_cmp_abs_time = 0x40000c24;
 r_cmp_dest_id = 0x40000c28;
@@ -839,9 +825,6 @@ r_hci_look_for_evt_desc = 0x40000d8c;
 r_hci_look_for_le_evt_desc = 0x40000d90;
 r_hci_look_for_le_evt_desc_esp = 0x40000d94;
 r_hci_pack_bytes = 0x40000d98;
-/*
-r_hci_register_vendor_desc_tab = 0x40000d9c;
-*/
 r_hci_send_2_controller = 0x40000da0;
 r_hci_send_2_host = 0x40000da4;
 r_hci_tl_c2h_data_flow_on = 0x40000da8;
@@ -898,9 +881,6 @@ r_ke_task_handler_get = 0x40000e70;
 r_ke_task_init = 0x40000e74;
 r_ke_task_msg_flush = 0x40000e78;
 r_ke_task_saved_update = 0x40000e7c;
-/*
-r_ke_task_schedule = 0x40000e80;
-*/
 r_ke_time = 0x40000e84;
 r_ke_time_cmp = 0x40000e88;
 r_ke_time_past = 0x40000e8c;
@@ -928,9 +908,6 @@ r_llc_dl_chg_check = 0x40000ee0;
 r_llc_dle_proc_err_cb = 0x40000ee4;
 r_llc_feats_exch_proc_err_cb = 0x40000ee8;
 r_llc_hci_cmd_handler_tab_p_get = 0x40000eec;
-/*
-r_llc_hci_command_handler = 0x40000ef0;
-*/
 r_llc_hci_con_param_req_evt_send = 0x40000ef4;
 r_llc_hci_con_upd_info_send = 0x40000ef8;
 r_llc_hci_disconnected_dis = 0x40000efc;
@@ -958,17 +935,11 @@ r_llc_llcp_state_set = 0x40000f50;
 r_llc_llcp_trans_timer_set = 0x40000f54;
 r_llc_llcp_tx_check = 0x40000f58;
 r_llc_loc_ch_map_proc_continue = 0x40000f5c;
-/*
-r_llc_loc_con_upd_proc_continue = 0x40000f60;
-*/
 r_llc_loc_con_upd_proc_err_cb = 0x40000f64;
 r_llc_loc_dl_upd_proc_continue = 0x40000f68;
 r_llc_loc_encrypt_proc_continue = 0x40000f6c;
 r_llc_loc_encrypt_proc_err_cb = 0x40000f70;
 r_llc_loc_feats_exch_proc_continue = 0x40000f74;
-/*
-r_llc_loc_phy_upd_proc_continue = 0x40000f78;
-*/
 r_llc_loc_phy_upd_proc_err_cb = 0x40000f7c;
 r_llc_msg_handler_tab_p_get = 0x40000f80;
 r_llc_pref_param_compute = 0x40000f84;
@@ -983,9 +954,6 @@ r_llc_proc_timer_pause_set = 0x40000fa4;
 r_llc_proc_timer_set = 0x40000fa8;
 r_llc_proc_unreg = 0x40000fac;
 r_llc_rem_ch_map_proc_continue = 0x40000fb0;
-/*
-r_llc_rem_con_upd_proc_continue = 0x40000fb4;
-*/
 r_llc_rem_con_upd_proc_err_cb = 0x40000fb8;
 r_llc_rem_dl_upd_proc = 0x40000fbc;
 r_llc_rem_encrypt_proc_continue = 0x40000fc0;
@@ -1074,14 +1042,8 @@ r_lld_con_rx_isr = 0x40001108;
 r_lld_con_rx_link_info_check = 0x4000110c;
 r_lld_con_rx_llcp_check = 0x40001110;
 r_lld_con_rx_sync_time_update = 0x40001114;
-/*
-r_lld_con_sched = 0x40001118;
-*/
 r_lld_con_set_tx_power = 0x4000111c;
 r_lld_con_start = 0x40001120;
-/*
-r_lld_con_stop = 0x40001124;
-*/
 r_lld_con_tx = 0x40001128;
 r_lld_con_tx_enc = 0x4000112c;
 r_lld_con_tx_isr = 0x40001130;
@@ -1116,9 +1078,6 @@ r_lld_init_set_tx_power = 0x400011a0;
 r_lld_init_start = 0x400011a4;
 r_lld_init_stop = 0x400011a8;
 r_lld_instant_proc_end = 0x400011ac;
-/*
-r_lld_llcp_rx_ind_handler = 0x400011b0;
-*/
 r_lld_per_adv_ch_map_update = 0x400011b4;
 r_lld_per_adv_chain_construct = 0x400011b8;
 r_lld_per_adv_cleanup = 0x400011bc;
@@ -1136,9 +1095,6 @@ r_lld_per_adv_init = 0x400011e8;
 r_lld_per_adv_init_info_get = 0x400011ec;
 r_lld_per_adv_list_add = 0x400011f0;
 r_lld_per_adv_list_rem = 0x400011f4;
-/*
-r_lld_per_adv_sched = 0x400011f8;
-*/
 r_lld_per_adv_set_tx_power = 0x400011fc;
 r_lld_per_adv_start = 0x40001200;
 r_lld_per_adv_stop = 0x40001204;
@@ -1147,17 +1103,11 @@ r_lld_process_cca_data = 0x4000120c;
 r_lld_ral_search = 0x40001210;
 r_lld_read_clock = 0x40001214;
 r_lld_res_list_add = 0x40001218;
-/*
-r_lld_res_list_clear = 0x4000121c;
-*/
 r_lld_res_list_is_empty = 0x40001220;
 r_lld_res_list_local_rpa_get = 0x40001224;
 r_lld_res_list_peer_rpa_get = 0x40001228;
 r_lld_res_list_peer_update = 0x4000122c;
 r_lld_res_list_priv_mode_update = 0x40001230;
-/*
-r_lld_res_list_rem = 0x40001234;
-*/
 r_lld_reset_reg = 0x40001238;
 r_lld_rpa_renew = 0x4000123c;
 r_lld_rpa_renew_evt_canceled_cbk = 0x40001240;
@@ -1176,10 +1126,6 @@ r_lld_scan_frm_rx_isr = 0x40001270;
 r_lld_scan_frm_skip_isr = 0x40001274;
 r_lld_scan_init = 0x40001278;
 r_lld_scan_params_update = 0x4000127c;
-/*
-r_lld_scan_process_pkt_rx = 0x40001280;
-r_lld_scan_process_pkt_rx_adv_rep = 0x40001284;
-*/
 r_lld_scan_process_pkt_rx_aux_adv_ind = 0x40001288;
 r_lld_scan_process_pkt_rx_aux_chain_ind = 0x4000128c;
 r_lld_scan_process_pkt_rx_aux_scan_rsp = 0x40001290;
@@ -1254,9 +1200,6 @@ r_llm_is_dev_synced = 0x400013a0;
 r_llm_is_non_con_act_ongoing_check = 0x400013a4;
 r_llm_is_wl_accessible = 0x400013a8;
 r_llm_le_evt_mask_check = 0x400013ac;
-/*
-r_llm_le_features_get = 0x400013b0;
-*/
 r_llm_link_disc = 0x400013b4;
 r_llm_master_ch_map_get = 0x400013b8;
 r_llm_msg_handler_tab_p_get = 0x400013bc;
@@ -1276,9 +1219,6 @@ r_misc_msg_handler_tab_p_get = 0x400013f0;
 r_notEqual256 = 0x400013f4;
 r_phy_upd_proc_start = 0x400013f8;
 r_platform_reset = 0x400013fc;
-/*
-r_register_esp_vendor_cmd_handler = 0x40001400;
-*/
 r_rf_em_init = 0x40001404;
 r_rf_force_agc_enable = 0x40001408;
 r_rf_reg_rd = 0x4000140c;
@@ -1288,10 +1228,6 @@ r_rf_rssi_convert = 0x40001418;
 r_rf_rw_v9_le_disable = 0x4000141c;
 r_rf_rw_v9_le_enable = 0x40001420;
 r_rf_sleep = 0x40001424;
-/*
-r_rf_txpwr_cs_get = 0x40001428;
-r_rf_txpwr_dbm_get = 0x4000142c;
-*/
 r_rf_util_cs_fmt_convert = 0x40001430;
 r_rw_crypto_aes_ccm = 0x40001434;
 r_rw_crypto_aes_encrypt = 0x40001438;
@@ -1305,9 +1241,6 @@ r_rw_crypto_aes_result_handler = 0x40001454;
 r_rw_crypto_aes_s1 = 0x40001458;
 r_rw_cryto_aes_cmac = 0x4000145c;
 r_rw_v9_init_em_radio_table = 0x40001460;
-/*
-r_rwble_isr = 0x40001464;
-*/
 r_rwble_sleep_enter = 0x40001468;
 r_rwble_sleep_wakeup_end = 0x4000146c;
 r_rwbtdm_isr_wrapper = 0x40001470;
@@ -1344,9 +1277,6 @@ r_sch_alarm_set = 0x400014e8;
 r_sch_alarm_timer_isr = 0x400014ec;
 r_sch_arb_conflict_check = 0x400014f0;
 r_sch_arb_elt_cancel = 0x400014f4;
-/*
-r_sch_arb_event_start_isr = 0x400014f8;
-*/
 r_sch_arb_init = 0x400014fc;
 r_sch_arb_insert = 0x40001500;
 r_sch_arb_prog_timer = 0x40001504;
@@ -1361,10 +1291,6 @@ r_sch_plan_offset_req = 0x40001524;
 r_sch_plan_position_range_compute = 0x40001528;
 r_sch_plan_rem = 0x4000152c;
 r_sch_plan_req = 0x40001530;
-/*
-r_sch_plan_set = 0x40001534;
-r_sch_prog_end_isr = 0x40001538;
-*/
 r_sch_prog_init = 0x4000153c;
 r_sch_prog_push = 0x40001540;
 r_sch_prog_rx_isr = 0x40001544;
@@ -1543,14 +1469,8 @@ r_llc_loc_phy_upd_proc_continue_hook = 0x40001c64;
 r_llc_rem_phy_upd_proc_continue_hook = 0x40001c68;
 r_lld_scan_frm_eof_isr_hook = 0x40001c6c;
 r_lld_scan_evt_start_cbk_hook = 0x40001c70;
-/*
-r_lld_scan_start_hook = 0x40001c74;
-*/
 r_lld_scan_process_pkt_rx_ext_adv_hook = 0x40001c78;
 r_lld_scan_sched_hook = 0x40001c7c;
-/*
-r_lld_adv_start_hook = 0x40001c80;
-*/
 r_lld_adv_evt_start_cbk_hook = 0x40001c84;
 r_lld_adv_aux_evt_start_cbk_hook = 0x40001c88;
 r_lld_adv_frm_isr_hook = 0x40001c8c;
@@ -1560,15 +1480,9 @@ r_lld_con_frm_isr_hook = 0x40001c98;
 r_lld_con_tx_hook = 0x40001c9c;
 r_lld_con_rx_hook = 0x40001ca0;
 r_lld_con_evt_start_cbk_hook = 0x40001ca4;
-/*
-r_lld_con_start_hook = 0x40001ca8;
-*/
 r_lld_con_tx_prog_new_packet_hook = 0x40001cac;
 r_lld_init_frm_eof_isr_hook = 0x40001cb0;
 r_lld_init_evt_start_cbk_hook = 0x40001cb4;
-/*
-r_lld_init_start_hook = 0x40001cb8;
-*/
 r_lld_init_sched_hook = 0x40001cbc;
 r_lld_init_process_pkt_tx_hook = 0x40001cc0;
 r_lld_per_adv_evt_start_cbk_hook = 0x40001cc4;
@@ -1599,13 +1513,13 @@ ic_get_trc = 0x400015d8;
 ic_mac_init = 0x400015e0;
 ic_interface_enabled = 0x400015e4;
 is_lmac_idle = 0x400015e8;
-lmacAdjustTimestamp = 0x400015ec;
+/*lmacAdjustTimestamp = 0x400015ec;*/
 lmacDiscardAgedMSDU = 0x400015f0;
 /*lmacDiscardMSDU = 0x400015f4;*/
 lmacEndFrameExchangeSequence = 0x400015f8;
 lmacIsIdle = 0x400015fc;
 lmacIsLongFrame = 0x40001600;
-lmacMSDUAged = 0x40001604;
+/*lmacMSDUAged = 0x40001604;*/
 lmacPostTxComplete = 0x40001608;
 lmacProcessAllTxTimeout = 0x4000160c;
 lmacProcessCollisions = 0x40001610;
@@ -1621,7 +1535,7 @@ mac_tx_set_duration = 0x40001634;
 mac_tx_set_plcp0 = 0x4000163c;
 /* mac_tx_set_plcp1 = 0x40001640;*/
 mac_tx_set_plcp2 = 0x40001644;
-pm_check_state = 0x40001648;
+/* pm_check_state = 0x40001648; */
 pm_disable_dream_timer = 0x4000164c;
 pm_disable_sleep_delay_timer = 0x40001650;
 pm_dream = 0x40001654;
@@ -1638,7 +1552,7 @@ pm_keep_alive = 0x40001678;
 pm_on_data_rx = 0x40001680;
 pm_on_tbtt = 0x40001684;
 /* pm_parse_beacon = 0x40001688;*/
-pm_process_tim = 0x4000168c;
+/* pm_process_tim = 0x4000168c; */
 /*pm_rx_beacon_process = 0x40001690;*/
 pm_rx_data_process = 0x40001694;
 /*pm_sleep = 0x40001698;*/
@@ -1730,7 +1644,7 @@ wdev_csi_len_align = 0x400017fc;
 ppDequeueTxDone_Locked = 0x40001800;
 /*pm_tx_data_done_process = 0x40001808;*/
 config_is_cache_tx_buf_enabled = 0x4000180c;
-ppMapWaitTxq = 0x40001810;
+/* ppMapWaitTxq = 0x40001810; */
 ppProcessWaitingQueue = 0x40001814;
 ppDisableQueue = 0x40001818;
 pm_allow_tx = 0x4000181c;

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

@@ -976,14 +976,8 @@ r_ble_util_data_rx_buf_reset = 0x40003288;
 r_bt_bb_get_intr_mask = 0x40003294;
 r_bt_bb_intr_clear = 0x400032a0;
 r_bt_bb_intr_mask_set = 0x400032ac;
-/*
-r_bt_bb_isr = 0x400032b8;
-*/
 r_bt_rf_coex_cfg_set = 0x400032c4;
 r_bt_rf_coex_conn_dynamic_pti_en_get = 0x400032d0;
-/*
-r_bt_rf_coex_conn_phy_coded_data_time_limit_en_get = 0x400032dc;
-*/
 r_bt_rf_coex_ext_adv_dynamic_pti_en_get = 0x400032e8;
 r_bt_rf_coex_ext_scan_dynamic_pti_en_get = 0x400032f4;
 r_bt_rf_coex_legacy_adv_dynamic_pti_en_get = 0x40003300;
@@ -1005,18 +999,10 @@ r_bt_rtp_apply_rule_cs_fmt = 0x400033b4;
 r_bt_rtp_apply_rule_cs_idx = 0x400033c0;
 r_bt_rtp_deregister_rule_cs_fmt = 0x400033cc;
 r_bt_rtp_deregister_rule_cs_idx = 0x400033d8;
-/*
-r_bt_rtp_get_txpwr_idx_by_act = 0x400033e4;
-*/
 r_bt_rtp_init = 0x400033f0;
 r_bt_rtp_register_rule_cs_fmt = 0x400033fc;
 r_bt_rtp_register_rule_cs_idx = 0x40003408;
 r_btdm_isr = 0x40003414;
-/*
-r_btdm_task_post = 0x40003420;
-r_btdm_task_post_from_isr = 0x4000342c;
-r_btdm_task_recycle = 0x40003438;
-*/
 r_cali_phase_match_p = 0x40003444;
 r_cmp_abs_time = 0x40003450;
 r_cmp_dest_id = 0x4000345c;
@@ -1112,9 +1098,6 @@ r_hci_look_for_evt_desc = 0x40003888;
 r_hci_look_for_le_evt_desc = 0x40003894;
 r_hci_look_for_le_evt_desc_esp = 0x400038a0;
 r_hci_pack_bytes = 0x400038ac;
-/*
-r_hci_register_vendor_desc_tab = 0x400038b8;
-*/
 r_hci_send_2_controller = 0x400038c4;
 r_hci_send_2_host = 0x400038d0;
 r_hci_tl_c2h_data_flow_on = 0x400038dc;
@@ -1171,9 +1154,6 @@ r_ke_task_handler_get = 0x40003b34;
 r_ke_task_init = 0x40003b40;
 r_ke_task_msg_flush = 0x40003b4c;
 r_ke_task_saved_update = 0x40003b58;
-/*
-r_ke_task_schedule = 0x40003b64;
-*/
 r_ke_time = 0x40003b70;
 r_ke_time_cmp = 0x40003b7c;
 r_ke_time_past = 0x40003b88;
@@ -1201,9 +1181,6 @@ r_llc_dl_chg_check = 0x40003c84;
 r_llc_dle_proc_err_cb = 0x40003c90;
 r_llc_feats_exch_proc_err_cb = 0x40003c9c;
 r_llc_hci_cmd_handler_tab_p_get = 0x40003ca8;
-/*
-r_llc_hci_command_handler = 0x40003cb4;
-*/
 r_llc_hci_con_param_req_evt_send = 0x40003cc0;
 r_llc_hci_con_upd_info_send = 0x40003ccc;
 r_llc_hci_disconnected_dis = 0x40003cd8;
@@ -1231,17 +1208,11 @@ r_llc_llcp_state_set = 0x40003dd4;
 r_llc_llcp_trans_timer_set = 0x40003de0;
 r_llc_llcp_tx_check = 0x40003dec;
 r_llc_loc_ch_map_proc_continue = 0x40003df8;
-/*
-r_llc_loc_con_upd_proc_continue = 0x40003e04;
-*/
 r_llc_loc_con_upd_proc_err_cb = 0x40003e10;
 r_llc_loc_dl_upd_proc_continue = 0x40003e1c;
 r_llc_loc_encrypt_proc_continue = 0x40003e28;
 r_llc_loc_encrypt_proc_err_cb = 0x40003e34;
 r_llc_loc_feats_exch_proc_continue = 0x40003e40;
-/*
-r_llc_loc_phy_upd_proc_continue = 0x40003e4c;
-*/
 r_llc_loc_phy_upd_proc_err_cb = 0x40003e58;
 r_llc_msg_handler_tab_p_get = 0x40003e64;
 r_llc_pref_param_compute = 0x40003e70;
@@ -1256,9 +1227,6 @@ r_llc_proc_timer_pause_set = 0x40003ed0;
 r_llc_proc_timer_set = 0x40003edc;
 r_llc_proc_unreg = 0x40003ee8;
 r_llc_rem_ch_map_proc_continue = 0x40003ef4;
-/*
-r_llc_rem_con_upd_proc_continue = 0x40003f00;
-*/
 r_llc_rem_con_upd_proc_err_cb = 0x40003f0c;
 r_llc_rem_dl_upd_proc = 0x40003f18;
 r_llc_rem_encrypt_proc_continue = 0x40003f24;
@@ -1347,14 +1315,8 @@ r_lld_con_rx_isr = 0x400042fc;
 r_lld_con_rx_link_info_check = 0x40004308;
 r_lld_con_rx_llcp_check = 0x40004314;
 r_lld_con_rx_sync_time_update = 0x40004320;
-/*
-r_lld_con_sched = 0x4000432c;
-*/
 r_lld_con_set_tx_power = 0x40004338;
 r_lld_con_start = 0x40004344;
-/*
-r_lld_con_stop = 0x40004350;
-*/
 r_lld_con_tx = 0x4000435c;
 r_lld_con_tx_enc = 0x40004368;
 r_lld_con_tx_isr = 0x40004374;
@@ -1389,9 +1351,6 @@ r_lld_init_set_tx_power = 0x400044c4;
 r_lld_init_start = 0x400044d0;
 r_lld_init_stop = 0x400044dc;
 r_lld_instant_proc_end = 0x400044e8;
-/*
-r_lld_llcp_rx_ind_handler = 0x400044f4;
-*/
 r_lld_per_adv_ch_map_update = 0x40004500;
 r_lld_per_adv_chain_construct = 0x4000450c;
 r_lld_per_adv_cleanup = 0x40004518;
@@ -1409,9 +1368,6 @@ r_lld_per_adv_init = 0x4000459c;
 r_lld_per_adv_init_info_get = 0x400045a8;
 r_lld_per_adv_list_add = 0x400045b4;
 r_lld_per_adv_list_rem = 0x400045c0;
-/*
-r_lld_per_adv_sched = 0x400045cc;
-*/
 r_lld_per_adv_set_tx_power = 0x400045d8;
 r_lld_per_adv_start = 0x400045e4;
 r_lld_per_adv_stop = 0x400045f0;
@@ -1420,17 +1376,11 @@ r_lld_process_cca_data = 0x40004608;
 r_lld_ral_search = 0x40004614;
 r_lld_read_clock = 0x40004620;
 r_lld_res_list_add = 0x4000462c;
-/*
-r_lld_res_list_clear = 0x40004638;
-*/
 r_lld_res_list_is_empty = 0x40004644;
 r_lld_res_list_local_rpa_get = 0x40004650;
 r_lld_res_list_peer_rpa_get = 0x4000465c;
 r_lld_res_list_peer_update = 0x40004668;
 r_lld_res_list_priv_mode_update = 0x40004674;
-/*
-r_lld_res_list_rem = 0x40004680;
-*/
 r_lld_reset_reg = 0x4000468c;
 r_lld_rpa_renew = 0x40004698;
 r_lld_rpa_renew_evt_canceled_cbk = 0x400046a4;
@@ -1449,10 +1399,6 @@ r_lld_scan_frm_rx_isr = 0x40004734;
 r_lld_scan_frm_skip_isr = 0x40004740;
 r_lld_scan_init = 0x4000474c;
 r_lld_scan_params_update = 0x40004758;
-/*
-r_lld_scan_process_pkt_rx = 0x40004764;
-r_lld_scan_process_pkt_rx_adv_rep = 0x40004770;
-*/
 r_lld_scan_process_pkt_rx_aux_adv_ind = 0x4000477c;
 r_lld_scan_process_pkt_rx_aux_chain_ind = 0x40004788;
 r_lld_scan_process_pkt_rx_aux_scan_rsp = 0x40004794;
@@ -1527,9 +1473,6 @@ r_llm_is_dev_synced = 0x40004ac4;
 r_llm_is_non_con_act_ongoing_check = 0x40004ad0;
 r_llm_is_wl_accessible = 0x40004adc;
 r_llm_le_evt_mask_check = 0x40004ae8;
-/*
-r_llm_le_features_get = 0x40004af4;
-*/
 r_llm_link_disc = 0x40004b00;
 r_llm_master_ch_map_get = 0x40004b0c;
 r_llm_msg_handler_tab_p_get = 0x40004b18;
@@ -1549,9 +1492,6 @@ r_misc_msg_handler_tab_p_get = 0x40004bb4;
 r_notEqual256 = 0x40004bc0;
 r_phy_upd_proc_start = 0x40004bcc;
 r_platform_reset = 0x40004bd8;
-/*
-r_register_esp_vendor_cmd_handler = 0x40004be4;
-*/
 r_rf_em_init = 0x40004bf0;
 r_rf_force_agc_enable = 0x40004bfc;
 r_rf_reg_rd = 0x40004c08;
@@ -1561,10 +1501,6 @@ r_rf_rssi_convert = 0x40004c2c;
 r_rf_rw_v9_le_disable = 0x40004c38;
 r_rf_rw_v9_le_enable = 0x40004c44;
 r_rf_sleep = 0x40004c50;
-/*
-r_rf_txpwr_cs_get = 0x40004c5c;
-r_rf_txpwr_dbm_get = 0x40004c68;
-*/
 r_rf_util_cs_fmt_convert = 0x40004c74;
 r_rw_crypto_aes_ccm = 0x40004c80;
 r_rw_crypto_aes_encrypt = 0x40004c8c;
@@ -1578,9 +1514,6 @@ r_rw_crypto_aes_result_handler = 0x40004ce0;
 r_rw_crypto_aes_s1 = 0x40004cec;
 r_rw_cryto_aes_cmac = 0x40004cf8;
 r_rw_v9_init_em_radio_table = 0x40004d04;
-/*
-r_rwble_isr = 0x40004d10;
-*/
 r_rwble_sleep_enter = 0x40004d1c;
 r_rwble_sleep_wakeup_end = 0x40004d28;
 r_rwbtdm_isr_wrapper = 0x40004d34;
@@ -1617,9 +1550,6 @@ r_sch_alarm_set = 0x40004e9c;
 r_sch_alarm_timer_isr = 0x40004ea8;
 r_sch_arb_conflict_check = 0x40004eb4;
 r_sch_arb_elt_cancel = 0x40004ec0;
-/*
-r_sch_arb_event_start_isr = 0x40004ecc;
-*/
 r_sch_arb_init = 0x40004ed8;
 r_sch_arb_insert = 0x40004ee4;
 r_sch_arb_prog_timer = 0x40004ef0;
@@ -1634,10 +1564,6 @@ r_sch_plan_offset_req = 0x40004f50;
 r_sch_plan_position_range_compute = 0x40004f5c;
 r_sch_plan_rem = 0x40004f68;
 r_sch_plan_req = 0x40004f74;
-/*
-r_sch_plan_set = 0x40004f80;
-r_sch_prog_end_isr = 0x40004f8c;
-*/
 r_sch_prog_init = 0x40004f98;
 r_sch_prog_push = 0x40004fa4;
 r_sch_prog_rx_isr = 0x40004fb0;
@@ -1673,22 +1599,13 @@ r_lld_ext_adv_dynamic_pti_get = 0x4000510c;
 r_lld_ext_adv_dynamic_aux_pti_process = 0x40005118;
 r_lld_ext_adv_dynamic_pti_process = 0x40005124;
 r_lld_adv_ext_pkt_prepare_set = 0x40005130;
-/*
-r_lld_adv_ext_chain_none_construct = 0x4000513c;
-*/
 r_lld_adv_ext_chain_connectable_construct = 0x40005148;
-/*
-r_lld_adv_ext_chain_scannable_construct = 0x40005154;
-*/
 r_lld_adv_pkt_rx_connect_post = 0x40005160;
 r_lld_adv_start_init_evt_param = 0x4000516c;
 r_lld_adv_start_set_cs = 0x40005178;
 r_lld_adv_start_update_filter_policy = 0x40005184;
 r_lld_adv_start_schedule_asap = 0x40005190;
 r_lld_con_tx_prog_new_packet_coex = 0x4000519c;
-/*
-r_lld_con_tx_prog_new_packet = 0x400051a8;
-*/
 r_lld_per_adv_dynamic_pti_get = 0x400051b4;
 r_lld_per_adv_evt_start_chm_upd = 0x400051c0;
 r_lld_ext_scan_dynamic_pti_get = 0x400051cc;
@@ -1851,14 +1768,8 @@ r_llc_loc_phy_upd_proc_continue_hook = 0x40001c64;
 r_llc_rem_phy_upd_proc_continue_hook = 0x40001c68;
 r_lld_scan_frm_eof_isr_hook = 0x40001c6c;
 r_lld_scan_evt_start_cbk_hook = 0x40001c70;
-/*
-r_lld_scan_start_hook = 0x40001c74;
-*/
 r_lld_scan_process_pkt_rx_ext_adv_hook = 0x40001c78;
 r_lld_scan_sched_hook = 0x40001c7c;
-/*
-r_lld_adv_start_hook = 0x40001c80;
-*/
 r_lld_adv_evt_start_cbk_hook = 0x40001c84;
 r_lld_adv_aux_evt_start_cbk_hook = 0x40001c88;
 r_lld_adv_frm_isr_hook = 0x40001c8c;
@@ -1868,15 +1779,9 @@ r_lld_con_frm_isr_hook = 0x40001c98;
 r_lld_con_tx_hook = 0x40001c9c;
 r_lld_con_rx_hook = 0x40001ca0;
 r_lld_con_evt_start_cbk_hook = 0x40001ca4;
-/*
-r_lld_con_start_hook = 0x40001ca8;
-*/
 r_lld_con_tx_prog_new_packet_hook = 0x40001cac;
 r_lld_init_frm_eof_isr_hook = 0x40001cb0;
 r_lld_init_evt_start_cbk_hook = 0x40001cb4;
-/*
-r_lld_init_start_hook = 0x40001cb8;
-*/
 r_lld_init_sched_hook = 0x40001cbc;
 r_lld_init_process_pkt_tx_hook = 0x40001cc0;
 r_lld_per_adv_evt_start_cbk_hook = 0x40001cc4;
@@ -1909,13 +1814,13 @@ ic_get_trc = 0x400052c8;
 ic_mac_init = 0x400052e0;
 ic_interface_enabled = 0x400052ec;
 is_lmac_idle = 0x400052f8;
-lmacAdjustTimestamp = 0x40005304;
+/*lmacAdjustTimestamp = 0x40005304;*/
 lmacDiscardAgedMSDU = 0x40005310;
 /*lmacDiscardMSDU = 0x4000531c;*/
 lmacEndFrameExchangeSequence = 0x40005328;
 lmacIsIdle = 0x40005334;
 lmacIsLongFrame = 0x40005340;
-lmacMSDUAged = 0x4000534c;
+/*lmacMSDUAged = 0x4000534c;*/
 lmacPostTxComplete = 0x40005358;
 lmacProcessAllTxTimeout = 0x40005364;
 lmacProcessCollisions = 0x40005370;
@@ -1932,7 +1837,7 @@ mac_tx_set_duration = 0x400053dc;
 mac_tx_set_plcp0 = 0x400053f4;
 /* mac_tx_set_plcp1 = 0x40005400;*/
 mac_tx_set_plcp2 = 0x4000540c;
-pm_check_state = 0x40005418;
+/* pm_check_state = 0x40005418; */
 pm_disable_dream_timer = 0x40005424;
 pm_disable_sleep_delay_timer = 0x40005430;
 pm_dream = 0x4000543c;
@@ -1949,7 +1854,7 @@ pm_keep_alive = 0x400054a8;
 pm_on_data_rx = 0x400054c0;
 pm_on_tbtt = 0x400054cc;
 /* pm_parse_beacon = 0x400054d8;*/
-pm_process_tim = 0x400054e4;
+/* pm_process_tim = 0x400054e4; */
 /*pm_rx_beacon_process = 0x400054f0;*/
 pm_rx_data_process = 0x400054fc;
 /*pm_sleep = 0x40005508;*/
@@ -2045,7 +1950,7 @@ ppDequeueTxDone_Locked = 0x40005940;
 /*ppProcTxDone = 0x4000594c;*/
 /*pm_tx_data_done_process = 0x40005958;*/
 config_is_cache_tx_buf_enabled = 0x40005964;
-ppMapWaitTxq = 0x40005970;
+/* ppMapWaitTxq = 0x40005970; */
 ppProcessWaitingQueue = 0x4000597c;
 ppDisableQueue = 0x40005988;
 pm_allow_tx = 0x40005994;

components/esp_wifi/esp32/esp_adapter.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -595,13 +595,6 @@ static IRAM_ATTR uint32_t coex_status_get_wrapper(void)
 #endif
 }
 
-static void coex_condition_set_wrapper(uint32_t type, bool dissatisfy)
-{
-#if CONFIG_SW_COEXIST_ENABLE
-    coex_condition_set(type, dissatisfy);
-#endif
-}
-
 static int coex_wifi_request_wrapper(uint32_t event, uint32_t latency, uint32_t duration)
 {
 #if CONFIG_SW_COEXIST_ENABLE
@@ -833,7 +826,6 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
     ._coex_enable = coex_enable_wrapper,
     ._coex_disable = coex_disable_wrapper,
     ._coex_status_get = coex_status_get_wrapper,
-    ._coex_condition_set = coex_condition_set_wrapper,
     ._coex_wifi_request = coex_wifi_request_wrapper,
     ._coex_wifi_release = coex_wifi_release_wrapper,
     ._coex_wifi_channel_set = coex_wifi_channel_set_wrapper,

components/esp_wifi/esp32c2/esp_adapter.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -517,13 +517,6 @@ static IRAM_ATTR uint32_t coex_status_get_wrapper(void)
 #endif
 }
 
-static void coex_condition_set_wrapper(uint32_t type, bool dissatisfy)
-{
-#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
-    coex_condition_set(type, dissatisfy);
-#endif
-}
-
 static int coex_wifi_request_wrapper(uint32_t event, uint32_t latency, uint32_t duration)
 {
 #if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
@@ -753,7 +746,6 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
     ._coex_enable = coex_enable_wrapper,
     ._coex_disable = coex_disable_wrapper,
     ._coex_status_get = coex_status_get_wrapper,
-    ._coex_condition_set = coex_condition_set_wrapper,
     ._coex_wifi_request = coex_wifi_request_wrapper,
     ._coex_wifi_release = coex_wifi_release_wrapper,
     ._coex_wifi_channel_set = coex_wifi_channel_set_wrapper,

components/esp_wifi/esp32c3/esp_adapter.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -525,13 +525,6 @@ static IRAM_ATTR uint32_t coex_status_get_wrapper(void)
 #endif
 }
 
-static void coex_condition_set_wrapper(uint32_t type, bool dissatisfy)
-{
-#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
-    coex_condition_set(type, dissatisfy);
-#endif
-}
-
 static int coex_wifi_request_wrapper(uint32_t event, uint32_t latency, uint32_t duration)
 {
 #if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
@@ -761,7 +754,6 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
     ._coex_enable = coex_enable_wrapper,
     ._coex_disable = coex_disable_wrapper,
     ._coex_status_get = coex_status_get_wrapper,
-    ._coex_condition_set = coex_condition_set_wrapper,
     ._coex_wifi_request = coex_wifi_request_wrapper,
     ._coex_wifi_release = coex_wifi_release_wrapper,
     ._coex_wifi_channel_set = coex_wifi_channel_set_wrapper,

components/esp_wifi/esp32s2/esp_adapter.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -592,13 +592,6 @@ static IRAM_ATTR uint32_t coex_status_get_wrapper(void)
 #endif
 }
 
-static void coex_condition_set_wrapper(uint32_t type, bool dissatisfy)
-{
-#if CONFIG_EXTERNAL_COEX_ENABLE
-    coex_condition_set(type, dissatisfy);
-#endif
-}
-
 static int coex_wifi_request_wrapper(uint32_t event, uint32_t latency, uint32_t duration)
 {
 #if CONFIG_EXTERNAL_COEX_ENABLE
@@ -835,7 +828,6 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
     ._coex_enable = coex_enable_wrapper,
     ._coex_disable = coex_disable_wrapper,
     ._coex_status_get = coex_status_get_wrapper,
-    ._coex_condition_set = coex_condition_set_wrapper,
     ._coex_wifi_request = coex_wifi_request_wrapper,
     ._coex_wifi_release = coex_wifi_release_wrapper,
     ._coex_wifi_channel_set = coex_wifi_channel_set_wrapper,

components/esp_wifi/esp32s3/esp_adapter.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -614,13 +614,6 @@ static IRAM_ATTR uint32_t coex_status_get_wrapper(void)
 #endif
 }
 
-static void coex_condition_set_wrapper(uint32_t type, bool dissatisfy)
-{
-#if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
-    coex_condition_set(type, dissatisfy);
-#endif
-}
-
 static int coex_wifi_request_wrapper(uint32_t event, uint32_t latency, uint32_t duration)
 {
 #if CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE
@@ -855,7 +848,6 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
     ._coex_enable = coex_enable_wrapper,
     ._coex_disable = coex_disable_wrapper,
     ._coex_status_get = coex_status_get_wrapper,
-    ._coex_condition_set = coex_condition_set_wrapper,
     ._coex_wifi_request = coex_wifi_request_wrapper,
     ._coex_wifi_release = coex_wifi_release_wrapper,
     ._coex_wifi_channel_set = coex_wifi_channel_set_wrapper,

components/esp_wifi/include/esp_coexist_internal.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2018-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2018-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -83,12 +83,6 @@ esp_err_t coex_preference_set(coex_prefer_t prefer);
  */
 uint32_t coex_status_get(void);
 
-/**
- * @brief Set software coexist condition.
- * @return : software coexist condition
- */
-void coex_condition_set(uint32_t type, bool dissatisfy);
-
 /**
  * @brief WiFi requests coexistence.
  *

components/esp_wifi/include/esp_wifi.h

@@ -1182,7 +1182,8 @@ esp_err_t esp_wifi_statis_dump(uint32_t modules);
   * @attention  If the user wants to receive another WIFI_EVENT_STA_BSS_RSSI_LOW event after receiving one, this API needs to be
   *             called again with an updated/same RSSI threshold.
   *
-  * @param      rssi threshold value in dbm between -100 to 0
+  * @param      rssi threshold value in dbm between -100 to 10
+  *             Note that in some rare cases where signal strength is very strong, rssi values can be slightly positive.
   *
   * @return
   *    - ESP_OK: succeed

components/esp_wifi/include/esp_wifi_types.h

@@ -194,7 +194,7 @@ typedef struct {
     uint8_t ssid[33];                     /**< SSID of AP */
     uint8_t primary;                      /**< channel of AP */
     wifi_second_chan_t second;            /**< secondary channel of AP */
-    int8_t  rssi;                         /**< signal strength of AP */
+    int8_t  rssi;                         /**< signal strength of AP. Note that in some rare cases where signal strength is very strong, rssi values can be slightly positive */
     wifi_auth_mode_t authmode;            /**< authmode of AP */
     wifi_cipher_type_t pairwise_cipher;   /**< pairwise cipher of AP */
     wifi_cipher_type_t group_cipher;      /**< group cipher of AP */

components/esp_wifi/lib

@@ -1 +1 @@
-Subproject commit fcfd486e3478e8a2afd4678e29bb4914418a5f0a
+Subproject commit 123e2f3a3632b232af0e7f1d6ab59f6f00da4592

components/wpa_supplicant/esp_supplicant/src/esp_common.c

@@ -36,7 +36,7 @@ static bool s_supplicant_task_init_done;
 #define SUPPLICANT_TASK_STACK_SIZE (6144 + TASK_STACK_SIZE_ADD)
 
 static int handle_action_frm(u8 *frame, size_t len,
-			     u8 *sender, u32 rssi, u8 channel)
+			     u8 *sender, int8_t rssi, u8 channel)
 {
 	struct ieee_mgmt_frame *frm = os_malloc(sizeof(struct ieee_mgmt_frame) + len);
 
@@ -62,7 +62,7 @@ static int handle_action_frm(u8 *frame, size_t len,
 
 #if defined(CONFIG_WPA_11KV_SUPPORT)
 static void handle_rrm_frame(struct wpa_supplicant *wpa_s, u8 *sender,
-			     u8 *payload, size_t len, u32 rssi)
+			     u8 *payload, size_t len, int8_t rssi)
 {
 	if (payload[0] == WLAN_RRM_NEIGHBOR_REPORT_RESPONSE) {
 		/* neighbor report parsing */
@@ -78,7 +78,7 @@ static void handle_rrm_frame(struct wpa_supplicant *wpa_s, u8 *sender,
 	}
 }
 
-static int mgmt_rx_action(u8 *frame, size_t len, u8 *sender, u32 rssi, u8 channel)
+static int mgmt_rx_action(u8 *frame, size_t len, u8 *sender, int8_t rssi, u8 channel)
 {
 	u8 category;
 	u8 bssid[ETH_ALEN];
@@ -204,7 +204,7 @@ static void register_mgmt_frames(struct wpa_supplicant *wpa_s)
 
 #ifdef CONFIG_IEEE80211R
 static int handle_auth_frame(u8 *frame, size_t len,
-			     u8 *sender, u32 rssi, u8 channel)
+			     u8 *sender, int8_t rssi, u8 channel)
 {
 	if (gWpaSm.key_mgmt == WPA_KEY_MGMT_FT_PSK) {
 		if (gWpaSm.ft_protocol) {
@@ -219,7 +219,7 @@ static int handle_auth_frame(u8 *frame, size_t len,
 }
 
 static int handle_assoc_frame(u8 *frame, size_t len,
-			      u8 *sender, u32 rssi, u8 channel)
+			      u8 *sender, int8_t rssi, u8 channel)
 {
 	if (gWpaSm.key_mgmt == WPA_KEY_MGMT_FT_PSK) {
 		if (gWpaSm.ft_protocol) {
@@ -244,7 +244,7 @@ void esp_supplicant_unset_all_appie(void)
 }
 
 static int ieee80211_handle_rx_frm(u8 type, u8 *frame, size_t len, u8 *sender,
-				   u32 rssi, u8 channel, u64 current_tsf)
+				   int8_t rssi, u8 channel, u64 current_tsf)
 {
 	int ret = 0;
 

components/wpa_supplicant/esp_supplicant/src/esp_common_i.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2020-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -16,7 +16,7 @@ extern struct wpa_supplicant g_wpa_supp;
 struct ieee_mgmt_frame {
 	u8 sender[ETH_ALEN];
 	u8 channel;
-	u32 rssi;
+	int8_t rssi;
 	size_t len;
 	u8 payload[0];
 };

components/wpa_supplicant/esp_supplicant/src/esp_scan.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2020-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -114,7 +114,7 @@ void esp_scan_deinit(struct wpa_supplicant *wpa_s)
 }
 
 int esp_handle_beacon_probe(u8 type, u8 *frame, size_t len, u8 *sender,
-			    u32 rssi, u8 channel, u64 current_tsf)
+			    int8_t rssi, u8 channel, u64 current_tsf)
 {
 	struct wpa_supplicant *wpa_s = &g_wpa_supp;
 	struct os_reltime now;

components/wpa_supplicant/esp_supplicant/src/esp_scan_i.h

@@ -1,17 +1,7 @@
-/**
+/*
- * Copyright 2020 Espressif Systems (Shanghai) PTE LTD
+ * SPDX-FileCopyrightText: 2020-2023 Espressif Systems (Shanghai) CO LTD
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * SPDX-License-Identifier: Apache-2.0
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
  */
 
 #ifndef ESP_SCAN_I_H
@@ -19,7 +9,7 @@
 void esp_scan_init(struct wpa_supplicant *wpa_s);
 void esp_scan_deinit(struct wpa_supplicant *wpa_s);
 int esp_handle_beacon_probe(u8 type, u8 *frame, size_t len, u8 *sender,
-			    u32 rssi, u8 channel, u64 current_tsf);
+			    int8_t rssi, u8 channel, u64 current_tsf);
 
 void esp_supplicant_handle_scan_done_evt(void);
 #endif

components/wpa_supplicant/esp_supplicant/src/esp_wifi_driver.h

@@ -135,7 +135,7 @@ struct wpa_funcs {
     int (*wpa_michael_mic_failure)(u16 is_unicast);
     uint8_t *(*wpa3_build_sae_msg)(uint8_t *bssid, uint32_t type, size_t *len);
     int (*wpa3_parse_sae_msg)(uint8_t *buf, size_t len, uint32_t type, uint16_t status);
-    int (*wpa_sta_rx_mgmt)(u8 type, u8 *frame, size_t len, u8 *sender, u32 rssi, u8 channel, u64 current_tsf);
+    int (*wpa_sta_rx_mgmt)(u8 type, u8 *frame, size_t len, u8 *sender, int8_t rssi, u8 channel, u64 current_tsf);
     void (*wpa_config_done)(void);
     uint8_t *(*owe_build_dhie)(uint16_t group);
     int (*owe_process_assoc_resp)(const u8 *rsn_ie, size_t rsn_len, const uint8_t *dh_ie, size_t dh_len);

docs/en/api-guides/coexist.rst

@@ -111,6 +111,8 @@ The RF resource allocation mechanism is based on priority. As shown below, both
     }
 
 
+.. _coexist_policy:
+
 Coexistence Policy
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

docs/en/api-guides/wifi.rst

@@ -1665,7 +1665,11 @@ In maximum power-saving mode, station wakes up in every listen interval to recei
 
 Call ``esp_wifi_set_ps(WIFI_PS_MIN_MODEM)`` to enable Modem-sleep minimum power-saving mode or ``esp_wifi_set_ps(WIFI_PS_MAX_MODEM)`` to enable Modem-sleep maximum power-saving mode after calling :cpp:func:`esp_wifi_init()`. When station connects to AP, Modem-sleep will start. When station disconnects from AP, Modem-sleep will stop.
 
-Call ``esp_wifi_set_ps(WIFI_PS_NONE)`` to disable Modem-sleep entirely. This has much higher power consumption, but provides minimum latency for receiving Wi-Fi data in real time. When Modem-sleep is enabled, received Wi-Fi data can be delayed for as long as the DTIM period (minimum power-saving mode) or the listen interval (maximum power-saving mode). Disabling Modem-sleep entirely is not possible for Wi-Fi and Bluetooth coexist mode.
+Call ``esp_wifi_set_ps(WIFI_PS_NONE)`` to disable Modem-sleep entirely. This has much higher power consumption, but provides minimum latency for receiving Wi-Fi data in real time. When Modem-sleep is enabled, received Wi-Fi data can be delayed for as long as the DTIM period (minimum power-saving mode) or the listen interval (maximum power-saving mode).
+
+.. only:: SOC_SUPPORT_COEXISTENCE
+
+    Notice that at coexist mode, Wi-Fi would still keep active state in Wi-Fi time slice and only keep sleep state in non Wi-Fi time slice even when calling "esp_wifi_set_ps(WIFI_PS_NONE)". Please refer to :ref:`coexist policy <coexist_policy>`.
 
 The default Modem-sleep mode is WIFI_PS_MIN_MODEM.
 

docs/zh_CN/api-guides/coexist.rst

@@ -111,6 +111,7 @@ RF 共存
    	  Coexistence -> RF;
     }
 
+.. _coexist_policy-cn:
 
 共存策略
 ^^^^^^^^^^^^^^

docs/zh_CN/api-guides/wifi.rst

@@ -1657,7 +1657,11 @@ Modem-sleep 模式包括最小和最大节能模式。在最小节能模式下
 
 调用 :cpp:func:`esp_wifi_init()` 后，调用 ``esp_wifi_set_ps(WIFI_PS_MIN_MODEM)`` 可使能 Modem-sleep 最小节能模式。调用 ``esp_wifi_set_ps(WIFI_PS_MAX_MODEM)`` 可使能 Modem-sleep 最大节能模式。station 连接到 AP 时，Modem-sleep 模式将启动。station 与 AP 断开连接时，Modem-sleep 模式将停止。
 
-调用 ``esp_wifi_set_ps(WIFI_PS_NONE)`` 可以完全禁用 Modem-sleep 模式。禁用会增大功耗，但可以最大限度减少实时接收 Wi-Fi 数据的延迟。使能 Modem-sleep 时，接收 Wi-Fi 数据的延迟时间可能与 DTIM 周期（最小节能模式）或监听间隔（最大节能模式）相同。在 Wi-Fi 与 Bluetooth LE 共存模式下，无法完全禁用 modem-sleep 模式。
+调用 ``esp_wifi_set_ps(WIFI_PS_NONE)`` 可以完全禁用 Modem-sleep 模式。禁用会增大功耗，但可以最大限度减少实时接收 Wi-Fi 数据的延迟。使能 Modem-sleep 时，接收 Wi-Fi 数据的延迟时间可能与 DTIM 周期（最小节能模式）或监听间隔（最大节能模式）相同。
+
+.. only:: SOC_SUPPORT_COEXISTENCE
+
+    注意在共存模式下, 即使调用 ``esp_wifi_set_ps(WIFI_PS_NONE)``, Wi-Fi 也仅会在 Wi-Fi 时间片内保持活动状态, 非 Wi-Fi 时间片内仍然睡眠。请参照 :ref:`共存策略 <coexist_policy-cn>`。
 
 默认的 Modem-sleep 模式是 WIFI_PS_MIN_MODEM。
 

tools/ci/check_copyright_ignore.txt

@@ -1244,7 +1244,6 @@ components/wifi_provisioning/src/scheme_console.c
 components/wifi_provisioning/src/wifi_config.c
 components/wifi_provisioning/src/wifi_provisioning_priv.h
 components/wifi_provisioning/src/wifi_scan.c
-components/wpa_supplicant/esp_supplicant/src/esp_scan_i.h
 components/wpa_supplicant/esp_supplicant/src/esp_wpa3_i.h
 components/wpa_supplicant/esp_supplicant/src/esp_wpa_err.h
 components/wpa_supplicant/include/utils/wpa_debug.h