Convert emac, cellular, and wifi targets, and enable one UDP test

pull/15339/head
Jamie Smith 2022-05-30 18:35:22 -07:00 committed by Jay Sridharan
parent e97e9424b4
commit 3cf77c2ca1
85 changed files with 205 additions and 172 deletions

View File

@ -6,13 +6,10 @@ add_library(mbed-802.15.4-rf INTERFACE)
add_library(mbed-ble INTERFACE)
add_library(mbed-ble-cordio INTERFACE)
add_library(mbed-ble-cordio_ll INTERFACE)
add_library(mbed-emac INTERFACE)
add_library(mbed-lorawan INTERFACE)
add_library(mbed-mbedtls STATIC EXCLUDE_FROM_ALL)
add_library(mbed-nfc INTERFACE)
add_library(mbed-ppp INTERFACE)
add_library(mbed-wifi INTERFACE)
add_subdirectory(nanostack)
add_subdirectory(cellular)

View File

@ -31,12 +31,13 @@ target_compile_definitions(mbed-cellular
)
target_sources(mbed-cellular
PUBLIC
PRIVATE
source/CellularNonIPSocket.cpp
)
target_link_libraries(mbed-cellular
PUBLIC
mbed-netsocket
mbed-netsocket-api
mbed-core-flags
mbed-randlib
)

View File

@ -2,12 +2,12 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-cellular
INTERFACE
PUBLIC
.
)
target_sources(mbed-cellular
INTERFACE
PRIVATE
ALT1250_PPP.cpp
ALT1250_PPP_CellularContext.cpp
ALT1250_PPP_CellularNetwork.cpp

View File

@ -15,6 +15,6 @@ add_subdirectory(TELIT)
add_subdirectory(UBLOX)
target_include_directories(mbed-cellular
INTERFACE
PUBLIC
.
)

View File

@ -2,11 +2,11 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-cellular
INTERFACE
PUBLIC
.
)
target_sources(mbed-cellular
INTERFACE
PRIVATE
STModCellular.cpp
)

View File

@ -2,12 +2,12 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-cellular
INTERFACE
PUBLIC
.
)
target_sources(mbed-cellular
INTERFACE
PRIVATE
GEMALTO_CINTERION.cpp
GEMALTO_CINTERION_CellularContext.cpp
GEMALTO_CINTERION_CellularInformation.cpp

View File

@ -2,11 +2,11 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-cellular
INTERFACE
PUBLIC
.
)
target_sources(mbed-cellular
INTERFACE
PRIVATE
GENERIC_AT3GPP.cpp
)

View File

@ -2,12 +2,12 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-cellular
INTERFACE
PUBLIC
.
)
target_sources(mbed-cellular
INTERFACE
PRIVATE
SARA4_PPP.cpp
SARA4_PPP_CellularNetwork.cpp
)

View File

@ -2,12 +2,12 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-cellular
INTERFACE
PUBLIC
.
)
target_sources(mbed-cellular
INTERFACE
PRIVATE
QUECTEL_BC95.cpp
QUECTEL_BC95_CellularContext.cpp
QUECTEL_BC95_CellularInformation.cpp

View File

@ -2,12 +2,12 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-cellular
INTERFACE
PUBLIC
.
)
target_sources(mbed-cellular
INTERFACE
PRIVATE
QUECTEL_BG96.cpp
QUECTEL_BG96_CellularContext.cpp
QUECTEL_BG96_CellularInformation.cpp

View File

@ -2,11 +2,11 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-cellular
INTERFACE
PUBLIC
.
)
target_sources(mbed-cellular
INTERFACE
PRIVATE
QUECTEL_EC2X.cpp
)

View File

@ -2,12 +2,12 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-cellular
INTERFACE
PUBLIC
.
)
target_sources(mbed-cellular
INTERFACE
PRIVATE
QUECTEL_M26.cpp
QUECTEL_M26_CellularContext.cpp
QUECTEL_M26_CellularInformation.cpp

View File

@ -2,12 +2,12 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-cellular
INTERFACE
PUBLIC
.
)
target_sources(mbed-cellular
INTERFACE
PRIVATE
QUECTEL_UG96.cpp
QUECTEL_UG96_CellularContext.cpp
)

