Merge branch 'ARMmbed:master' into my_mbed-os_branch

Author: nicole-osaz

UNITTESTS/stubs/CMakeLists.txt

@@ -30,11 +30,7 @@ target_include_directories(mbed-headers-base
 
 target_include_directories(mbed-headers-connectivity
     INTERFACE
-        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice
-        ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice/mbed-client-libservice
         ${mbed-os_SOURCE_DIR}/connectivity
-        ${mbed-os_SOURCE_DIR}/connectivity/mbedtls
-        ${mbed-os_SOURCE_DIR}/connectivity/mbedtls/include
         ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include
         ${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include/ble
 )
@@ -48,16 +44,12 @@ target_include_directories(mbed-headers
 target_include_directories(mbed-stubs-headers
     INTERFACE
         .
-        ${mbed-os_SOURCE_DIR}/connectivity/nanostack/coap-service/test/coap-service/unittest/stub
 )
 
-add_subdirectory(connectivity)
-
 add_library(mbed-stubs INTERFACE)
 
 target_link_libraries(mbed-stubs
     INTERFACE
-        mbed-stubs-connectivity
         mbed-stubs-drivers
         mbed-stubs-events
         mbed-stubs-hal

UNITTESTS/stubs/connectivity/CMakeLists.txt

@@ -41,4 +41,6 @@ else()
     add_subdirectory(cellular)
     add_subdirectory(lorawan)
     add_subdirectory(netsocket)
+    add_subdirectory(mbedtls)
+    add_subdirectory(libraries)
 endif()

connectivity/CMakeLists.txt

@@ -28,6 +28,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-nanostack-libservice
         mbed-headers-netsocket
         mbed-headers-cellular
         mbed-stubs

connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularstack/CMakeLists.txt

@@ -36,6 +36,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-nanostack-libservice
         mbed-headers-netsocket
         mbed-headers-cellular
         mbed-stubs

connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt

@@ -134,10 +134,15 @@ class RFPins {
     UnlockedSPI spi;
     DigitalOut CS;
     DigitalOut SDN;
+#if INTERRUPT_GPIO == S2LP_GPIO0
     InterruptIn RF_S2LP_GPIO0;
+#elif INTERRUPT_GPIO == S2LP_GPIO1
     InterruptIn RF_S2LP_GPIO1;
+#elif INTERRUPT_GPIO == S2LP_GPIO2
     InterruptIn RF_S2LP_GPIO2;
+#else
     InterruptIn RF_S2LP_GPIO3;
+#endif
     Timeout cca_timer;
     Timeout backup_timer;
     Timer tx_timer;
@@ -153,10 +158,15 @@ RFPins::RFPins(PinName spi_sdi, PinName spi_sdo,
     :   spi(spi_sdi, spi_sdo, spi_sclk),
         CS(spi_cs),
         SDN(spi_sdn),
+#if INTERRUPT_GPIO == S2LP_GPIO0
         RF_S2LP_GPIO0(spi_gpio0),
+#elif INTERRUPT_GPIO == S2LP_GPIO1
         RF_S2LP_GPIO1(spi_gpio1),
+#elif INTERRUPT_GPIO == S2LP_GPIO2
         RF_S2LP_GPIO2(spi_gpio2),
+#else
         RF_S2LP_GPIO3(spi_gpio3),
+#endif
         irq_thread(osPriorityRealtime, 1024)
 {
     irq_thread.start(mbed::callback(this, &RFPins::rf_irq_task));

connectivity/drivers/802.15.4_RF/stm-s2lp-rf-driver/source/NanostackRfPhys2lp.cpp

@@ -1,141 +1,141 @@
 # Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_subdirectory(network EXCLUDE_FROM_ALL)
+add_subdirectory(whd-bsp-integration EXCLUDE_FROM_ALL)
 
 add_library(mbed-cy-psoc6-whd-43012 INTERFACE)
 target_include_directories(mbed-cy-psoc6-whd-43012
     INTERFACE
-        resources/firmware/COMPONENT_43012
+        wifi-host-driver/resources/firmware/COMPONENT_43012
 )
 target_sources(mbed-cy-psoc6-whd-43012 
     INTERFACE
-        resources/firmware/COMPONENT_43012/43012C0-mfgtest_bin.c
-        resources/firmware/COMPONENT_43012/43012C0-mfgtest_clm_blob.c
-        resources/firmware/COMPONENT_43012/43012C0_bin.c
-        resources/firmware/COMPONENT_43012/43012C0_clm_blob.c
+        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)
 target_include_directories(mbed-cy-psoc6-whd-43438
     INTERFACE
-        resources/firmware/COMPONENT_43438
+        wifi-host-driver/resources/firmware/COMPONENT_43438
 )
 target_sources(mbed-cy-psoc6-whd-43438 
     INTERFACE
-        resources/firmware/COMPONENT_43438/43438A1-mfgtest_bin.c
-        resources/firmware/COMPONENT_43438/43438A1-mfgtest_clm_blob.c
-        resources/firmware/COMPONENT_43438/43438A1_bin.c
-        resources/firmware/COMPONENT_43438/43438A1_clm_blob.c
+        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)
 target_include_directories(mbed-cy-psoc6-whd-4343w
     INTERFACE
-        resources/firmware/COMPONENT_4343W
+        wifi-host-driver/resources/firmware/COMPONENT_4343W
 )
 target_sources(mbed-cy-psoc6-whd-4343w 
     INTERFACE
-        resources/firmware/COMPONENT_4343W/4343WA1-mfgtest_bin.c
-        resources/firmware/COMPONENT_4343W/4343WA1-mfgtest_clm_blob.c
-        resources/firmware/COMPONENT_4343W/4343WA1_bin.c
-        resources/firmware/COMPONENT_4343W/4343WA1_clm_blob.c
+        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
+        wifi-host-driver/resources/firmware/COMPONENT_4343W/4343WA1_clm_blob.c
 )
 
 add_library(mbed-cy8ckit-062s2-43012-whd INTERFACE)
-target_include_directories(mbed-cy8ckit-062s2-43012-whd INTERFACE resources/nvram/TARGET_CY8CKIT_062S2_43012)
+target_include_directories(mbed-cy8ckit-062s2-43012-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CKIT_062S2_43012)
 
 add_library(mbed-cy8ckit-062s2-4343w-whd INTERFACE)
-target_include_directories(mbed-cy8ckit-062s2-4343w-whd INTERFACE resources/nvram/TARGET_CY8CKIT_062S2_4343W)
+target_include_directories(mbed-cy8ckit-062s2-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CKIT_062S2_4343W)
 
 add_library(mbed-cy8ckit-062-4343w-whd INTERFACE)
-target_include_directories(mbed-cy8ckit-062-4343w-whd INTERFACE resources/nvram/TARGET_CY8CKIT_062_4343W)
+target_include_directories(mbed-cy8ckit-062-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CKIT_062_4343W)
 
 add_library(mbed-cy8ckit-062-wifi-bt-whd INTERFACE)
-target_include_directories(mbed-cy8ckit-062-wifi-bt-whd INTERFACE resources/nvram/TARGET_CY8CKIT_062_WIFI_BT)
+target_include_directories(mbed-cy8ckit-062-wifi-bt-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CKIT_062_WIFI_BT)
 
 add_library(mbed-cy8ckit-064s1-4343w-whd INTERFACE)
-target_include_directories(mbed-cy8ckit-064s1-4343w-whd INTERFACE resources/nvram/TARGET_CY8CKIT_064S1_4343W)
+target_include_directories(mbed-cy8ckit-064s1-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CKIT_064S1_4343W)
 
 add_library(mbed-cy8ckit-064s2-4343w-whd INTERFACE)
-target_include_directories(mbed-cy8ckit-064s2-4343w-whd INTERFACE resources/nvram/TARGET_CY8CKIT_064S2_4343W)
+target_include_directories(mbed-cy8ckit-064s2-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CKIT_064S2_4343W)
 
 add_library(mbed-cy8cmod-062s2-43012-whd INTERFACE)
-target_include_directories(mbed-cy8cmod-062s2-43012-whd INTERFACE resources/nvram/TARGET_CY8CMOD_062S2_43012)
+target_include_directories(mbed-cy8cmod-062s2-43012-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CMOD_062S2_43012)
 
 add_library(mbed-cy8cmod-062s3-4343w-whd INTERFACE)
-target_include_directories(mbed-cy8cmod-062s3-4343w-whd INTERFACE resources/nvram/TARGET_CY8CMOD_062S3_4343W)
+target_include_directories(mbed-cy8cmod-062s3-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CMOD_062S3_4343W)
 
 add_library(mbed-cy8cmod-062-4343w-whd INTERFACE)
-target_include_directories(mbed-cy8cmod-062-4343w-whd INTERFACE resources/nvram/TARGET_CY8CMOD_062_4343W)
+target_include_directories(mbed-cy8cmod-062-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CMOD_062_4343W)
 
 add_library(mbed-cy8cproto-062s3-4343w-whd INTERFACE)
-target_include_directories(mbed-cy8cproto-062s3-4343w-whd INTERFACE resources/nvram/TARGET_CY8CPROTO_062S3_4343W)
+target_include_directories(mbed-cy8cproto-062s3-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CPROTO_062S3_4343W)
 
 add_library(mbed-cy8cproto-062-4343w-whd INTERFACE)
-target_include_directories(mbed-cy8cproto-062-4343w-whd INTERFACE resources/nvram/TARGET_CY8CPROTO_062_4343W)
+target_include_directories(mbed-cy8cproto-062-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CY8CPROTO_062_4343W)
 
 add_library(mbed-cytfm-064b0s2-4343w-whd INTERFACE)
-target_include_directories(mbed-cytfm-064b0s2-4343w-whd INTERFACE resources/nvram/TARGET_CYTFM_064B0S2_4343W)
+target_include_directories(mbed-cytfm-064b0s2-4343w-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CYTFM_064B0S2_4343W)
 
 add_library(mbed-cyw943012p6evb-01-whd INTERFACE)
-target_include_directories(mbed-cyw943012p6evb-01-whd INTERFACE resources/nvram/TARGET_CYW943012P6EVB_01)
+target_include_directories(mbed-cyw943012p6evb-01-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CYW943012P6EVB_01)
 
 add_library(mbed-cyw943012wcd2-whd INTERFACE)
-target_include_directories(mbed-cyw943012wcd2-whd INTERFACE resources/nvram/TARGET_CYW943012WCD2)
+target_include_directories(mbed-cyw943012wcd2-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CYW943012WCD2)
 
 add_library(mbed-cyw9p62s1-43012car-01-whd INTERFACE)
-target_include_directories(mbed-cyw9p62s1-43012car-01-whd INTERFACE resources/nvram/TARGET_CYW9P62S1_43012CAR_01)
+target_include_directories(mbed-cyw9p62s1-43012car-01-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CYW9P62S1_43012CAR_01)
 
 add_library(mbed-cyw9p62s1-43012evb-01-whd INTERFACE)
-target_include_directories(mbed-cyw9p62s1-43012evb-01-whd INTERFACE resources/nvram/TARGET_CYW9P62S1_43012EVB_01)
+target_include_directories(mbed-cyw9p62s1-43012evb-01-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CYW9P62S1_43012EVB_01)
 
 add_library(mbed-cyw9p62s1-43438evb-01-whd INTERFACE)
-target_include_directories(mbed-cyw9p62s1-43438evb-01-whd INTERFACE resources/nvram/TARGET_CYW9P62S1_43438EVB_01)
+target_include_directories(mbed-cyw9p62s1-43438evb-01-whd INTERFACE wifi-host-driver/resources/nvram/TARGET_CYW9P62S1_43438EVB_01)
 
 add_library(mbed-cy8ckit-064b0s2-4343w-whd INTERFACE)
-target_include_directories(mbed-cy8ckit-064b0s2-4343w-whd INTERFACE resources/nvram/TARGET_CY8CKIT_064B0S2_4343W)
+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)
 
 target_include_directories(mbed-cy-psoc6-whd
     INTERFACE
-        .
-        inc
-        resources/resource_imp
-        src
-        src/include
-        src/bus_protocols
+        wifi-host-driver
+        wifi-host-driver/inc
+        wifi-host-driver/resources/resource_imp
+        wifi-host-driver/src
+        wifi-host-driver/src/include
+        wifi-host-driver/src/bus_protocols
 )
 
 target_sources(mbed-cy-psoc6-whd
     INTERFACE
-        resources/resource_imp/whd_resources.c
-
-        src/whd_ap.c
-        src/whd_buffer_api.c
-        src/whd_cdc_bdc.c
-        src/whd_chip.c
-        src/whd_chip_constants.c
-        src/whd_clm.c
-        src/whd_debug.c
-        src/whd_events.c
-        src/whd_logging.c
-        src/whd_management.c
-        src/whd_network_if.c
-        src/whd_resource_if.c
-        src/whd_sdpcm.c
-        src/whd_thread.c
-        src/whd_utils.c
-        src/whd_wifi.c
-        src/whd_wifi_api.c
-        src/whd_wifi_p2p.c
-
-        src/bus_protocols/whd_bus.c
-        src/bus_protocols/whd_bus_common.c
-        src/bus_protocols/whd_bus_sdio_protocol.c
-        src/bus_protocols/whd_bus_spi_protocol.c
+        wifi-host-driver/resources/resource_imp/whd_resources.c
+
+        wifi-host-driver/src/whd_ap.c
+        wifi-host-driver/src/whd_buffer_api.c
+        wifi-host-driver/src/whd_cdc_bdc.c
+        wifi-host-driver/src/whd_chip.c
+        wifi-host-driver/src/whd_chip_constants.c
+        wifi-host-driver/src/whd_clm.c
+        wifi-host-driver/src/whd_debug.c
+        wifi-host-driver/src/whd_events.c
+        wifi-host-driver/src/whd_logging.c
+        wifi-host-driver/src/whd_management.c
+        wifi-host-driver/src/whd_network_if.c
+        wifi-host-driver/src/whd_resource_if.c
+        wifi-host-driver/src/whd_sdpcm.c
+        wifi-host-driver/src/whd_thread.c
+        wifi-host-driver/src/whd_utils.c
+        wifi-host-driver/src/whd_wifi.c
+        wifi-host-driver/src/whd_wifi_api.c
+        wifi-host-driver/src/whd_wifi_p2p.c
+
+        wifi-host-driver/src/bus_protocols/whd_bus.c
+        wifi-host-driver/src/bus_protocols/whd_bus_common.c
+        wifi-host-driver/src/bus_protocols/whd_bus_sdio_protocol.c
+        wifi-host-driver/src/bus_protocols/whd_bus_spi_protocol.c
 )
 
 target_compile_definitions(mbed-cy-psoc6-whd