From 36e082d6e222fd29e4cdb770dd6ad37b4fffec01 Mon Sep 17 00:00:00 2001
From: alanmaxwell <chenjianxing@espressif.com>
Date: Thu, 21 Sep 2023 14:00:33 +0800
Subject: [PATCH] feat(wifi): support esp32c3 v1.1 WiFi

1.bringup c3 v1.1 and sync func to c3 eco7 rom
2.support to set null&probe lifetime
3.support to adjust listen interval to dtim period
4.support tx pkt w/o wake null
5.allow to tx null0 if requtest to rx data
---
 components/esp_rom/esp32c2/ld/esp32c2.rom.ld      | 4 ++--
 components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld | 6 +++---
 components/esp_rom/esp32c3/ld/esp32c3.rom.ld      | 4 ++--
 components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld   | 4 ++--
 components/esp_rom/esp32s3/ld/esp32s3.rom.ld      | 4 ++--
 components/esp_wifi/lib                           | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
index c5470ffb4f..9a518fce92 100644
--- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
+++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
@@ -1483,13 +1483,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;
diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld
index 6b137a44e8..7062fb97e4 100644
--- a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld
+++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld
@@ -9,13 +9,13 @@ esf_buf_recycle = 0x400015c4;
 hal_mac_tx_set_ppdu = 0x400015d4;
 ic_mac_deinit = 0x400015dc;
 lmacDiscardMSDU = 0x400015f4;
-lmacSetTxFrame = 0x40001628;
+/*lmacSetTxFrame = 0x40001628;*/
 lmacTxDone = 0x4000162c;
 lmacTxFrame = 0x40001630;
 mac_tx_set_htsig = 0x40001638;
 mac_tx_set_plcp1 = 0x40001640;
 pm_on_beacon_rx = 0x4000167c;
-pm_parse_beacon = 0x40001688;
+/*pm_parse_beacon = 0x40001688;*/
 pm_process_tim = 0x4000168c;
 pm_rx_beacon_process = 0x40001690;
 pm_rx_data_process = 0x40001694;
@@ -28,7 +28,7 @@ ppProcTxSecFrame = 0x400016dc;
 rcTxUpdatePer = 0x40001770;
 rcUpdateTxDone = 0x4000177c;
 wDevCheckBlockError = 0x400017b4;
-wDev_IndicateFrame = 0x400017c8;
+/* wDev_IndicateFrame = 0x400017c8;*/
 wDev_ProcessFiq = 0x400017f0;
 wDev_ProcessRxSucData = 0x400017f4;
 ppProcTxDone = 0x40001804;
diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
index 21d1db799a..7dd2d34a5e 100644
--- a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
+++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
@@ -1513,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;
diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld
index 0bd51bb71f..a0e5b0afea 100644
--- a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld
+++ b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld
@@ -34,13 +34,13 @@ ic_get_trc = 0x40000c04;
 ic_mac_init = 0x40000c0c;
 ic_interface_enabled = 0x40000c10;
 is_lmac_idle = 0x40000c14;
-lmacAdjustTimestamp = 0x40000c18;
+/*lmacAdjustTimestamp = 0x40000c18;*/
 lmacDiscardAgedMSDU = 0x40000c1c;
 /*lmacDiscardMSDU = 0x40000c20;*/
 lmacEndFrameExchangeSequence = 0x40000c24;
 lmacIsIdle = 0x40000c28;
 lmacIsLongFrame = 0x40000c2c;
-lmacMSDUAged = 0x40000c30;
+/*lmacMSDUAged = 0x40000c30;*/
 lmacPostTxComplete = 0x40000c34;
 lmacProcessAllTxTimeout = 0x40000c38;
 lmacProcessCollisions = 0x40000c3c;
diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
index fc514b44ea..8f811518d3 100644
--- a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
+++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
@@ -1814,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;
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index 9bb605e822..ab3ac826d0 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 9bb605e822e5fa473448aa6a80b740e09c3c8df2
+Subproject commit ab3ac826d0e102b0a079022e946db63a3fc625e3