From fd9bc30aca5d76a57f72ae2d0fa6181205b5811d Mon Sep 17 00:00:00 2001
From: morris <maoshengrong@espressif.com>
Date: Mon, 18 Mar 2019 19:58:04 +0800
Subject: [PATCH] separate legacy esp_event from esp32 component to esp_event

---
 components/esp32/CMakeLists.txt                            | 7 ++-----
 components/esp_event/CMakeLists.txt                        | 7 +++++--
 components/{esp32 => esp_event}/event_default_handlers.c   | 0
 components/{esp32 => esp_event}/event_loop.c               | 0
 components/{esp32 => esp_event}/include/esp_event_legacy.h | 0
 components/{esp32 => esp_event}/include/esp_event_loop.h   | 0
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename components/{esp32 => esp_event}/event_default_handlers.c (100%)
 rename components/{esp32 => esp_event}/event_loop.c (100%)
 rename components/{esp32 => esp_event}/include/esp_event_legacy.h (100%)
 rename components/{esp32 => esp_event}/include/esp_event_loop.h (100%)

diff --git a/components/esp32/CMakeLists.txt b/components/esp32/CMakeLists.txt
index dbacc35a7..eb73b5302 100644
--- a/components/esp32/CMakeLists.txt
+++ b/components/esp32/CMakeLists.txt
@@ -25,8 +25,6 @@ else()
                    "esp_timer_esp32.c"
                    "esp_himem.c"
                    "ets_timer_legacy.c"
-                   "event_default_handlers.c"
-                   "event_loop.c"
                    "fast_crypto_ops.c"
                    "freertos_hooks.c"
                    "gdbstub.c"
@@ -53,12 +51,11 @@ else()
                    "hwcrypto/sha.c")
     set(COMPONENT_ADD_INCLUDEDIRS "include")
 
-    set(COMPONENT_REQUIRES driver tcpip_adapter esp_event efuse)
+    set(COMPONENT_REQUIRES driver esp_event efuse)
     # driver is a public requirement because esp_sleep.h uses gpio_num_t & touch_pad_t
-    # tcpip_adapter is a public requirement because esp_event.h uses tcpip_adapter types
     # app_update is added here because cpu_start.c uses esp_ota_get_app_description() function.
     set(COMPONENT_PRIV_REQUIRES
-        app_trace app_update bootloader_support ethernet log mbedtls nvs_flash
+        app_trace app_update bootloader_support log mbedtls nvs_flash
         pthread smartconfig_ack spi_flash vfs wpa_supplicant xtensa-debug-module espcoredump)
 
     set(COMPONENT_ADD_LDFRAGMENTS linker.lf ld/esp32_fragments.lf)
diff --git a/components/esp_event/CMakeLists.txt b/components/esp_event/CMakeLists.txt
index 2e791df3b..999e7f2fd 100644
--- a/components/esp_event/CMakeLists.txt
+++ b/components/esp_event/CMakeLists.txt
@@ -1,9 +1,12 @@
 set(COMPONENT_SRCS "default_event_loop.c"
                    "esp_event.c"
-                   "esp_event_private.c")
+                   "esp_event_private.c"
+                   "event_loop.c"
+                   "event_default_handlers.c")
 set(COMPONENT_ADD_INCLUDEDIRS "include")
 set(COMPONENT_PRIV_INCLUDEDIRS "private_include")
 
-set(COMPONENT_REQUIRES log)
+set(COMPONENT_REQUIRES log tcpip_adapter)
+set(COMPONENT_PRIV_REQUIRES ethernet)
 
 register_component()
diff --git a/components/esp32/event_default_handlers.c b/components/esp_event/event_default_handlers.c
similarity index 100%
rename from components/esp32/event_default_handlers.c
rename to components/esp_event/event_default_handlers.c
diff --git a/components/esp32/event_loop.c b/components/esp_event/event_loop.c
similarity index 100%
rename from components/esp32/event_loop.c
rename to components/esp_event/event_loop.c
diff --git a/components/esp32/include/esp_event_legacy.h b/components/esp_event/include/esp_event_legacy.h
similarity index 100%
rename from components/esp32/include/esp_event_legacy.h
rename to components/esp_event/include/esp_event_legacy.h
diff --git a/components/esp32/include/esp_event_loop.h b/components/esp_event/include/esp_event_loop.h
similarity index 100%
rename from components/esp32/include/esp_event_loop.h
rename to components/esp_event/include/esp_event_loop.h