View File

@ -2,12 +2,12 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-cellular
INTERFACE
PUBLIC
.
)
target_sources(mbed-cellular
INTERFACE
PRIVATE
RM1000_AT.cpp
RM1000_AT_CellularContext.cpp
RM1000_AT_CellularNetwork.cpp

View File

@ -2,11 +2,11 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-cellular
INTERFACE
PUBLIC
.
)
target_sources(mbed-cellular
INTERFACE
PRIVATE
TELIT_HE910.cpp
)

View File

@ -2,12 +2,12 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-cellular
INTERFACE
PUBLIC
.
)
target_sources(mbed-cellular
INTERFACE
PRIVATE
TELIT_ME310.cpp
TELIT_ME310_CellularContext.cpp
TELIT_ME310_CellularNetwork.cpp

View File

@ -2,12 +2,12 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-cellular
INTERFACE
PUBLIC
.
)
target_sources(mbed-cellular
INTERFACE
PRIVATE
TELIT_ME910.cpp
TELIT_ME910_CellularContext.cpp
TELIT_ME910_CellularNetwork.cpp

View File

@ -2,12 +2,12 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-cellular
INTERFACE
PUBLIC
.
)
target_sources(mbed-cellular
INTERFACE
PRIVATE
UBLOX_AT.cpp
UBLOX_AT_CellularContext.cpp
UBLOX_AT_CellularNetwork.cpp

View File

@ -2,12 +2,12 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-cellular
INTERFACE
PUBLIC
.
)
target_sources(mbed-cellular
INTERFACE
PRIVATE
UBLOX_N2XX.cpp
UBLOX_N2XX_CellularContext.cpp
UBLOX_N2XX_CellularNetwork.cpp

View File

@ -2,11 +2,11 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-cellular
INTERFACE
PUBLIC
.
)
target_sources(mbed-cellular
INTERFACE
PRIVATE
UBLOX_PPP.cpp
)

View File

@ -1,6 +1,12 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
if(NOT "DEVICE_EMAC=1" IN_LIST MBED_TARGET_DEFINITIONS)
return()
endif()
add_library(mbed-emac STATIC EXCLUDE_FROM_ALL)
if("ARM_FM" IN_LIST MBED_TARGET_LABELS)
add_subdirectory(TARGET_ARM_FM)
elseif("ARM_SSG" IN_LIST MBED_TARGET_LABELS)
@ -30,6 +36,8 @@ if("WHD" IN_LIST MBED_TARGET_LABELS)
endif()
target_link_libraries(mbed-emac
INTERFACE
mbed-netsocket
PUBLIC
mbed-netsocket-api
PRIVATE
mbed-rtos-flags
)

View File

@ -2,11 +2,11 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-emac
INTERFACE
PUBLIC
.
)
target_sources(mbed-emac
INTERFACE
PRIVATE
fvp_emac.cpp
)

View File

@ -2,11 +2,11 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-emac
INTERFACE
PUBLIC
.
)
target_sources(mbed-emac
INTERFACE
PRIVATE
smsc9220_emac.cpp
)

View File

