alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-20 20:56:01 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/malloc_free_removal_v5.1' into 'release/v5.1'

Browse Source 
Backport some wifi fixes (backport v5.1)

See merge request espressif/esp-idf!24264
This commit is contained in:
Jiang Jiang Jian 2023-07-04 12:10:21 +08:00
commit 54360507f3
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/esp_rom/esp32c2/ld/esp32c2.rom.ld
View File

@ -1545,7 +1545,7 @@ lmacReachLongLimit = 0x40001b3c;
lmacReachShortLimit = 0x40001b40;
lmacRecycleMPDU = 0x40001b44;
lmacRxDone = 0x40001b48;
lmacSetTxFrame = 0x40001b4c;
/*lmacSetTxFrame = 0x40001b4c;*/
lmacTxDone = 0x40001b50;
lmacTxFrame = 0x40001b54;
mac_tx_set_duration = 0x40001b58;
@ -1685,7 +1685,7 @@ hal_mac_get_txq_pmd = 0x40001d6c;
lmacDiscardFrameExchangeSequence = 0x40001d70;
lmacDisableTransmit = 0x40001d74;
lmacProcessTxTimeout = 0x40001d78;
lmacProcessTxSuccess = 0x40001d7c;
/*lmacProcessTxSuccess = 0x40001d7c;*/
lmacProcessCollision = 0x40001d80;
lmacProcessTxRtsError = 0x40001d84;
lmacProcessCtsTimeout = 0x40001d88;
@ -1702,7 +1702,7 @@ ppReSendBar = 0x40001db0;
lmacProcessLongRetryFail = 0x40001db4;
lmacRetryTxFrame = 0x40001db8;
lmacProcessCollisions_task = 0x40001dbc;
lmacProcessTxopQComplete = 0x40001dc0;
/*lmacProcessTxopQComplete = 0x40001dc0;*/
lmacInitAc = 0x40001dc4;
lmacInit = 0x40001dc8;
mac_tx_set_txop_q = 0x40001dcc;

2
components/esp_rom/esp32c3/ld/esp32c3.rom.ld
View File

@ -1608,7 +1608,7 @@ lmacReachLongLimit = 0x40001618;
lmacReachShortLimit = 0x4000161c;
lmacRecycleMPDU = 0x40001620;
lmacRxDone = 0x40001624;
lmacSetTxFrame = 0x40001628;
/*lmacSetTxFrame = 0x40001628;*/
/*lmacTxFrame = 0x40001630;*/
mac_tx_set_duration = 0x40001634;
/* mac_tx_set_htsig = 0x40001638;*/

2
components/esp_rom/esp32c6/ld/esp32c6.rom.pp.ld
View File

@ -181,7 +181,7 @@ lmacProcessLongFrameSuccess = 0x40000e54;
lmacProcessShortFrameSuccess = 0x40000e58;
//lmacDiscardFrameExchangeSequence = 0x40000e5c;
lmacProcessTBSuccess = 0x40000e60;
lmacProcessTxSuccess = 0x40000e64;
/*lmacProcessTxSuccess = 0x40000e64;*/
lmacProcessAckTimeout = 0x40000e68;
//lmacProcessTxComplete = 0x40000e6c;
//ppRemoveHTC = 0x40000e70;

2
components/esp_rom/esp32s3/ld/esp32s3.rom.ld
View File

@ -1918,7 +1918,7 @@ lmacReachLongLimit = 0x40005388;
lmacReachShortLimit = 0x40005394;
lmacRecycleMPDU = 0x400053a0;
lmacRxDone = 0x400053ac;
lmacSetTxFrame = 0x400053b8;
/*lmacSetTxFrame = 0x400053b8;*/
lmacTxDone = 0x400053c4;
/*lmacTxFrame = 0x400053d0;*/
mac_tx_set_duration = 0x400053dc;

2
components/esp_wifi/lib

@ -1 +1 @@
Subproject commit 1998c24da5c3c4a481075f0f4d659359e77fd414
Subproject commit c1a8747dab1ef3a138195b0a7e5de8dd9dfe539e