diff --git a/connectivity/CMakeLists.txt b/connectivity/CMakeLists.txt index 3d25415ed5..5357906fd4 100644 --- a/connectivity/CMakeLists.txt +++ b/connectivity/CMakeLists.txt @@ -1,6 +1,8 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 +mbed_add_cmake_directory_if_labels("FEATURE") + add_subdirectory(cellular) add_subdirectory(drivers) add_subdirectory(libraries) diff --git a/connectivity/FEATURE_BLE/CMakeLists.txt b/connectivity/FEATURE_BLE/CMakeLists.txt new file mode 100644 index 0000000000..0a3f3857c5 --- /dev/null +++ b/connectivity/FEATURE_BLE/CMakeLists.txt @@ -0,0 +1,28 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_subdirectory(libraries) + +target_include_directories(mbed-os + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${CMAKE_CURRENT_SOURCE_DIR}/include/ble + ${CMAKE_CURRENT_SOURCE_DIR}/include/ble/common + ${CMAKE_CURRENT_SOURCE_DIR}/include/ble/common/ble + ${CMAKE_CURRENT_SOURCE_DIR}/include/ble/common/ble/gap + ${CMAKE_CURRENT_SOURCE_DIR}/include/ble/internal + ${CMAKE_CURRENT_SOURCE_DIR}/include/ble/services +) + +target_sources(mbed-os + PRIVATE + source/BLE.cpp + source/DiscoveredCharacteristic.cpp + source/FileSecurityDb.cpp + source/KVStoreSecurityDb.cpp + + source/gap/AdvertisingDataBuilder.cpp + source/gap/AdvertisingParameters.cpp + source/gap/ConnectionParameters.cpp +) diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/CMakeLists.txt b/connectivity/FEATURE_BLE/libraries/CMakeLists.txt similarity index 76% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/CMakeLists.txt rename to connectivity/FEATURE_BLE/libraries/CMakeLists.txt index f403f3ac48..325e167411 100644 --- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/CMakeLists.txt +++ b/connectivity/FEATURE_BLE/libraries/CMakeLists.txt @@ -2,3 +2,5 @@ # SPDX-License-Identifier: Apache-2.0 mbed_add_cmake_directory_if_labels("TARGET") + +add_subdirectory(ble-api-implementation) diff --git a/features/FEATURE_BLE/targets/TARGET_CORDIO/CMakeLists.txt b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/CMakeLists.txt similarity index 60% rename from features/FEATURE_BLE/targets/TARGET_CORDIO/CMakeLists.txt rename to connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/CMakeLists.txt index 8e4c9b1da2..735639d27a 100644 --- a/features/FEATURE_BLE/targets/TARGET_CORDIO/CMakeLists.txt +++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/CMakeLists.txt @@ -3,20 +3,31 @@ add_subdirectory(stack) +target_include_directories(mbed-os + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/driver + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${CMAKE_CURRENT_SOURCE_DIR}/include/ble + ${CMAKE_CURRENT_SOURCE_DIR}/include/ble/internal + ${CMAKE_CURRENT_SOURCE_DIR}/stack_adaptation +) + target_sources(mbed-os PRIVATE driver/CordioHCIDriver.cpp driver/CordioHCITransportDriver.cpp driver/H4TransportDriver.cpp - source/CordioBLE.cpp - source/CordioGattServer.cpp - source/CordioImplementations.cpp - source/CordioPalAttClient.cpp - source/CordioPalGap.tpp - source/CordioPalSecurityManager.tpp + source/BLEInstanceBaseImpl.cpp + source/PalAttClientImpl.cpp + source/PalEventQueueImpl.cpp + source/PalGapImpl.cpp + source/PalGattClientImpl.cpp + source/PalGenericAccessServiceImpl.cpp + source/PalSecurityManagerImpl.cpp + source/PalSigningMonitorImpl.cpp - stack_adaptation/hci_drv.c stack_adaptation/hci_tr.c stack_adaptation/hci_vs.c stack_adaptation/pal_mbed_os_adaptation.cpp @@ -24,10 +35,3 @@ target_sources(mbed-os stack_adaptation/wsf_mbed_os_adaptation.c stack_adaptation/wsf_os.c ) - -target_include_directories(mbed-os - PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/driver - ${CMAKE_CURRENT_SOURCE_DIR}/stack_adaptation -) diff --git a/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/CMakeLists.txt b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack/CMakeLists.txt similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_CORDIO/stack/CMakeLists.txt rename to connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack/CMakeLists.txt diff --git a/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/ble-host/CMakeLists.txt b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack/ble-host/CMakeLists.txt similarity index 85% rename from features/FEATURE_BLE/targets/TARGET_CORDIO/stack/ble-host/CMakeLists.txt rename to connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack/ble-host/CMakeLists.txt index 81ba20c00f..26ebab30db 100644 --- a/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/ble-host/CMakeLists.txt +++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack/ble-host/CMakeLists.txt @@ -1,13 +1,29 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 +target_include_directories(mbed-os + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${CMAKE_CURRENT_SOURCE_DIR}/sources/hci/dual_chip + ${CMAKE_CURRENT_SOURCE_DIR}/sources/sec/common + ${CMAKE_CURRENT_SOURCE_DIR}/sources/stack/att + ${CMAKE_CURRENT_SOURCE_DIR}/sources/stack/cfg + ${CMAKE_CURRENT_SOURCE_DIR}/sources/stack/dm + ${CMAKE_CURRENT_SOURCE_DIR}/sources/stack/hci + ${CMAKE_CURRENT_SOURCE_DIR}/sources/stack/l2c + ${CMAKE_CURRENT_SOURCE_DIR}/sources/stack/smp +) + target_sources(mbed-os PRIVATE sources/hci/common/hci_core.c sources/hci/dual_chip/hci_cmd.c sources/hci/dual_chip/hci_cmd_ae.c + sources/hci/dual_chip/hci_cmd_bis.c + sources/hci/dual_chip/hci_cmd_cis.c sources/hci/dual_chip/hci_cmd_cte.c + sources/hci/dual_chip/hci_cmd_iso.c sources/hci/dual_chip/hci_cmd_past.c sources/hci/dual_chip/hci_cmd_phy.c sources/hci/dual_chip/hci_core_ps.c @@ -15,16 +31,18 @@ target_sources(mbed-os sources/hci/dual_chip/hci_vs_ae.c sources/sec/common/sec_aes.c + sources/sec/common/sec_aes_rev.c sources/sec/common/sec_ccm_hci.c sources/sec/common/sec_cmac_hci.c + sources/sec/common/sec_ecc_debug.c sources/sec/common/sec_ecc_hci.c sources/sec/common/sec_main.c - sources/sec/pal/sec_ccm.c - + sources/stack/att/att_eatt.c sources/stack/att/att_main.c sources/stack/att/att_uuid.c sources/stack/att/attc_disc.c + sources/stack/att/attc_eatt.c sources/stack/att/attc_main.c sources/stack/att/attc_proc.c sources/stack/att/attc_read.c @@ -33,6 +51,7 @@ target_sources(mbed-os sources/stack/att/atts_ccc.c sources/stack/att/atts_csf.c sources/stack/att/atts_dyn.c + sources/stack/att/atts_eatt.c sources/stack/att/atts_ind.c sources/stack/att/atts_main.c sources/stack/att/atts_proc.c @@ -45,6 +64,12 @@ target_sources(mbed-os sources/stack/dm/dm_adv.c sources/stack/dm/dm_adv_ae.c sources/stack/dm/dm_adv_leg.c + sources/stack/dm/dm_bis_master.c + sources/stack/dm/dm_bis_slave.c + sources/stack/dm/dm_cis.c + sources/stack/dm/dm_cis_master.c + sources/stack/dm/dm_cis_slave.c + sources/stack/dm/dm_cis_sm.c sources/stack/dm/dm_conn.c sources/stack/dm/dm_conn_cte.c sources/stack/dm/dm_conn_master.c @@ -56,6 +81,7 @@ target_sources(mbed-os sources/stack/dm/dm_conn_sm.c sources/stack/dm/dm_dev.c sources/stack/dm/dm_dev_priv.c + sources/stack/dm/dm_iso.c sources/stack/dm/dm_main.c sources/stack/dm/dm_past.c sources/stack/dm/dm_phy.c @@ -91,16 +117,3 @@ target_sources(mbed-os sources/stack/smp/smpr_sc_sm.c sources/stack/smp/smpr_sm.c ) - -target_include_directories(mbed-os - PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${CMAKE_CURRENT_SOURCE_DIR}/sources/hci/dual_chip - ${CMAKE_CURRENT_SOURCE_DIR}/sources/sec/common - ${CMAKE_CURRENT_SOURCE_DIR}/sources/stack/att - ${CMAKE_CURRENT_SOURCE_DIR}/sources/stack/cfg - ${CMAKE_CURRENT_SOURCE_DIR}/sources/stack/dm - ${CMAKE_CURRENT_SOURCE_DIR}/sources/stack/hci - ${CMAKE_CURRENT_SOURCE_DIR}/sources/stack/l2c - ${CMAKE_CURRENT_SOURCE_DIR}/sources/stack/smp -) diff --git a/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/wsf/CMakeLists.txt b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack/wsf/CMakeLists.txt similarity index 90% rename from features/FEATURE_BLE/targets/TARGET_CORDIO/stack/wsf/CMakeLists.txt rename to connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack/wsf/CMakeLists.txt index 5275e941e5..dc6322776d 100644 --- a/features/FEATURE_BLE/targets/TARGET_CORDIO/stack/wsf/CMakeLists.txt +++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/stack/wsf/CMakeLists.txt @@ -1,6 +1,12 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 +target_include_directories(mbed-os + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${CMAKE_CURRENT_SOURCE_DIR}/include/util +) + target_sources(mbed-os PRIVATE sources/port/baremetal/wsf_assert.c @@ -10,7 +16,6 @@ target_sources(mbed-os sources/port/baremetal/wsf_efs.c sources/port/baremetal/wsf_heap.c sources/port/baremetal/wsf_msg.c - sources/port/baremetal/wsf_nvm.c sources/port/baremetal/wsf_queue.c sources/port/baremetal/wsf_timer.c sources/port/baremetal/wsf_trace.c @@ -25,10 +30,3 @@ target_sources(mbed-os sources/util/terminal.c sources/util/wstr.c ) - -target_include_directories(mbed-os - PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${CMAKE_CURRENT_SOURCE_DIR}/include/util - ${CMAKE_CURRENT_SOURCE_DIR}/sources/port/baremetal -) diff --git a/features/FEATURE_BLE/targets/TARGET_CORDIO_LL/CMakeLists.txt b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO_LL/CMakeLists.txt similarity index 88% rename from features/FEATURE_BLE/targets/TARGET_CORDIO_LL/CMakeLists.txt rename to connectivity/FEATURE_BLE/libraries/TARGET_CORDIO_LL/CMakeLists.txt index 4e6a7d30c5..0657fbfdd9 100644 --- a/features/FEATURE_BLE/targets/TARGET_CORDIO_LL/CMakeLists.txt +++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO_LL/CMakeLists.txt @@ -28,14 +28,20 @@ target_sources(mbed-os stack/controller/sources/ble/bb/bb_ble_adv_master_ae.c stack/controller/sources/ble/bb/bb_ble_adv_slave.c stack/controller/sources/ble/bb/bb_ble_adv_slave_ae.c + stack/controller/sources/ble/bb/bb_ble_bis_master.c + stack/controller/sources/ble/bb/bb_ble_bis_slave.c + stack/controller/sources/ble/bb/bb_ble_cis.c + stack/controller/sources/ble/bb/bb_ble_cis_master.c + stack/controller/sources/ble/bb/bb_ble_cis_slave.c stack/controller/sources/ble/bb/bb_ble_conn.c stack/controller/sources/ble/bb/bb_ble_conn_master.c stack/controller/sources/ble/bb/bb_ble_conn_slave.c + stack/controller/sources/ble/bb/bb_ble_dtm.c stack/controller/sources/ble/bb/bb_ble_main.c stack/controller/sources/ble/bb/bb_ble_pdufilt.c stack/controller/sources/ble/bb/bb_ble_periodiclist.c stack/controller/sources/ble/bb/bb_ble_reslist.c - stack/controller/sources/ble/bb/bb_ble_test.c + stack/controller/sources/ble/bb/bb_ble_sniffer.c stack/controller/sources/ble/bb/bb_ble_whitelist.c ) @@ -118,13 +124,19 @@ target_sources(mbed-os stack/controller/sources/ble/lhci/lhci_cmd_adv_priv.c stack/controller/sources/ble/lhci/lhci_cmd_adv_slave.c stack/controller/sources/ble/lhci/lhci_cmd_adv_slave_ae.c + stack/controller/sources/ble/lhci/lhci_cmd_bis_master.c + stack/controller/sources/ble/lhci/lhci_cmd_bis_slave.c + stack/controller/sources/ble/lhci/lhci_cmd_cis_master.c + stack/controller/sources/ble/lhci/lhci_cmd_cis_slave.c stack/controller/sources/ble/lhci/lhci_cmd_conn.c stack/controller/sources/ble/lhci/lhci_cmd_conn_master.c stack/controller/sources/ble/lhci/lhci_cmd_conn_master_ae.c stack/controller/sources/ble/lhci/lhci_cmd_conn_priv.c stack/controller/sources/ble/lhci/lhci_cmd_enc_master.c stack/controller/sources/ble/lhci/lhci_cmd_enc_slave.c + stack/controller/sources/ble/lhci/lhci_cmd_iso.c stack/controller/sources/ble/lhci/lhci_cmd_past.c + stack/controller/sources/ble/lhci/lhci_cmd_pc.c stack/controller/sources/ble/lhci/lhci_cmd_phy.c stack/controller/sources/ble/lhci/lhci_cmd_sc.c stack/controller/sources/ble/lhci/lhci_cmd_vs.c @@ -135,19 +147,25 @@ target_sources(mbed-os stack/controller/sources/ble/lhci/lhci_cmd_vs_conn.c stack/controller/sources/ble/lhci/lhci_cmd_vs_conn_master.c stack/controller/sources/ble/lhci/lhci_cmd_vs_enc_slave.c - stack/controller/sources/ble/lhci/lhci_cmd_vs_ext.c + stack/controller/sources/ble/lhci/lhci_cmd_vs_iso.c stack/controller/sources/ble/lhci/lhci_cmd_vs_sc.c stack/controller/sources/ble/lhci/lhci_evt.c stack/controller/sources/ble/lhci/lhci_evt_adv_master.c stack/controller/sources/ble/lhci/lhci_evt_adv_master_ae.c stack/controller/sources/ble/lhci/lhci_evt_adv_slave.c stack/controller/sources/ble/lhci/lhci_evt_adv_slave_ae.c + stack/controller/sources/ble/lhci/lhci_evt_bis_master.c + stack/controller/sources/ble/lhci/lhci_evt_bis_slave.c + stack/controller/sources/ble/lhci/lhci_evt_cis_master.c + stack/controller/sources/ble/lhci/lhci_evt_cis_slave.c stack/controller/sources/ble/lhci/lhci_evt_conn.c stack/controller/sources/ble/lhci/lhci_evt_conn_cs2.c stack/controller/sources/ble/lhci/lhci_evt_conn_master.c stack/controller/sources/ble/lhci/lhci_evt_conn_priv.c stack/controller/sources/ble/lhci/lhci_evt_enc_master.c stack/controller/sources/ble/lhci/lhci_evt_enc_slave.c + stack/controller/sources/ble/lhci/lhci_evt_iso.c + stack/controller/sources/ble/lhci/lhci_evt_pc.c stack/controller/sources/ble/lhci/lhci_evt_phy.c stack/controller/sources/ble/lhci/lhci_evt_sc.c stack/controller/sources/ble/lhci/lhci_evt_vs.c @@ -157,6 +175,10 @@ target_sources(mbed-os stack/controller/sources/ble/lhci/lhci_init_adv_priv.c stack/controller/sources/ble/lhci/lhci_init_adv_slave.c stack/controller/sources/ble/lhci/lhci_init_adv_slave_ae.c + stack/controller/sources/ble/lhci/lhci_init_bis_master.c + stack/controller/sources/ble/lhci/lhci_init_bis_slave.c + stack/controller/sources/ble/lhci/lhci_init_cis_master.c + stack/controller/sources/ble/lhci/lhci_init_cis_slave.c stack/controller/sources/ble/lhci/lhci_init_conn.c stack/controller/sources/ble/lhci/lhci_init_conn_cs2.c stack/controller/sources/ble/lhci/lhci_init_conn_master.c @@ -164,10 +186,13 @@ target_sources(mbed-os stack/controller/sources/ble/lhci/lhci_init_conn_priv.c stack/controller/sources/ble/lhci/lhci_init_enc_master.c stack/controller/sources/ble/lhci/lhci_init_enc_slave.c + stack/controller/sources/ble/lhci/lhci_init_iso.c stack/controller/sources/ble/lhci/lhci_init_past.c + stack/controller/sources/ble/lhci/lhci_init_pc.c stack/controller/sources/ble/lhci/lhci_init_phy.c stack/controller/sources/ble/lhci/lhci_init_sc.c stack/controller/sources/ble/lhci/lhci_main.c + stack/controller/sources/ble/lhci/lhci_main_iso.c ) target_sources(mbed-os @@ -249,5 +274,5 @@ target_sources(mbed-os target_sources(mbed-os PRIVATE - stack_adaptation/fake_lhci_drv.cpp + stack_adaptation/custom_chci_tr.cpp ) diff --git a/connectivity/FEATURE_BLE/libraries/ble-api-implementation/CMakeLists.txt b/connectivity/FEATURE_BLE/libraries/ble-api-implementation/CMakeLists.txt new file mode 100644 index 0000000000..59effd3876 --- /dev/null +++ b/connectivity/FEATURE_BLE/libraries/ble-api-implementation/CMakeLists.txt @@ -0,0 +1,18 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +target_include_directories(mbed-os + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${CMAKE_CURRENT_SOURCE_DIR}/include/ble + ${CMAKE_CURRENT_SOURCE_DIR}/include/ble/internal +) + +target_sources(mbed-os + PRIVATE + source/GapImpl.cpp + source/GattClientImpl.cpp + source/GattServerImpl.cpp + source/SecurityManagerImpl.cpp +) diff --git a/connectivity/drivers/CMakeLists.txt b/connectivity/drivers/CMakeLists.txt index c77873a50a..bb49600566 100644 --- a/connectivity/drivers/CMakeLists.txt +++ b/connectivity/drivers/CMakeLists.txt @@ -2,6 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 add_subdirectory(802.15.4_RF) +add_subdirectory(ble) add_subdirectory(cellular) add_subdirectory(emac) add_subdirectory(wifi) diff --git a/features/FEATURE_BLE/targets/TARGET_STM/CMakeLists.txt b/connectivity/drivers/ble/CMakeLists.txt similarity index 67% rename from features/FEATURE_BLE/targets/TARGET_STM/CMakeLists.txt rename to connectivity/drivers/ble/CMakeLists.txt index f403f3ac48..9384ae5514 100644 --- a/features/FEATURE_BLE/targets/TARGET_STM/CMakeLists.txt +++ b/connectivity/drivers/ble/CMakeLists.txt @@ -1,4 +1,4 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -mbed_add_cmake_directory_if_labels("TARGET") +mbed_add_cmake_directory_if_labels("FEATURE") diff --git a/features/FEATURE_BLE/targets/TARGET_Cypress/CMakeLists.txt b/connectivity/drivers/ble/FEATURE_BLE/CMakeLists.txt similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_Cypress/CMakeLists.txt rename to connectivity/drivers/ble/FEATURE_BLE/CMakeLists.txt diff --git a/features/FEATURE_BLE/targets/TARGET_Cypress/COMPONENT_CYW43XXX/CMakeLists.txt b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/CMakeLists.txt similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_Cypress/COMPONENT_CYW43XXX/CMakeLists.txt rename to connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/CMakeLists.txt diff --git a/features/FEATURE_BLE/targets/TARGET_Cypress/COMPONENT_CYW43XXX/TARGET_PSOC6/CMakeLists.txt b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/TARGET_PSOC6/CMakeLists.txt similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_Cypress/COMPONENT_CYW43XXX/TARGET_PSOC6/CMakeLists.txt rename to connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/TARGET_PSOC6/CMakeLists.txt diff --git a/features/FEATURE_BLE/targets/TARGET_Cypress/COMPONENT_CYW43XXX/firmware/CMakeLists.txt b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/firmware/CMakeLists.txt similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_Cypress/COMPONENT_CYW43XXX/firmware/CMakeLists.txt rename to connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/firmware/CMakeLists.txt diff --git a/features/FEATURE_BLE/targets/TARGET_Cypress/COMPONENT_CYW43XXX/firmware/COMPONENT_43012/CMakeLists.txt b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/firmware/COMPONENT_43012/CMakeLists.txt similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_Cypress/COMPONENT_CYW43XXX/firmware/COMPONENT_43012/CMakeLists.txt rename to connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/firmware/COMPONENT_43012/CMakeLists.txt diff --git a/features/FEATURE_BLE/targets/TARGET_Cypress/COMPONENT_CYW43XXX/firmware/COMPONENT_43438/CMakeLists.txt b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/firmware/COMPONENT_43438/CMakeLists.txt similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_Cypress/COMPONENT_CYW43XXX/firmware/COMPONENT_43438/CMakeLists.txt rename to connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/firmware/COMPONENT_43438/CMakeLists.txt diff --git a/features/FEATURE_BLE/targets/TARGET_Cypress/COMPONENT_CYW43XXX/firmware/COMPONENT_4343W/CMakeLists.txt b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/firmware/COMPONENT_4343W/CMakeLists.txt similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_Cypress/COMPONENT_CYW43XXX/firmware/COMPONENT_4343W/CMakeLists.txt rename to connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/firmware/COMPONENT_4343W/CMakeLists.txt diff --git a/features/FEATURE_BLE/targets/TARGET_Cypress/COMPONENT_CYW43XXX/firmware/TARGET_CYW9P62S1_43012EVB_01/CMakeLists.txt b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/firmware/TARGET_CYW9P62S1_43012EVB_01/CMakeLists.txt similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_Cypress/COMPONENT_CYW43XXX/firmware/TARGET_CYW9P62S1_43012EVB_01/CMakeLists.txt rename to connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/firmware/TARGET_CYW9P62S1_43012EVB_01/CMakeLists.txt diff --git a/features/FEATURE_BLE/targets/TARGET_Cypress/TARGET_CY8C63XX/CMakeLists.txt b/connectivity/drivers/ble/FEATURE_BLE/TARGET_CY8C63XX/CMakeLists.txt similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_Cypress/TARGET_CY8C63XX/CMakeLists.txt rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_CY8C63XX/CMakeLists.txt diff --git a/features/FEATURE_BLE/targets/CMakeLists.txt b/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/CMakeLists.txt similarity index 100% rename from features/FEATURE_BLE/targets/CMakeLists.txt rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/CMakeLists.txt diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/CMakeLists.txt b/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/CMakeLists.txt similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/CMakeLists.txt rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/CMakeLists.txt diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_MCU_NRF52840/CMakeLists.txt b/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_MCU_NRF52840/CMakeLists.txt similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_MCU_NRF52840/CMakeLists.txt rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_MCU_NRF52840/CMakeLists.txt diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/CMakeLists.txt b/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/CMakeLists.txt similarity index 73% rename from features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/CMakeLists.txt rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/CMakeLists.txt index c7b94e5543..f57dfb3735 100644 --- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/CMakeLists.txt +++ b/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/CMakeLists.txt @@ -17,11 +17,5 @@ target_sources(mbed-os stack/sources/pal_bb_ble_rf.c stack/sources/pal_cfg.c stack/sources/pal_crypto.c - stack/sources/pal_led.c - stack/sources/pal_nvm.c - stack/sources/pal_rtc.c - stack/sources/pal_sys.c stack/sources/pal_timer.c - stack/sources/pal_twi.c - stack/sources/pal_uart.c ) diff --git a/features/FEATURE_BLE/targets/TARGET_STM/TARGET_STM32WB/CMakeLists.txt b/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/CMakeLists.txt similarity index 100% rename from features/FEATURE_BLE/targets/TARGET_STM/TARGET_STM32WB/CMakeLists.txt rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/CMakeLists.txt diff --git a/features/FEATURE_BLE/CMakeLists.txt b/features/FEATURE_BLE/CMakeLists.txt deleted file mode 100644 index f554baaa8c..0000000000 --- a/features/FEATURE_BLE/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -add_subdirectory(ble) -add_subdirectory(source) -add_subdirectory(targets) - -target_include_directories(mbed-os - PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} -) diff --git a/features/FEATURE_BLE/ble/CMakeLists.txt b/features/FEATURE_BLE/ble/CMakeLists.txt deleted file mode 100644 index 28a91dfdae..0000000000 --- a/features/FEATURE_BLE/ble/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -target_include_directories(mbed-os - PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/common - ${CMAKE_CURRENT_SOURCE_DIR}/gap - ${CMAKE_CURRENT_SOURCE_DIR}/generic - ${CMAKE_CURRENT_SOURCE_DIR}/pal - ${CMAKE_CURRENT_SOURCE_DIR}/services -) diff --git a/features/FEATURE_BLE/source/CMakeLists.txt b/features/FEATURE_BLE/source/CMakeLists.txt deleted file mode 100644 index 7445e9d3a7..0000000000 --- a/features/FEATURE_BLE/source/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -target_sources(mbed-os - PRIVATE - BLE.cpp - BLEInstanceBase.cpp - DiscoveredCharacteristic.cpp - GattClient.tpp - GattServer.tpp - SecurityManager.tpp - - gap/AdvertisingDataBuilder.cpp - gap/AdvertisingParameters.cpp - gap/ConnectionParameters.cpp - gap/Gap.tpp - - generic/FileSecurityDb.cpp - generic/GenericGap.tpp - generic/GenericGattClient.tpp - generic/GenericSecurityManager.tpp -) diff --git a/features/FEATURE_BLE/targets/TARGET_STM/TARGET_CYW4343X/CMakeLists.txt b/features/FEATURE_BLE/targets/TARGET_STM/TARGET_CYW4343X/CMakeLists.txt deleted file mode 100644 index 1a215f375e..0000000000 --- a/features/FEATURE_BLE/targets/TARGET_STM/TARGET_CYW4343X/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -target_sources(mbed-os - PRIVATE - HCIDriver.cpp -)