Merge branch 'bugfix/fix_double_wifi_active_time' into 'master'

fix(wifi): fix double max active time

Closes WIFI-6770

See merge request espressif/esp-idf!35786

Author: Jiang Jiang Jian

components/esp_coex/src/coexist_debug_diagram.c

@@ -16,7 +16,7 @@ void diagram_bind_io_to_evt(void) {
     coex_bind_io_to_evt(1, 16);
 #else
     coex_bind_io_to_evt(0, 0);
-    coex_bind_io_to_evt(1, 1);
+    coex_bind_io_to_evt(1, 4);
 #endif
     /* Bind IO to Wi-Fi evt */
     wifi_bind_io_to_evt(2, 9);
@@ -35,7 +35,7 @@ void diagram_bind_io_to_evt(void) {
     coex_bind_io_to_evt(1, 16);
 #else
     coex_bind_io_to_evt(0, 0);
-    coex_bind_io_to_evt(1, 1);
+    coex_bind_io_to_evt(1, 4);
 #endif
     /* Bind IO to Wi-Fi evt */
     wifi_bind_io_to_evt(2, 9);

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

@@ -41,7 +41,7 @@ wDev_AppendRxBlocks = 0x40001cdc;
 wDev_ProcessFiq = 0x40001d08;
 wDev_ProcessRxSucData = 0x40001d0c;
 ppProcTxDone = 0x40001d1c;
-pm_tx_data_done_process = 0x40001d20;
+/*pm_tx_data_done_process = 0x40001d20;*/
 ppMapWaitTxq = 0x40001d28;
 lmacDiscardFrameExchangeSequence = 0x40001d70;
 lmacDisableTransmit = 0x40001d74;
@@ -61,7 +61,7 @@ pm_stop = 0x40001e38;
 hal_set_sta_tbtt = 0x40001e4c;
 //pm_update_next_tbtt = 0x40001e50;
 pm_set_sleep_type = 0x40001e54;
-pm_tx_null_data_done_process = 0x40001eb0;
+/*pm_tx_null_data_done_process = 0x40001eb0;*/
 //pm_tx_data_process = 0x40001eb4;
 /*pm_attach = 0x40001eb8;*/
 /*pm_coex_schm_process = 0x40001ebc;*/

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

@@ -531,7 +531,7 @@ pm_local_tsf_process = 0x40001b8c;
 pm_set_beacon_filter = 0x40001b90;
 pm_is_in_wifi_slice_threshold = 0x40001b94;
 pm_is_waked = 0x40001b98;
-pm_keep_alive = 0x40001b9c;
+/*pm_keep_alive = 0x40001b9c;*/
 /* pm_on_beacon_rx = 0x40001ba0; */
 pm_on_data_rx = 0x40001ba4;
 pm_on_tbtt = 0x40001ba8;

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

@@ -720,7 +720,7 @@ pm_local_tsf_process = 0x40001668;
 pm_set_beacon_filter = 0x4000166c;
 pm_is_in_wifi_slice_threshold = 0x40001670;
 pm_is_waked = 0x40001674;
-pm_keep_alive = 0x40001678;
+/*pm_keep_alive = 0x40001678;*/
 /* pm_on_beacon_rx = 0x4000167c; */
 pm_on_data_rx = 0x40001680;
 pm_on_tbtt = 0x40001684;

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

@@ -974,7 +974,7 @@ pm_local_tsf_process = 0x40005478;
 pm_set_beacon_filter = 0x40005484;
 pm_is_in_wifi_slice_threshold = 0x40005490;
 pm_is_waked = 0x4000549c;
-pm_keep_alive = 0x400054a8;
+/*pm_keep_alive = 0x400054a8;*/
 /* pm_on_beacon_rx = 0x400054b4; */
 pm_on_data_rx = 0x400054c0;
 pm_on_tbtt = 0x400054cc;