@ -2,13 +2,13 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-emac
INTERFACE
PUBLIC
.
./interface
)
target_sources(mbed-emac
INTERFACE
PRIVATE
interface/default_wifi_interface.cpp
interface/scl_emac.cpp
interface/SclAccessPoint.cpp

View File

@ -8,11 +8,11 @@ elseif("K66F" IN_LIST MBED_TARGET_LABELS)
endif()
target_include_directories(mbed-emac
INTERFACE
PUBLIC
.
)
target_sources(mbed-emac
INTERFACE
PRIVATE
kinetis_emac.cpp
)

View File

@ -2,6 +2,6 @@
# SPDX-License-Identifier: Apache-2.0
target_sources(mbed-emac
INTERFACE
PRIVATE
hardware_init_MK64F12.c
)

View File

@ -2,6 +2,6 @@
# SPDX-License-Identifier: Apache-2.0
target_sources(mbed-emac
INTERFACE
PRIVATE
hardware_init_MK66F18.c
)

View File

@ -8,11 +8,11 @@ elseif("GD32F4XX" IN_LIST MBED_TARGET_LABELS)
endif()
target_include_directories(mbed-emac
INTERFACE
PUBLIC
.
)
target_sources(mbed-emac
INTERFACE
PRIVATE
gd32xx_emac.cpp
)

View File

@ -2,6 +2,6 @@
# SPDX-License-Identifier: Apache-2.0
target_sources(mbed-emac
INTERFACE
PRIVATE
gd32f3_eth_init.c
)

View File

@ -2,6 +2,6 @@
# SPDX-License-Identifier: Apache-2.0
target_sources(mbed-emac
INTERFACE
PRIVATE
gd32f4_eth_init.c
)

View File

@ -8,11 +8,11 @@ elseif("NUC472" IN_LIST MBED_TARGET_LABELS)
endif()
target_include_directories(mbed-emac
INTERFACE
PUBLIC
.
)
target_sources(mbed-emac
INTERFACE
PRIVATE
numaker_emac.cpp
)

View File

@ -2,11 +2,11 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-emac
INTERFACE
PUBLIC
.
)
target_sources(mbed-emac
INTERFACE
PRIVATE
m480_eth.c
)

View File

@ -2,11 +2,11 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-emac
INTERFACE
PUBLIC
.
)
target_sources(mbed-emac
INTERFACE
PRIVATE
nuc472_eth.c
)

View File

@ -6,11 +6,11 @@ if("MIMXRT1050_EVK" IN_LIST MBED_TARGET_LABELS)
endif()
target_include_directories(mbed-emac
INTERFACE
PUBLIC
.
)
target_sources(mbed-emac
INTERFACE
PRIVATE
imx_emac.cpp
)

View File

@ -2,12 +2,12 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-emac
INTERFACE
PUBLIC
.
)
target_sources(mbed-emac
INTERFACE
PRIVATE
lpc17_emac.cpp
lpc_phy_dp83848.cpp
)

View File

@ -8,11 +8,11 @@ elseif("LPCXpresso" IN_LIST MBED_TARGET_LABELS)
endif()
target_include_directories(mbed-emac
INTERFACE
PUBLIC
.
)
target_sources(mbed-emac
INTERFACE
PRIVATE
lpc546xx_emac.cpp
)

View File

@ -2,6 +2,6 @@
# SPDX-License-Identifier: Apache-2.0
target_sources(mbed-emac
INTERFACE
PRIVATE
hardware_init_LPC546XX.c
)

View File

@ -2,6 +2,6 @@
# SPDX-License-Identifier: Apache-2.0
target_sources(mbed-emac
INTERFACE
PRIVATE
hardware_init_LPC546XX.c
)

View File

@ -4,12 +4,12 @@
add_subdirectory(lwip-wifi)
target_include_directories(mbed-emac
INTERFACE
PUBLIC
.
)
target_sources(mbed-emac
INTERFACE
PRIVATE
RdaWiFiInterface.cpp
rda5981x_emac.cpp
)

View File

@ -2,12 +2,12 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-emac
INTERFACE
PUBLIC
.
)
target_sources(mbed-emac
INTERFACE
PRIVATE
rza1_emac.cpp
rza1_eth.cpp
)

View File

