espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 04:34:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

esp_wifi: Move wifi OS adapter structures into esp_wifi component

Browse Source
This commit is contained in:
Angus Gratton
2019-10-30 16:13:33 +11:00
committed by Angus Gratton
parent 5cd1f5e7c1
commit f616d2f2de
7 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/esp32/CMakeLists.txt
View File

@@ -20,7 +20,6 @@ else()
"crosscore_int.c" "crosscore_int.c"
"dport_access.c" "dport_access.c"
"dport_panic_highint_hdl.S" "dport_panic_highint_hdl.S"
"esp_adapter.c"
"esp_timer_esp32.c" "esp_timer_esp32.c"
"esp_himem.c" "esp_himem.c"
"hw_random.c" "hw_random.c"

1
components/esp32s2beta/CMakeLists.txt
View File

@@ -18,7 +18,6 @@ else()
"crosscore_int.c" "crosscore_int.c"
"dport_access.c" "dport_access.c"
"dport_panic_highint_hdl.S" "dport_panic_highint_hdl.S"
"esp_adapter.c"
"esp_timer_esp32s2beta.c" "esp_timer_esp32s2beta.c"
"hw_random.c" "hw_random.c"
"int_wdt.c" "int_wdt.c"

1
components/esp_wifi/CMakeLists.txt
View File

@@ -17,6 +17,7 @@ idf_component_register(SRCS "src/coexist.c"
"src/wifi_init.c" "src/wifi_init.c"
"src/wifi_default.c" "src/wifi_default.c"
"src/wifi_netif.c" "src/wifi_netif.c"
"${idf_target}/esp_adapter.c"
INCLUDE_DIRS "include" "${idf_target}/include" INCLUDE_DIRS "include" "${idf_target}/include"
PRIV_REQUIRES wpa_supplicant nvs_flash esp_netif PRIV_REQUIRES wpa_supplicant nvs_flash esp_netif
LDFRAGMENTS "${ldfragments}") LDFRAGMENTS "${ldfragments}")

2
components/esp_wifi/component.mk
View File

@@ -3,7 +3,7 @@
# #
COMPONENT_ADD_INCLUDEDIRS := include $(IDF_TARGET)/include COMPONENT_ADD_INCLUDEDIRS := include $(IDF_TARGET)/include
COMPONENT_SRCDIRS := src COMPONENT_SRCDIRS := src $(IDF_TARGET)
ifndef CONFIG_ESP32_NO_BLOBS ifndef CONFIG_ESP32_NO_BLOBS
LIBS := core rtc net80211 pp smartconfig coexist espnow phy mesh LIBS := core rtc net80211 pp smartconfig coexist espnow phy mesh

0
components/esp32/esp_adapter.c → components/esp_wifi/esp32/esp_adapter.c
View File

0
components/esp32s2beta/esp_adapter.c → components/esp_wifi/esp32s2beta/esp_adapter.c
View File

1
tools/ci/test_build_system_cmake.sh
View File

@@ -297,6 +297,7 @@ function run_tests()
export fake_target=esp31b export fake_target=esp31b
mkdir -p components/$fake_target mkdir -p components/$fake_target
mkdir -p ${IDF_PATH}/components/xtensa/$fake_target/include mkdir -p ${IDF_PATH}/components/xtensa/$fake_target/include
mkdir -p ${IDF_PATH}/components/esp_wifi/$fake_target/include
touch components/$fake_target/CMakeLists.txt touch components/$fake_target/CMakeLists.txt
cp ${IDF_PATH}/tools/cmake/toolchain-esp32.cmake components/$fake_target/toolchain-$fake_target.cmake cp ${IDF_PATH}/tools/cmake/toolchain-esp32.cmake components/$fake_target/toolchain-$fake_target.cmake
${SED} -i.bak '/cmake_minimum_required/ a\ ${SED} -i.bak '/cmake_minimum_required/ a\