Skip to content

COMPONENT_WHD: make reusable code available for other targets #14471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
May 31, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .codecheckignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions connectivity/drivers/emac/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]))&& \
Expand Down
4 changes: 0 additions & 4 deletions connectivity/drivers/emac/TARGET_Cypress/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
2 changes: 2 additions & 0 deletions connectivity/drivers/wifi/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
File renamed without changes.
2 changes: 0 additions & 2 deletions targets/TARGET_Cypress/TARGET_PSOC6/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down