@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-emac
INTERFACE
PUBLIC
.
r_ether_rza2
r_ether_rza2/src/phy
@ -11,7 +11,7 @@ target_include_directories(mbed-emac
)
target_sources(mbed-emac
INTERFACE
PRIVATE
rza2_emac.cpp
r_ether_rza2/src/r_ether_rza2.c
r_ether_rza2/src/phy/phy.c

View File

@ -12,12 +12,12 @@ elseif("STM32H7" IN_LIST MBED_TARGET_LABELS)
endif()
target_include_directories(mbed-emac
INTERFACE
PUBLIC
.
)
target_sources(mbed-emac
INTERFACE
PRIVATE
stm32xx_emac.cpp
stm32xx_eth_irq_callback.cpp
)

View File

@ -6,11 +6,11 @@ if("NUCLEO_F207ZG" IN_LIST MBED_TARGET_LABELS)
endif()
target_include_directories(mbed-emac
INTERFACE
PUBLIC
.
)
target_sources(mbed-emac
INTERFACE
PRIVATE
stm32f2_eth_conf.c
)

View File

@ -2,6 +2,6 @@
# SPDX-License-Identifier: Apache-2.0
target_sources(mbed-emac
INTERFACE
PRIVATE
stm32f2_eth_init.c
)

View File

@ -10,6 +10,6 @@ elseif("NUCLEO_F439ZI" IN_LIST MBED_TARGET_LABELS)
endif()
target_include_directories(mbed-emac
INTERFACE
PUBLIC
.
)

View File

@ -2,12 +2,12 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-emac
INTERFACE
PUBLIC
.
)
target_sources(mbed-emac
INTERFACE
PRIVATE
stm32f4_eth_conf.c
stm32f4_eth_init.c
)

View File

@ -2,12 +2,12 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-emac
INTERFACE
PUBLIC
.
)
target_sources(mbed-emac
INTERFACE
PRIVATE
stm32f4_eth_conf.c
stm32f4_eth_init.c
)

View File

@ -2,12 +2,12 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-emac
INTERFACE
PUBLIC
.
)
target_sources(mbed-emac
INTERFACE
PRIVATE
stm32f4_eth_conf.c
stm32f4_eth_init.c
)

View File

@ -14,11 +14,11 @@ elseif("NUCLEO_F767ZI" IN_LIST MBED_TARGET_LABELS)
endif()
target_include_directories(mbed-emac
INTERFACE
PUBLIC
.
)
target_sources(mbed-emac
INTERFACE
PRIVATE
stm32f7_eth_conf.c
)

View File

@ -2,6 +2,6 @@
# SPDX-License-Identifier: Apache-2.0
target_sources(mbed-emac
INTERFACE
PUBLIC
stm32f7_eth_init.c
)

View File

@ -2,6 +2,6 @@
# SPDX-License-Identifier: Apache-2.0
target_sources(mbed-emac
INTERFACE
PUBLIC
stm32f7_eth_init.c
)

View File

@ -2,6 +2,6 @@
# SPDX-License-Identifier: Apache-2.0
target_sources(mbed-emac
INTERFACE
PUBLIC
stm32f7_eth_init.c
)

View File

@ -2,6 +2,6 @@
# SPDX-License-Identifier: Apache-2.0
target_sources(mbed-emac
INTERFACE
PUBLIC
stm32f7_eth_init.c
)

View File

@ -2,6 +2,6 @@
# SPDX-License-Identifier: Apache-2.0
target_sources(mbed-emac
INTERFACE
PUBLIC
stm32f7_eth_init.c
)

View File

@ -12,12 +12,12 @@ elseif("NUCLEO_H743ZI2" IN_LIST MBED_TARGET_LABELS)
endif()
target_include_directories(mbed-emac
INTERFACE
PUBLIC
.
./lan8742
)
target_sources(mbed-emac
INTERFACE
PRIVATE
lan8742/lan8742.c
)

View File

@ -2,6 +2,6 @@
# SPDX-License-Identifier: Apache-2.0
target_sources(mbed-emac
INTERFACE
PRIVATE
stm32h7_eth_init.c
)

View File

@ -2,6 +2,6 @@
# SPDX-License-Identifier: Apache-2.0
target_sources(mbed-emac
INTERFACE
PRIVATE
stm32h7_eth_init.c
)

View File

@ -2,6 +2,6 @@
# SPDX-License-Identifier: Apache-2.0
target_sources(mbed-emac
INTERFACE
PUBLIC
stm32h7_eth_init.c
)

View File

@ -2,6 +2,6 @@
# SPDX-License-Identifier: Apache-2.0
target_sources(mbed-emac
INTERFACE
PUBLIC
stm32h7_eth_init.c
)

View File

@ -2,12 +2,12 @@
# SPDX-License-Identifier: Apache-2.0
target_include_directories(mbed-emac
INTERFACE
PUBLIC
.
)
target_sources(mbed-emac
INTERFACE
PRIVATE
sl_emac.cpp
sl_eth_hw.c
)

