Merge pull request #14471 from arduino/whd_patch

COMPONENT_WHD: make reusable code available for other targets

Author: 0xc0170

.codecheckignore

@@ -6,6 +6,7 @@
 ^connectivity/libraries/ppp
 ^connectivity/drivers/emac
 ^connectivity/drivers/mbedtls
+^connectivity/drivers/wifi/COMPONENT_WHD
 ^connectivity/mbedtls
 ^features/frameworks
 ^connectivity/lwipstack/lwip

connectivity/drivers/emac/CMakeLists.txt

@@ -25,6 +25,10 @@ elseif("Silicon_Labs" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(TARGET_Silicon_Labs)
 endif()
 
+if("WHD" IN_LIST MBED_TARGET_LABELS)
+    add_subdirectory(COMPONENT_WHD)
+endif()
+
 target_link_libraries(mbed-emac
     INTERFACE
         mbed-netsocket

connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/CMakeLists.txt renamed to connectivity/drivers/emac/COMPONENT_WHD/CMakeLists.txt

@@ -100,7 +100,7 @@ class CyDhcpServer {
     NetworkStack *_nstack = NULL;
     NetworkInterface *_niface = NULL;
     UDPSocket _socket;
-    Thread _thread;
+    rtos::Thread _thread;
     bool _running = false;
 
     cy_ip_addr_t _available_addr;

connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/CyDhcpServer.cpp renamed to connectivity/drivers/emac/COMPONENT_WHD/interface/CyDhcpServer.cpp

@@ -27,6 +27,7 @@
 #include "whd_emac.h"
 #include "whd_wifi_api.h"
 #include "whd_wlioctl.h"
+#include "cy_utils.h"
 
 #define CMP_MAC( a, b )  (((((unsigned char*)a)[0])==(((unsigned char*)b)[0]))&& \
                           ((((unsigned char*)a)[1])==(((unsigned char*)b)[1]))&& \

connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/CyDhcpServer.h renamed to connectivity/drivers/emac/COMPONENT_WHD/interface/CyDhcpServer.h

@@ -4,7 +4,3 @@
 if("SCL" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(COMPONENT_SCL)
 endif()
-
-if("WHD" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(COMPONENT_WHD)
-endif()

connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/WhdAccessPoint.cpp renamed to connectivity/drivers/emac/COMPONENT_WHD/interface/WhdAccessPoint.cpp

@@ -3,6 +3,8 @@
 
 add_subdirectory(TARGET_WICED EXCLUDE_FROM_ALL)
 
+add_subdirectory(COMPONENT_WHD EXCLUDE_FROM_ALL)
+
 add_subdirectory(esp8266-driver)
 
 target_link_libraries(mbed-wifi

connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/WhdAccessPoint.h renamed to connectivity/drivers/emac/COMPONENT_WHD/interface/WhdAccessPoint.h

@@ -1,6 +1,8 @@
 # Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+add_subdirectory(network EXCLUDE_FROM_ALL)
+
 add_library(mbed-cy-psoc6-whd-43012 INTERFACE)
 target_include_directories(mbed-cy-psoc6-whd-43012
     INTERFACE

connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/WhdSTAInterface.cpp renamed to connectivity/drivers/emac/COMPONENT_WHD/interface/WhdSTAInterface.cpp

@@ -2,8 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 add_subdirectory(COMPONENT_SCL EXCLUDE_FROM_ALL)
-add_subdirectory(COMPONENT_WHD EXCLUDE_FROM_ALL)
-add_subdirectory(common/COMPONENT_WHD EXCLUDE_FROM_ALL)
 
 add_library(mbed-cat1a INTERFACE)