Merge branch 'fix/fix_esp32s2_get_ack_rssi_issue_v5.2' into 'release/…

…v5.2' fix(wifi): fix esp32s2 get ack rssi invaild issue backport v5.2 See merge request espressif/esp-idf!33129
espressif · Aug 28, 2024 · 68c10bb · 68c10bb
2 parents e98e6dc + ab68008
commit 68c10bb
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld
@@ -1570,8 +1570,8 @@ rcSetTxAmpduLimit = 0x40001c90;
 /* rcTxUpdatePer = 0x40001c94;*/
 rcUpdateAckSnr = 0x40001c98;
 /*rcUpdateRate = 0x40001c9c;*/
-rcUpdateTxDone = 0x40001ca0;
-rcUpdateTxDoneAmpdu2 = 0x40001ca4;
+/*rcUpdateTxDone = 0x40001ca0;*/
+/*rcUpdateTxDoneAmpdu2 = 0x40001ca4;*/
 rcUpSched = 0x40001ca8;
 rssi_margin = 0x40001cac;
 rx11NRate2AMPDULimit = 0x40001cb0;

diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco7.ld
@@ -27,7 +27,7 @@ ppProcTxSecFrame = 0x400016dc;
 /*ppRxFragmentProc = 0x40001704;*/
 /* rcGetSched = 0x40001764;*/
 rcTxUpdatePer = 0x40001770;
-rcUpdateTxDone = 0x4000177c;
+/*rcUpdateTxDone = 0x4000177c;*/
 wDevCheckBlockError = 0x400017b4;
 /* wDev_IndicateFrame = 0x400017c8;*/
 wDev_ProcessFiq = 0x400017f0;

diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.ld
@@ -1609,7 +1609,7 @@ rcSetTxAmpduLimit = 0x4000176c;
 rcUpdateAckSnr = 0x40001774;
 /*rcUpdateRate = 0x40001778;*/
 /* rcUpdateTxDone = 0x4000177c; */
-rcUpdateTxDoneAmpdu2 = 0x40001780;
+/*rcUpdateTxDoneAmpdu2 = 0x40001780;*/
 rcUpSched = 0x40001784;
 rssi_margin = 0x40001788;
 rx11NRate2AMPDULimit = 0x4000178c;

diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld
@@ -130,8 +130,8 @@ rcSetTxAmpduLimit = 0x40000d88;
 rcTxUpdatePer = 0x40000d8c;
 rcUpdateAckSnr = 0x40000d90;
 /*rcUpdateRate = 0x40000d94;*/
-rcUpdateTxDone = 0x40000d98;
-rcUpdateTxDoneAmpdu2 = 0x40000d9c;
+/*rcUpdateTxDone = 0x40000d98;*/
+/*rcUpdateTxDoneAmpdu2 = 0x40000d9c;*/
 rcUpSched = 0x40000da0;
 rssi_margin = 0x40000da4;
 rx11NRate2AMPDULimit = 0x40000da8;

diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld
@@ -1913,7 +1913,7 @@ rcSetTxAmpduLimit = 0x40005784;
 rcUpdateAckSnr = 0x4000579c;
 /*rcUpdateRate = 0x400057a8;*/
 /* rcUpdateTxDone = 0x400057b4; */
-rcUpdateTxDoneAmpdu2 = 0x400057c0;
+/*rcUpdateTxDoneAmpdu2 = 0x400057c0;*/
 rcUpSched = 0x400057cc;
 rssi_margin = 0x400057d8;
 rx11NRate2AMPDULimit = 0x400057e4;

diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
+ −		esp32/libcore.a
+ −		esp32/libespnow.a
+ −		esp32/libmesh.a
+ −		esp32/libnet80211.a
+ −		esp32/libpp.a
+ −		esp32/libsmartconfig.a
+ −		esp32/libwapi.a
+ −		esp32c2/libcore.a
+ −		esp32c2/libespnow.a
+ −		esp32c2/libnet80211.a
+ −		esp32c2/libpp.a
+ −		esp32c2/libsmartconfig.a
+ −		esp32c3/libcore.a
+ −		esp32c3/libespnow.a
+ −		esp32c3/libmesh.a
+ −		esp32c3/libnet80211.a
+ −		esp32c3/libpp.a
+ −		esp32c3/libsmartconfig.a
+ −		esp32c3/libwapi.a
+ −		esp32c6/libcore.a
+ −		esp32c6/libespnow.a
+ −		esp32c6/libmesh.a
+ −		esp32c6/libnet80211.a
+ −		esp32c6/libpp.a
+ −		esp32c6/libsmartconfig.a
+ −		esp32c6/libwapi.a
+ −		esp32s2/libcore.a
+ −		esp32s2/libespnow.a
+ −		esp32s2/libmesh.a
+ −		esp32s2/libnet80211.a
+ −		esp32s2/libpp.a
+ −		esp32s2/libsmartconfig.a
+ −		esp32s2/libwapi.a
+ −		esp32s3/libcore.a
+ −		esp32s3/libespnow.a
+ −		esp32s3/libmesh.a
+ −		esp32s3/libnet80211.a
+ −		esp32s3/libpp.a
+ −		esp32s3/libsmartconfig.a
+ −		esp32s3/libwapi.a