View File

@ -1,6 +1,8 @@
# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
add_library(mbed-wifi STATIC EXCLUDE_FROM_ALL)
add_subdirectory(TARGET_WICED EXCLUDE_FROM_ALL)
add_subdirectory(TARGET_STM EXCLUDE_FROM_ALL)
@ -13,5 +15,5 @@ add_subdirectory(esp8266-driver)
target_link_libraries(mbed-wifi
INTERFACE
mbed-netsocket
mbed-netsocket-api
)

View File

@ -3,39 +3,39 @@
add_subdirectory(whd-bsp-integration EXCLUDE_FROM_ALL)
add_library(mbed-cy-psoc6-whd-43012 INTERFACE)
add_library(mbed-cy-psoc6-whd-43012 STATIC EXCLUDE_FROM_ALL)
target_include_directories(mbed-cy-psoc6-whd-43012
INTERFACE
PUBLIC
wifi-host-driver/resources/firmware/COMPONENT_43012
)
target_sources(mbed-cy-psoc6-whd-43012
INTERFACE
PRIVATE
wifi-host-driver/resources/firmware/COMPONENT_43012/43012C0-mfgtest_bin.c
wifi-host-driver/resources/firmware/COMPONENT_43012/43012C0-mfgtest_clm_blob.c
wifi-host-driver/resources/firmware/COMPONENT_43012/43012C0_bin.c
wifi-host-driver/resources/firmware/COMPONENT_43012/43012C0_clm_blob.c
)
add_library(mbed-cy-psoc6-whd-43438 INTERFACE)
add_library(mbed-cy-psoc6-whd-43438 STATIC EXCLUDE_FROM_ALL)
target_include_directories(mbed-cy-psoc6-whd-43438
INTERFACE
PUBLIC
wifi-host-driver/resources/firmware/COMPONENT_43438
)
target_sources(mbed-cy-psoc6-whd-43438
INTERFACE
PRIVATE
wifi-host-driver/resources/firmware/COMPONENT_43438/43438A1-mfgtest_bin.c
wifi-host-driver/resources/firmware/COMPONENT_43438/43438A1-mfgtest_clm_blob.c
wifi-host-driver/resources/firmware/COMPONENT_43438/43438A1_bin.c
wifi-host-driver/resources/firmware/COMPONENT_43438/43438A1_clm_blob.c
)
add_library(mbed-cy-psoc6-whd-4343w INTERFACE)
add_library(mbed-cy-psoc6-whd-4343w STATIC EXCLUDE_FROM_ALL)
target_include_directories(mbed-cy-psoc6-whd-4343w
INTERFACE
PUBLIC
wifi-host-driver/resources/firmware/COMPONENT_4343W
)
target_sources(mbed-cy-psoc6-whd-4343w
INTERFACE
PRIVATE
wifi-host-driver/resources/firmware/COMPONENT_4343W/4343WA1-mfgtest_bin.c
wifi-host-driver/resources/firmware/COMPONENT_4343W/4343WA1-mfgtest_clm_blob.c
wifi-host-driver/resources/firmware/COMPONENT_4343W/4343WA1_bin.c
@ -97,10 +97,10 @@ add_library(mbed-cy8ckit-064b0s2-4343w-whd INTERFACE)
target_include_directories(mbed-cy8ckit-064b0s2-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CKIT_064B0S2_4343W)
add_library(mbed-cy-psoc6-whd INTERFACE)
add_library(mbed-cy-psoc6-whd STATIC EXCLUDE_FROM_ALL)
target_include_directories(mbed-cy-psoc6-whd
INTERFACE
PUBLIC
wifi-host-driver
wifi-host-driver/inc
wifi-host-driver/resources/resource_imp
@ -110,7 +110,7 @@ target_include_directories(mbed-cy-psoc6-whd
)
target_sources(mbed-cy-psoc6-whd
INTERFACE
PRIVATE
wifi-host-driver/resources/resource_imp/whd_resources.c
wifi-host-driver/src/whd_ap.c
@ -139,6 +139,6 @@ target_sources(mbed-cy-psoc6-whd
)
target_compile_definitions(mbed-cy-psoc6-whd
INTERFACE
PUBLIC
MBED_CONF_CY_PSOC6_WHD_PRESENT=1
)

View File

@ -1,26 +1,26 @@
# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
add_library(mbed-cy-psoc6-common-network INTERFACE)
add_library(mbed-cy-psoc6-common-network STATIC EXCLUDE_FROM_ALL)
target_include_directories(mbed-cy-psoc6-common-network
INTERFACE
PUBLIC
.
)
target_sources(mbed-cy-psoc6-common-network
INTERFACE
PRIVATE
cy_network_buffer.c
cybsp_wifi.c
)
target_link_libraries(mbed-cy-psoc6-common-network
INTERFACE
PUBLIC
mbed-lwipstack
mbed-emac
)
target_compile_definitions(mbed-cy-psoc6-common-network
INTERFACE
PUBLIC
MBED_CONF_cy-psoc6-common-network_PRESENT=1
)

View File

@ -1,17 +1,15 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
add_library(wifi-EMW3080B INTERFACE)
target_include_directories(mbed-wifi
INTERFACE
PUBLIC
.
mx_wifi
mx_wifi/core
)
target_sources(mbed-wifi
INTERFACE
PRIVATE
EMW3080BInterface.cpp
EMW3080B_EMAC.cpp
EMW3080B_UART.cpp

View File

@ -1,7 +1,7 @@
# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
add_library(mbed-wiced INTERFACE)
add_library(mbed-wiced STATIC EXCLUDE_FROM_ALL)
if(${CMAKE_CROSSCOMPILING})
if(${MBED_TOOLCHAIN} STREQUAL "ARM")
@ -10,15 +10,15 @@ if(${CMAKE_CROSSCOMPILING})
set(LIB_WICED_DRIVERS TOOLCHAIN_GCC_ARM/TARGET_WIO_EMW3166/libwiced_drivers.a)
endif()
target_link_libraries(mbed-wiced INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/${LIB_WICED_DRIVERS})
target_link_libraries(mbed-wiced INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/${LIB_WICED_DRIVERS})
endif()
target_include_directories(mbed-wiced
INTERFACE
PUBLIC
wiced_interface
)
target_sources(mbed-wiced
INTERFACE
PRIVATE
wiced_interface/default_wifi_interface.cpp
)

View File

@ -2,13 +2,13 @@
# SPDX-License-Identifier: Apache-2.0
target_sources(mbed-wifi
INTERFACE
PRIVATE
ESP8266Interface.cpp
ESP8266/ESP8266.cpp
)
target_include_directories(mbed-wifi
INTERFACE
PUBLIC
.
./ESP8266
)

View File

@ -1,8 +1,10 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
add_library(mbed-ppp STATIC EXCLUDE_FROM_ALL)
target_include_directories(mbed-ppp
INTERFACE
PUBLIC
.
./include
./include/polarssl
@ -10,7 +12,7 @@ target_include_directories(mbed-ppp
)
target_sources(mbed-ppp
INTERFACE
PRIVATE
source/auth.c
source/ccp.c
source/chap-md5.c
@ -47,6 +49,14 @@ target_sources(mbed-ppp
)
target_compile_definitions(mbed-ppp
INTERFACE
PUBLIC
MBED_CONF_PPP_PRESENT=1
)
target_link_libraries(mbed-ppp
PUBLIC
mbed-events
mbed-netsocket-api
PRIVATE
mbed-rtos-flags
)

View File

@ -96,7 +96,7 @@ target_compile_definitions(mbed-lwipstack
target_link_libraries(mbed-lwipstack
PUBLIC
mbed-netsocket
mbed-netsocket-api
mbed-ppp
mbed-randlib
PRIVATE

View File

@ -111,6 +111,8 @@ target_compile_definitions(mbed-mbedtls
MBED_CONF_MBEDTLS_PRESENT=1
)
target_link_libraries(mbed-mbedtls PUBLIC mbed-core-flags)
# Workaround for https://github.com/ARMmbed/mbedtls/issues/1077
# which affects cores without __thumb2__ set by the compiler
# due to the lack of full Thumb-2 support

View File

@ -31,5 +31,5 @@ target_link_libraries(mbed-nanostack
mbed-nanostack-mbed_mesh_api
mbed-nanostack-sal_stack-event_loop
mbed-nanostack-sal_stack
mbed-netsocket
mbed-netsocket-api
)

View File

@ -34,7 +34,7 @@ target_link_libraries(mbed-nanostack-mbed_mesh_api
PUBLIC
mbed-nanostack-hal_mbed_cmsis_rtos
mbed-nanostack-sal_stack
mbed-netsocket
mbed-netsocket-api
mbed-core-flags
PRIVATE
mbed-rtos-flags

View File

@ -12,7 +12,6 @@ target_sources(mbed-nanostack-hal_mbed_cmsis_rtos
PRIVATE
arm_hal_fhss_timer.cpp
arm_hal_interrupt.c
arm_hal_random.c
arm_hal_timer.cpp
ns_event_loop.c
ns_event_loop_mbed.cpp
@ -26,6 +25,11 @@ target_sources(mbed-nanostack-hal_mbed_cmsis_rtos
target_link_libraries(mbed-nanostack-hal_mbed_cmsis_rtos
PUBLIC
mbed-core-flags
mbed-randlib
mbed-nanostack-sal_stack-event_loop
mbed-events
mbed-nanostack-libservice
mbed-nanostack-sal_stack
PRIVATE
mbed-rtos-flags
)

View File

@ -85,7 +85,7 @@ target_sources(mbed-nanostack-sal_stack
mle_service/mle_service.c
mle_service/mle_service_buffer.c
mle_service/mle_service_frame_counter_table.c
mle_service/mle_service_frame_count.c
mle_service/mle_service_interface.c
mle_service/mle_service_security.c

View File

@ -35,7 +35,7 @@
#include "Service_Libs/mle_service/mle_service_security.h"
#include "Service_Libs/mle_service/mle_service_buffer.h"
#include "Service_Libs/mle_service/mle_service_interface.h"
#include "Service_Libs/mle_service/mle_service_frame_counter_table.h"
#include "Service_Libs/mle_service/mle_service_frame_count.h"
#include "MLE/mle.h"
#include "MLE/mle_tlv.h"
#include "mac_common_defines.h"

View File

@ -27,7 +27,7 @@
#include "MLE/mle.h"
#include "mac_common_defines.h"
#include "Service_Libs/mle_service/mle_service_api.h"
#include "Service_Libs/mle_service/mle_service_frame_counter_table.h"
#include "Service_Libs/mle_service/mle_service_frame_count.h"

View File

@ -15,8 +15,8 @@
* limitations under the License.
*/
#ifndef MLE_SERVICE_FRAME_COUNTER_TABLE_H_
#define MLE_SERVICE_FRAME_COUNTER_TABLE_H_
#ifndef MLE_SERVICE_FRAME_COUNT_H_
#define MLE_SERVICE_FRAME_COUNT_H_
#include <ns_types.h>
/*
@ -32,4 +32,4 @@ typedef struct {
//Internal use
mle_neighbor_security_counter_info_t *mle_service_counter_info_get(int8_t interface_id, uint8_t attribute_index);
#endif /* MLE_SERVICE_FRAME_COUNTER_TABLE_H_ */
#endif /* MLE_SERVICE_FRAME_COUNT_H_ */

View File

@ -3,22 +3,22 @@
if(MBED_OS_ENABLE_TESTS)
if(BUILD_GREENTEA_TESTS)
# add greentea test
add_subdirectory(tests/TESTS)
else()
add_subdirectory(tests/UNITTESTS)
endif()
endif()
add_library(mbed-netsocket STATIC EXCLUDE_FROM_ALL)
add_library(mbed-netsocket-api STATIC EXCLUDE_FROM_ALL)
target_include_directories(mbed-netsocket
target_include_directories(mbed-netsocket-api
PUBLIC
.
./include
./include/netsocket
)
target_sources(mbed-netsocket
target_sources(mbed-netsocket-api
PRIVATE
source/DTLSSocket.cpp
source/DTLSSocketWrapper.cpp
@ -44,28 +44,35 @@ target_sources(mbed-netsocket
source/nsapi_ppp.cpp
)
target_compile_definitions(mbed-netsocket
target_compile_definitions(mbed-netsocket-api
PUBLIC
MBED_CONF_NSAPI_PRESENT=1
)
target_link_libraries(mbed-netsocket
target_link_libraries(mbed-netsocket-api
PUBLIC
mbed-core-flags
mbed-mbedtls
mbed-events
)
add_library(mbed-netsocket INTERFACE)
target_link_libraries(mbed-netsocket
INTERFACE
mbed-mbedtls
mbed-lwipstack
mbed-events
mbed-core-flags
)
if("DEVICE_EMAC=1" IN_LIST MBED_TARGET_DEFINITIONS)
target_link_libraries(mbed-netsocket
PUBLIC
INTERFACE
mbed-emac
)
endif()
target_link_libraries(mbed-netsocket
PUBLIC
INTERFACE
mbed-wifi
mbed-cellular
mbed-nanostack-libservice

View File

@ -0,0 +1,6 @@
# Only build the netsocket tests if this target has at least one network interface
string(FIND "${MBED_CONFIG_DEFINITIONS}" MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE DEFAULT_IFC_IDX)
if(NOT DEFAULT_IFC_IDX EQUAL -1)
add_subdirectory(netsocket)
endif()

View File

@ -0,0 +1 @@
add_subdirectory(udp)

View File

@ -1,17 +1,7 @@
# Copyright (c) 2020 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
cmake_minimum_required(VERSION 3.19.0 FATAL_ERROR)
set(MBED_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../../ CACHE INTERNAL "")
set(TEST_TARGET mbed-connectivity-netsocket-udp)
include(${MBED_PATH}/tools/cmake/mbed_greentea.cmake)
project(${TEST_TARGET})
list(
APPEND
list(APPEND
TEST_SOURCE_LIST
main.cpp
udpsocket_bind_port.cpp
@ -35,7 +25,7 @@ list(
mbed_greentea_add_test(
TEST_NAME
${TEST_TARGET}
mbed-connectivity-netsocket-udp
TEST_SOURCES
${TEST_SOURCE_LIST}
TEST_REQUIRED_LIBS

View File

@ -119,7 +119,7 @@ void UDPSOCKET_ECHOTEST_BURST()
} else if (recvd < 0) {
pkg_fail += BURST_PKTS - j; // Assume all the following packets of the burst to be lost
tr_warn("[%02d] network error %d", i, recvd);
ThisThread::sleep_for(recv_timeout * 1000);
ThisThread::sleep_for(recv_timeout * 1000ms);
recv_timeout *= 2; // Back off,
break;
} else if (temp_addr != udp_addr) {

View File

@ -63,10 +63,10 @@ void UDPSOCKET_RECV_TIMEOUT()
if (recvd == NSAPI_ERROR_WOULD_BLOCK) {
osSignalWait(SIGNAL_SIGIO, SIGIO_TIMEOUT);
tr_info("MBED: recvfrom() took: %dms", timer.read_ms());
if (timer.read_ms() > 150) {
TEST_ASSERT(150 - timer.read_ms() < 51);
if (timer.elapsed_time() > 150ms) {
TEST_ASSERT(150ms - timer.elapsed_time() < 51ms);
} else {
TEST_ASSERT(timer.read_ms() - 150 < 51);
TEST_ASSERT(timer.elapsed_time() - 150ms < 51ms);
}
continue;
} else if (recvd < 0) {

View File

@ -46,7 +46,7 @@ void UDPSOCKET_SENDTO_REPEAT()
break;
}
oom_earlier = true;
ThisThread::sleep_for(1000);
ThisThread::sleep_for(1000ms);
continue;
}
oom_earlier = false;

View File

@ -13,4 +13,11 @@ target_include_directories(mbed-randlib
target_sources(mbed-randlib
PRIVATE
source/randLIB.c
source/arm_hal_random.c
)
target_link_libraries(mbed-randlib
PUBLIC
mbed-mbedtls
mbed-core-flags
)