feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'feature/support_esp32s3_beta3_wifi' into 'master'

Browse Source 
esp_wifi: support esp32s3 beta3 wifi

Closes WIFI-3550

See merge request espressif/esp-idf!12863
This commit is contained in:
Jiang Jiang Jian
2021-04-16 03:09:19 +00:00
parent e6fd582fdf dd14e97375
commit db67047eb9
4 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_hw_support/sleep_modes.c
View File

@@ -552,8 +552,12 @@ static uint32_t IRAM_ATTR esp_sleep_start(uint32_t pd_flags)
#if !CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP #if !CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP
/* If not possible stack is in RTC FAST memory, use the ROM function to calculate the CRC and save ~140 bytes IRAM */ /* If not possible stack is in RTC FAST memory, use the ROM function to calculate the CRC and save ~140 bytes IRAM */
#if CONFIG_IDF_TARGET_ESP32S3//TODO: WIFI-3542
result = 0;
#else
set_rtc_memory_crc(); set_rtc_memory_crc();
result = call_rtc_sleep_start(reject_triggers); result = call_rtc_sleep_start(reject_triggers);
#endif
#else #else
/* Otherwise, need to call the dedicated soc function for this */ /* Otherwise, need to call the dedicated soc function for this */
result = rtc_deep_sleep_start(s_config.wakeup_triggers, reject_triggers); result = rtc_deep_sleep_start(s_config.wakeup_triggers, reject_triggers);

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

@@ -1750,7 +1750,6 @@ lmacReachShortLimit = 0x40005070;
lmacRecycleMPDU = 0x4000507c; lmacRecycleMPDU = 0x4000507c;
lmacRxDone = 0x40005088; lmacRxDone = 0x40005088;
lmacSetTxFrame = 0x40005094; lmacSetTxFrame = 0x40005094;
lmacTxDone = 0x400050a0;
lmacTxFrame = 0x400050ac; lmacTxFrame = 0x400050ac;
mac_tx_set_duration = 0x400050b8; mac_tx_set_duration = 0x400050b8;
mac_tx_set_htsig = 0x400050c4; mac_tx_set_htsig = 0x400050c4;
@@ -1793,7 +1792,6 @@ ppEnqueueRxq = 0x40005274;
ppEnqueueTxDone = 0x40005280; ppEnqueueTxDone = 0x40005280;
ppGetTxQFirstAvail_Locked = 0x4000528c; ppGetTxQFirstAvail_Locked = 0x4000528c;
ppGetTxframe = 0x40005298; ppGetTxframe = 0x40005298;
ppMapTxQueue = 0x400052a4;
ppProcTxSecFrame = 0x400052b0; ppProcTxSecFrame = 0x400052b0;
ppProcessRxPktHdr = 0x400052bc; ppProcessRxPktHdr = 0x400052bc;
ppProcessTxQ = 0x400052c8; ppProcessTxQ = 0x400052c8;
@@ -1828,7 +1826,6 @@ rcampduuprate = 0x40005418;
rcClearCurAMPDUSched = 0x40005424; rcClearCurAMPDUSched = 0x40005424;
rcClearCurSched = 0x40005430; rcClearCurSched = 0x40005430;
rcClearCurStat = 0x4000543c; rcClearCurStat = 0x4000543c;
rcGetSched = 0x40005448;
rcLowerSched = 0x40005454; rcLowerSched = 0x40005454;
rcSetTxAmpduLimit = 0x40005460; rcSetTxAmpduLimit = 0x40005460;
rcTxUpdatePer = 0x4000546c; rcTxUpdatePer = 0x4000546c;

9
components/esp_wifi/CMakeLists.txt
View File

@@ -8,15 +8,6 @@ else()
set(ldfragments "linker.lf") set(ldfragments "linker.lf")
endif() endif()
# remove these when wifi support is ready on esp32-s3
if(${idf_target} STREQUAL "esp32s3")
idf_component_register(INCLUDE_DIRS "include"
REQUIRES esp_event
PRIV_REQUIRES wpa_supplicant nvs_flash esp_netif)
return()
endif()
if(IDF_TARGET_ESP32) if(IDF_TARGET_ESP32)
# dport workaround headers are in esp32 component # dport workaround headers are in esp32 component
set(extra_priv_requires esp32) set(extra_priv_requires esp32)

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: 24b64035ba...ade3a3a587