From f616d2f2decc189afe32dd41272db35038a90932 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@espressif.com>
Date: Wed, 30 Oct 2019 16:13:33 +1100
Subject: [PATCH] esp_wifi: Move wifi OS adapter structures into esp_wifi
 component

---
 components/esp32/CMakeLists.txt                     | 1 -
 components/esp32s2beta/CMakeLists.txt               | 1 -
 components/esp_wifi/CMakeLists.txt                  | 1 +
 components/esp_wifi/component.mk                    | 2 +-
 components/{ => esp_wifi}/esp32/esp_adapter.c       | 0
 components/{ => esp_wifi}/esp32s2beta/esp_adapter.c | 0
 tools/ci/test_build_system_cmake.sh                 | 1 +
 7 files changed, 3 insertions(+), 3 deletions(-)
 rename components/{ => esp_wifi}/esp32/esp_adapter.c (100%)
 rename components/{ => esp_wifi}/esp32s2beta/esp_adapter.c (100%)

diff --git a/components/esp32/CMakeLists.txt b/components/esp32/CMakeLists.txt
index 790d13f8d..4f97a3c1c 100644
--- a/components/esp32/CMakeLists.txt
+++ b/components/esp32/CMakeLists.txt
@@ -20,7 +20,6 @@ else()
         "crosscore_int.c"
         "dport_access.c"
         "dport_panic_highint_hdl.S"
-        "esp_adapter.c"
         "esp_timer_esp32.c"
         "esp_himem.c"
         "hw_random.c"
diff --git a/components/esp32s2beta/CMakeLists.txt b/components/esp32s2beta/CMakeLists.txt
index 6e181e7a7..b707ddaaf 100644
--- a/components/esp32s2beta/CMakeLists.txt
+++ b/components/esp32s2beta/CMakeLists.txt
@@ -18,7 +18,6 @@ else()
              "crosscore_int.c"
              "dport_access.c"
              "dport_panic_highint_hdl.S"
-             "esp_adapter.c"
              "esp_timer_esp32s2beta.c"
              "hw_random.c"
              "int_wdt.c"
diff --git a/components/esp_wifi/CMakeLists.txt b/components/esp_wifi/CMakeLists.txt
index 7338c480c..f16d4d16e 100644
--- a/components/esp_wifi/CMakeLists.txt
+++ b/components/esp_wifi/CMakeLists.txt
@@ -17,6 +17,7 @@ idf_component_register(SRCS "src/coexist.c"
                             "src/wifi_init.c"
                             "src/wifi_default.c"
                             "src/wifi_netif.c"
+                            "${idf_target}/esp_adapter.c"
                     INCLUDE_DIRS "include" "${idf_target}/include"
                     PRIV_REQUIRES wpa_supplicant nvs_flash esp_netif
                     LDFRAGMENTS "${ldfragments}")
diff --git a/components/esp_wifi/component.mk b/components/esp_wifi/component.mk
index 578041750..846b9130c 100644
--- a/components/esp_wifi/component.mk
+++ b/components/esp_wifi/component.mk
@@ -3,7 +3,7 @@
 #
 
 COMPONENT_ADD_INCLUDEDIRS := include $(IDF_TARGET)/include
-COMPONENT_SRCDIRS := src
+COMPONENT_SRCDIRS := src $(IDF_TARGET)
 
 ifndef CONFIG_ESP32_NO_BLOBS
     LIBS := core rtc net80211 pp smartconfig coexist espnow phy mesh
diff --git a/components/esp32/esp_adapter.c b/components/esp_wifi/esp32/esp_adapter.c
similarity index 100%
rename from components/esp32/esp_adapter.c
rename to components/esp_wifi/esp32/esp_adapter.c
diff --git a/components/esp32s2beta/esp_adapter.c b/components/esp_wifi/esp32s2beta/esp_adapter.c
similarity index 100%
rename from components/esp32s2beta/esp_adapter.c
rename to components/esp_wifi/esp32s2beta/esp_adapter.c
diff --git a/tools/ci/test_build_system_cmake.sh b/tools/ci/test_build_system_cmake.sh
index fd825e9a0..426f152d6 100755
--- a/tools/ci/test_build_system_cmake.sh
+++ b/tools/ci/test_build_system_cmake.sh
@@ -297,6 +297,7 @@ function run_tests()
     export fake_target=esp31b
     mkdir -p components/$fake_target
     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
     cp ${IDF_PATH}/tools/cmake/toolchain-esp32.cmake components/$fake_target/toolchain-$fake_target.cmake
     ${SED} -i.bak '/cmake_minimum_required/ a\