ESP: Fix compile errors for ESP32H2 based on IDF v5.0-dev (#15291)

* Prepare support for IDF version v5.0 * include 'inet/arpa-inet-compatibility.h' in TestInetAddress.cpp
project-chip · Feb 22, 2022 · 2b80c6a · 2b80c6a
1 parent 980cafa
commit 2b80c6a
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 52 deletions.
diff --git a/config/esp32/components/chip/CMakeLists.txt b/config/esp32/components/chip/CMakeLists.txt
@@ -186,8 +186,11 @@ idf_component_get_property(freertos_dir freertos COMPONENT_DIR)
 
 # ESP-IDF components usually need 'freertos/<header.h>', while
 # CHIP might include do 'header.h'.
+# In IDF V5.0, this path has been moved to
+# '${freertos_component}/FreeRTOS-Kernel/include/freertos'
 target_include_directories(${COMPONENT_LIB} PRIVATE
-    "${freertos_dir}/include/freertos")
+    "${freertos_dir}/include/freertos"
+    "${freertos_dir}/FreeRTOS-Kernel/include/freertos")
 
 target_include_directories(${COMPONENT_LIB} INTERFACE
     "${CHIP_ROOT}/src/platform/ESP32"

diff --git a/src/inet/arpa-inet-compatibility.h b/src/inet/arpa-inet-compatibility.h
@@ -31,10 +31,18 @@
 #include <lwip/opt.h>
 
 #if defined(LWIP_DONT_PROVIDE_BYTEORDER_FUNCTIONS)
+#ifndef htons
 #define htons(x) lwip_htons(x)
+#endif
+#ifndef ntohs
 #define ntohs(x) lwip_ntohs(x)
+#endif
+#ifndef htonl
 #define htonl(x) lwip_htonl(x)
+#endif
+#ifndef ntohl
 #define ntohl(x) lwip_ntohl(x)
+#endif
 #endif // defined(LWIP_DONT_PROVIDE_BYTEORDER_FUNCTIONS)
 
 #endif // CHIP_SYSTEM_CONFIG_USE_LWIP

diff --git a/src/inet/tests/TestInetAddress.cpp b/src/inet/tests/TestInetAddress.cpp
@@ -32,9 +32,7 @@
 #include <lwip/init.h>
 #include <lwip/ip_addr.h>
 
-#if LWIP_DONT_PROVIDE_BYTEORDER_FUNCTIONS
-#define htonl(x) lwip_htonl(x)
-#endif
+#include <inet/arpa-inet-compatibility.h>
 
 #else
 #include <netinet/in.h>

diff --git a/src/platform/ESP32/BUILD.gn b/src/platform/ESP32/BUILD.gn
@@ -74,8 +74,8 @@ static_library("ESP32") {
 
   if (chip_enable_openthread) {
     sources += [
+      "../OpenThread/DnssdImpl.cpp",
       "../OpenThread/OpenThreadUtils.cpp",
-      "ESPThreadConfig.h",
       "ThreadStackManagerImpl.cpp",
       "ThreadStackManagerImpl.h",
     ]

diff --git a/src/platform/ESP32/CHIPDevicePlatformConfig.h b/src/platform/ESP32/CHIPDevicePlatformConfig.h
@@ -46,6 +46,7 @@
 
 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD CONFIG_OPENTHREAD_ENABLED
 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD_SRP_CLIENT CONFIG_OPENTHREAD_SRP_CLIENT
+#define CHIP_DEVICE_CONFIG_ENABLE_THREAD_DNS_CLIENT CONFIG_OPENTHREAD_SRP_CLIENT
 
 #if CONFIG_IDF_TARGET_ESP32H2
 #define CHIP_DEVICE_CONFIG_ENABLE_WIFI 0

diff --git a/src/platform/ESP32/ESPThreadConfig.h b/src/platform/ESP32/ESPThreadConfig.h
diff --git a/src/platform/ESP32/ThreadStackManagerImpl.cpp b/src/platform/ESP32/ThreadStackManagerImpl.cpp
@@ -26,7 +26,6 @@
 
 #include <platform/ThreadStackManager.h>
 
-#include <platform/ESP32/ESPThreadConfig.h>
 #include <platform/ESP32/ThreadStackManagerImpl.h>
 #include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.cpp>
 
@@ -90,12 +89,23 @@ void ThreadStackManagerImpl::_OnCHIPoBLEAdvertisingStop()
     // Intentionally empty.
 }
 
-void ThreadStackManagerImpl::ESPThreadTask(void * arg)
+void ThreadStackManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
 {
-    esp_openthread_launch_mainloop();
-    esp_openthread_netif_glue_deinit();
-    esp_vfs_eventfd_unregister();
-    vTaskDelete(NULL);
+    Internal::GenericThreadStackManagerImpl_OpenThread<ThreadStackManagerImpl>::_OnPlatformEvent(event);
+
+    if (event->Type == DeviceEventType::kThreadStateChange && event->ThreadStateChange.RoleChanged)
+    {
+        const bool isAttached = IsThreadAttached();
+        VerifyOrReturn(isAttached != mIsAttached);
+        ChipDeviceEvent attachEvent;
+        attachEvent.Type                            = DeviceEventType::kThreadConnectivityChange;
+        attachEvent.ThreadConnectivityChange.Result = isAttached ? kConnectivity_Established : kConnectivity_Lost;
+
+        CHIP_ERROR error = PlatformMgr().PostEvent(&attachEvent);
+        VerifyOrReturn(error == CHIP_NO_ERROR,
+                       ChipLogError(DeviceLayer, "Failed to post Thread connectivity change: %" CHIP_ERROR_FORMAT, error.Format()));
+        mIsAttached = isAttached;
+    }
 }
 
 } // namespace DeviceLayer

diff --git a/src/platform/ESP32/ThreadStackManagerImpl.h b/src/platform/ESP32/ThreadStackManagerImpl.h
@@ -67,13 +67,15 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
     void _ProcessThreadActivity();
     void _OnCHIPoBLEAdvertisingStart();
     void _OnCHIPoBLEAdvertisingStop();
+    void _OnPlatformEvent(const ChipDeviceEvent * event);
 
 private:
     friend ThreadStackManager & ::chip::DeviceLayer::ThreadStackMgr(void);
     friend ThreadStackManagerImpl & ::chip::DeviceLayer::ThreadStackMgrImpl(void);
     static ThreadStackManagerImpl sInstance;
     ThreadStackManagerImpl() = default;
-    static void ESPThreadTask(void * arg);
+
+    bool mIsAttached = false;
 };
 
 /**