From 27cb03824ef8e246e4da17216c9eda0d5d7cf086 Mon Sep 17 00:00:00 2001 From: Vincent Coubard Date: Fri, 21 Aug 2020 18:38:38 +0100 Subject: [PATCH] BLE: Move common publi headers into ble/common --- connectivity/FEATURE_BLE/include/ble/BLE.h | 8 ++++---- connectivity/FEATURE_BLE/include/ble/Gap.h | 6 +++--- connectivity/FEATURE_BLE/include/ble/GattClient.h | 4 ++-- connectivity/FEATURE_BLE/include/ble/GattServer.h | 4 ++-- connectivity/FEATURE_BLE/include/ble/SecurityManager.h | 8 ++++---- .../FEATURE_BLE/include/ble/common/{ble => }/BLERoles.h | 0 .../FEATURE_BLE/include/ble/common/{ble => }/BLETypes.h | 2 +- .../FEATURE_BLE/include/ble/common/{ble => }/Bounded.h | 0 .../{ble => }/CallChainOfFunctionPointersWithContext.h | 4 ++-- .../FEATURE_BLE/include/ble/common/{ble => }/Duration.h | 0 .../ble/common/{ble => }/FunctionPointerWithContext.h | 2 +- .../FEATURE_BLE/include/ble/common/{ble => }/SafeBool.h | 0 .../FEATURE_BLE/include/ble/common/{ble => }/SafeEnum.h | 0 .../FEATURE_BLE/include/ble/common/{ble => }/UUID.h | 2 +- .../ble/common/ble/CharacteristicDescriptorDiscovery.h | 2 +- .../include/ble/common/ble/DiscoveredCharacteristic.h | 2 +- .../ble/common/ble/DiscoveredCharacteristicDescriptor.h | 2 +- .../include/ble/common/ble/DiscoveredService.h | 2 +- .../FEATURE_BLE/include/ble/common/ble/GapEvents.h | 2 +- .../FEATURE_BLE/include/ble/common/ble/GapTypes.h | 4 ++-- .../FEATURE_BLE/include/ble/common/ble/GattAttribute.h | 4 ++-- .../include/ble/common/ble/GattCallbackParamTypes.h | 2 +- .../include/ble/common/ble/GattCharacteristic.h | 2 +- .../FEATURE_BLE/include/ble/common/ble/GattService.h | 2 +- .../FEATURE_BLE/include/ble/common/ble/ServiceDiscovery.h | 4 ++-- .../FEATURE_BLE/include/ble/common/{ble => }/blecommon.h | 0 .../FEATURE_BLE/include/ble/gap/AdvertisingDataBuilder.h | 6 +++--- .../include/ble/gap/AdvertisingDataSimpleBuilder.h | 2 +- .../FEATURE_BLE/include/ble/gap/AdvertisingDataTypes.h | 2 +- .../FEATURE_BLE/include/ble/gap/AdvertisingParameters.h | 6 +++--- .../FEATURE_BLE/include/ble/gap/ConnectionParameters.h | 2 +- connectivity/FEATURE_BLE/include/ble/gap/Events.h | 4 ++-- connectivity/FEATURE_BLE/include/ble/gap/ScanParameters.h | 4 ++-- connectivity/FEATURE_BLE/include/ble/gap/Types.h | 6 +++--- .../libraries/TARGET_CORDIO/driver/CordioHCIDriver.h | 2 +- .../include/ble/internal/BLEInstanceBaseImpl.h | 2 +- .../include/ble/internal/PalSecurityManagerImpl.h | 2 +- .../TARGET_CORDIO/source/PalSecurityManagerImpl.cpp | 4 ++-- connectivity/FEATURE_BLE/source/generic/GapImpl.h | 6 +++--- .../FEATURE_BLE/source/generic/GattClientImpl.cpp | 4 ++-- connectivity/FEATURE_BLE/source/generic/GattClientImpl.h | 4 ++-- .../FEATURE_BLE/source/generic/GattServerImpl.cpp | 2 +- connectivity/FEATURE_BLE/source/generic/GattServerImpl.h | 4 ++-- connectivity/FEATURE_BLE/source/generic/SecurityDb.h | 4 ++-- .../FEATURE_BLE/source/generic/SecurityManagerImpl.cpp | 2 +- .../FEATURE_BLE/source/generic/SecurityManagerImpl.h | 8 ++++---- connectivity/FEATURE_BLE/source/pal/AttServerMessage.h | 4 ++-- connectivity/FEATURE_BLE/source/pal/PalAttClient.h | 6 +++--- .../FEATURE_BLE/source/pal/PalConnectionMonitor.h | 2 +- connectivity/FEATURE_BLE/source/pal/PalGap.h | 2 +- connectivity/FEATURE_BLE/source/pal/PalGattClient.h | 6 +++--- .../FEATURE_BLE/source/pal/PalGenericAccessService.h | 4 ++-- connectivity/FEATURE_BLE/source/pal/PalSecurityManager.h | 2 +- connectivity/FEATURE_BLE/source/pal/PalSigningMonitor.h | 2 +- .../drivers/ble/FEATURE_BLE/TARGET_STM32WB/HCIDriver.cpp | 2 +- 55 files changed, 87 insertions(+), 87 deletions(-) rename connectivity/FEATURE_BLE/include/ble/common/{ble => }/BLERoles.h (100%) rename connectivity/FEATURE_BLE/include/ble/common/{ble => }/BLETypes.h (99%) rename connectivity/FEATURE_BLE/include/ble/common/{ble => }/Bounded.h (100%) rename connectivity/FEATURE_BLE/include/ble/common/{ble => }/CallChainOfFunctionPointersWithContext.h (99%) rename connectivity/FEATURE_BLE/include/ble/common/{ble => }/Duration.h (100%) rename connectivity/FEATURE_BLE/include/ble/common/{ble => }/FunctionPointerWithContext.h (99%) rename connectivity/FEATURE_BLE/include/ble/common/{ble => }/SafeBool.h (100%) rename connectivity/FEATURE_BLE/include/ble/common/{ble => }/SafeEnum.h (100%) rename connectivity/FEATURE_BLE/include/ble/common/{ble => }/UUID.h (99%) rename connectivity/FEATURE_BLE/include/ble/common/{ble => }/blecommon.h (100%) diff --git a/connectivity/FEATURE_BLE/include/ble/BLE.h b/connectivity/FEATURE_BLE/include/ble/BLE.h index 0c8ebba196..a013c53e2a 100644 --- a/connectivity/FEATURE_BLE/include/ble/BLE.h +++ b/connectivity/FEATURE_BLE/include/ble/BLE.h @@ -19,14 +19,14 @@ #ifndef MBED_BLE_H__ #define MBED_BLE_H__ -#include "FunctionPointerWithContext.h" +#include "ble/common/FunctionPointerWithContext.h" #include "platform/mbed_error.h" #include "platform/mbed_assert.h" #include "platform/mbed_toolchain.h" -#include "ble/common/ble/BLERoles.h" -#include "ble/common/ble/BLETypes.h" -#include "ble/common/ble/blecommon.h" +#include "ble/common/BLERoles.h" +#include "ble/common/BLETypes.h" +#include "ble/common/blecommon.h" #include "ble/Gap.h" #include "ble/GattClient.h" diff --git a/connectivity/FEATURE_BLE/include/ble/Gap.h b/connectivity/FEATURE_BLE/include/ble/Gap.h index 8273be219f..3791acdc34 100644 --- a/connectivity/FEATURE_BLE/include/ble/Gap.h +++ b/connectivity/FEATURE_BLE/include/ble/Gap.h @@ -19,7 +19,7 @@ #ifndef BLE_GAP_GAP_H #define BLE_GAP_GAP_H -#include "CallChainOfFunctionPointersWithContext.h" +#include "ble/common/CallChainOfFunctionPointersWithContext.h" #include @@ -27,8 +27,8 @@ #include "drivers/LowPowerTicker.h" #include "platform/mbed_error.h" -#include "ble/common/ble/BLERoles.h" -#include "ble/common/ble/BLETypes.h" +#include "ble/common/BLERoles.h" +#include "ble/common/BLETypes.h" #include "ble/gap/AdvertisingDataBuilder.h" #include "ble/gap/AdvertisingDataParser.h" #include "ble/gap/AdvertisingDataSimpleBuilder.h" diff --git a/connectivity/FEATURE_BLE/include/ble/GattClient.h b/connectivity/FEATURE_BLE/include/ble/GattClient.h index 5532c055f4..10f8e9dc6c 100644 --- a/connectivity/FEATURE_BLE/include/ble/GattClient.h +++ b/connectivity/FEATURE_BLE/include/ble/GattClient.h @@ -21,10 +21,10 @@ #define MBED_GATT_CLIENT_H__ -#include "CallChainOfFunctionPointersWithContext.h" +#include "ble/common/CallChainOfFunctionPointersWithContext.h" #include -#include "ble/common/ble/blecommon.h" +#include "ble/common/blecommon.h" #include "ble/common/ble/GattAttribute.h" #include "ble/common/ble/ServiceDiscovery.h" #include "ble/common/ble/CharacteristicDescriptorDiscovery.h" diff --git a/connectivity/FEATURE_BLE/include/ble/GattServer.h b/connectivity/FEATURE_BLE/include/ble/GattServer.h index 94a554770f..36bf2b32a9 100644 --- a/connectivity/FEATURE_BLE/include/ble/GattServer.h +++ b/connectivity/FEATURE_BLE/include/ble/GattServer.h @@ -20,14 +20,14 @@ #ifndef MBED_GATT_SERVER_H__ #define MBED_GATT_SERVER_H__ -#include "CallChainOfFunctionPointersWithContext.h" +#include "ble/common/CallChainOfFunctionPointersWithContext.h" #include "ble/common/ble/GattService.h" #include "ble/common/ble/GattAttribute.h" #include "ble/common/ble/GattServerEvents.h" #include "ble/common/ble/GattCallbackParamTypes.h" -#include "ble/common/ble/blecommon.h" +#include "ble/common/blecommon.h" #include "ble/Gap.h" #include "SecurityManager.h" diff --git a/connectivity/FEATURE_BLE/include/ble/SecurityManager.h b/connectivity/FEATURE_BLE/include/ble/SecurityManager.h index 70eb2e3dfa..669d1c5a90 100644 --- a/connectivity/FEATURE_BLE/include/ble/SecurityManager.h +++ b/connectivity/FEATURE_BLE/include/ble/SecurityManager.h @@ -20,13 +20,13 @@ #define BLE_SECURITY_MANAGER_H_ #include -#include "CallChainOfFunctionPointersWithContext.h" +#include "ble/common/CallChainOfFunctionPointersWithContext.h" #include "platform/Callback.h" -#include "ble/common/ble/BLETypes.h" -#include "ble/common/ble/blecommon.h" +#include "ble/common/BLETypes.h" +#include "ble/common/blecommon.h" -#include "ble/common/ble/BLETypes.h" +#include "ble/common/BLETypes.h" namespace ble { diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/BLERoles.h b/connectivity/FEATURE_BLE/include/ble/common/BLERoles.h similarity index 100% rename from connectivity/FEATURE_BLE/include/ble/common/ble/BLERoles.h rename to connectivity/FEATURE_BLE/include/ble/common/BLERoles.h diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/BLETypes.h b/connectivity/FEATURE_BLE/include/ble/common/BLETypes.h similarity index 99% rename from connectivity/FEATURE_BLE/include/ble/common/ble/BLETypes.h rename to connectivity/FEATURE_BLE/include/ble/common/BLETypes.h index 75b602669b..d87f5b588b 100644 --- a/connectivity/FEATURE_BLE/include/ble/common/ble/BLETypes.h +++ b/connectivity/FEATURE_BLE/include/ble/common/BLETypes.h @@ -22,7 +22,7 @@ #include #include #include -#include "SafeEnum.h" +#include "ble/common/SafeEnum.h" #include "platform/Span.h" #include "ble/gap/Types.h" diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/Bounded.h b/connectivity/FEATURE_BLE/include/ble/common/Bounded.h similarity index 100% rename from connectivity/FEATURE_BLE/include/ble/common/ble/Bounded.h rename to connectivity/FEATURE_BLE/include/ble/common/Bounded.h diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/CallChainOfFunctionPointersWithContext.h b/connectivity/FEATURE_BLE/include/ble/common/CallChainOfFunctionPointersWithContext.h similarity index 99% rename from connectivity/FEATURE_BLE/include/ble/common/ble/CallChainOfFunctionPointersWithContext.h rename to connectivity/FEATURE_BLE/include/ble/common/CallChainOfFunctionPointersWithContext.h index ac2431e012..0476decc57 100644 --- a/connectivity/FEATURE_BLE/include/ble/common/ble/CallChainOfFunctionPointersWithContext.h +++ b/connectivity/FEATURE_BLE/include/ble/common/CallChainOfFunctionPointersWithContext.h @@ -20,8 +20,8 @@ #define MBED_CALLCHAIN_OF_FUNCTION_POINTERS_WITH_CONTEXT_H #include -#include "FunctionPointerWithContext.h" -#include "SafeBool.h" +#include "ble/common/FunctionPointerWithContext.h" +#include "ble/common/SafeBool.h" /** * @addtogroup ble diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/Duration.h b/connectivity/FEATURE_BLE/include/ble/common/Duration.h similarity index 100% rename from connectivity/FEATURE_BLE/include/ble/common/ble/Duration.h rename to connectivity/FEATURE_BLE/include/ble/common/Duration.h diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/FunctionPointerWithContext.h b/connectivity/FEATURE_BLE/include/ble/common/FunctionPointerWithContext.h similarity index 99% rename from connectivity/FEATURE_BLE/include/ble/common/ble/FunctionPointerWithContext.h rename to connectivity/FEATURE_BLE/include/ble/common/FunctionPointerWithContext.h index 5fcfc19e59..f75a387d84 100644 --- a/connectivity/FEATURE_BLE/include/ble/common/ble/FunctionPointerWithContext.h +++ b/connectivity/FEATURE_BLE/include/ble/common/FunctionPointerWithContext.h @@ -20,7 +20,7 @@ #define MBED_FUNCTIONPOINTER_WITH_CONTEXT_H #include -#include "SafeBool.h" +#include "ble/common/SafeBool.h" /** * @file diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/SafeBool.h b/connectivity/FEATURE_BLE/include/ble/common/SafeBool.h similarity index 100% rename from connectivity/FEATURE_BLE/include/ble/common/ble/SafeBool.h rename to connectivity/FEATURE_BLE/include/ble/common/SafeBool.h diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/SafeEnum.h b/connectivity/FEATURE_BLE/include/ble/common/SafeEnum.h similarity index 100% rename from connectivity/FEATURE_BLE/include/ble/common/ble/SafeEnum.h rename to connectivity/FEATURE_BLE/include/ble/common/SafeEnum.h diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/UUID.h b/connectivity/FEATURE_BLE/include/ble/common/UUID.h similarity index 99% rename from connectivity/FEATURE_BLE/include/ble/common/ble/UUID.h rename to connectivity/FEATURE_BLE/include/ble/common/UUID.h index 5532bab8cd..e3b1a744a5 100644 --- a/connectivity/FEATURE_BLE/include/ble/common/ble/UUID.h +++ b/connectivity/FEATURE_BLE/include/ble/common/UUID.h @@ -24,7 +24,7 @@ #include #include -#include "ble/common/ble/blecommon.h" +#include "ble/common/blecommon.h" /** * @file diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/CharacteristicDescriptorDiscovery.h b/connectivity/FEATURE_BLE/include/ble/common/ble/CharacteristicDescriptorDiscovery.h index 996f38fa51..8ad501fbad 100644 --- a/connectivity/FEATURE_BLE/include/ble/common/ble/CharacteristicDescriptorDiscovery.h +++ b/connectivity/FEATURE_BLE/include/ble/common/ble/CharacteristicDescriptorDiscovery.h @@ -19,7 +19,7 @@ #ifndef MBED_CHARACTERISTIC_DESCRIPTOR_DISCOVERY_H__ #define MBED_CHARACTERISTIC_DESCRIPTOR_DISCOVERY_H__ -#include "FunctionPointerWithContext.h" +#include "ble/common/FunctionPointerWithContext.h" class DiscoveredCharacteristic; // forward declaration class DiscoveredCharacteristicDescriptor; // forward declaration diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredCharacteristic.h b/connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredCharacteristic.h index 7439ad3679..81a017a403 100644 --- a/connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredCharacteristic.h +++ b/connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredCharacteristic.h @@ -19,7 +19,7 @@ #ifndef MBED_DISCOVERED_CHARACTERISTIC_H__ #define MBED_DISCOVERED_CHARACTERISTIC_H__ -#include "ble/common/ble/UUID.h" +#include "ble/common/UUID.h" #include "ble/common/ble/GattAttribute.h" #include "ble/common/ble/GattCallbackParamTypes.h" #include "ble/common/ble/CharacteristicDescriptorDiscovery.h" diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredCharacteristicDescriptor.h b/connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredCharacteristicDescriptor.h index 5c7ac0786d..8b95247d46 100644 --- a/connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredCharacteristicDescriptor.h +++ b/connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredCharacteristicDescriptor.h @@ -19,7 +19,7 @@ #ifndef MBED_DISCOVERED_CHARACTERISTIC_DESCRIPTOR_H__ #define MBED_DISCOVERED_CHARACTERISTIC_DESCRIPTOR_H__ -#include "ble/common/ble/UUID.h" +#include "ble/common/UUID.h" #include "ble/Gap.h" #include "ble/common/ble/GattAttribute.h" #include "ble/common/ble/CharacteristicDescriptorDiscovery.h" diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredService.h b/connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredService.h index baead1fb6c..51d5a6d6ef 100644 --- a/connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredService.h +++ b/connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredService.h @@ -19,7 +19,7 @@ #ifndef MBED_DISCOVERED_SERVICE_H__ #define MBED_DISCOVERED_SERVICE_H__ -#include "ble/common/ble/UUID.h" +#include "ble/common/UUID.h" #include "ble/common/ble/GattAttribute.h" /** diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/GapEvents.h b/connectivity/FEATURE_BLE/include/ble/common/ble/GapEvents.h index 0b9cca27a7..235553ea34 100644 --- a/connectivity/FEATURE_BLE/include/ble/common/ble/GapEvents.h +++ b/connectivity/FEATURE_BLE/include/ble/common/ble/GapEvents.h @@ -20,7 +20,7 @@ #define BLE_PAL_GAP_MESSAGE_H_ #include "ble/common/ble/GapTypes.h" -#include "ble/common/ble/BLETypes.h" +#include "ble/common/BLETypes.h" namespace ble { diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/GapTypes.h b/connectivity/FEATURE_BLE/include/ble/common/ble/GapTypes.h index ae0d66514d..8248b4bdb5 100644 --- a/connectivity/FEATURE_BLE/include/ble/common/ble/GapTypes.h +++ b/connectivity/FEATURE_BLE/include/ble/common/ble/GapTypes.h @@ -21,8 +21,8 @@ #include -#include "ble/common/ble/BLETypes.h" -#include "ble/common/ble/SafeEnum.h" +#include "ble/common/BLETypes.h" +#include "ble/common/SafeEnum.h" namespace ble { diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/GattAttribute.h b/connectivity/FEATURE_BLE/include/ble/common/ble/GattAttribute.h index 6988981ac9..b45e06a76b 100644 --- a/connectivity/FEATURE_BLE/include/ble/common/ble/GattAttribute.h +++ b/connectivity/FEATURE_BLE/include/ble/common/ble/GattAttribute.h @@ -19,8 +19,8 @@ #ifndef MBED_GATT_ATTRIBUTE_H__ #define MBED_GATT_ATTRIBUTE_H__ -#include "ble/common/ble/UUID.h" -#include "ble/common/ble/BLETypes.h" +#include "ble/common/UUID.h" +#include "ble/common/BLETypes.h" /** * @addtogroup ble diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/GattCallbackParamTypes.h b/connectivity/FEATURE_BLE/include/ble/common/ble/GattCallbackParamTypes.h index 90e1b90813..a425c94f7c 100644 --- a/connectivity/FEATURE_BLE/include/ble/common/ble/GattCallbackParamTypes.h +++ b/connectivity/FEATURE_BLE/include/ble/common/ble/GattCallbackParamTypes.h @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "CallChainOfFunctionPointersWithContext.h" +#include "ble/common/CallChainOfFunctionPointersWithContext.h" #ifndef MBED_BLE_GATT_CALLBACK_PARAM_TYPES_H__ #define MBED_BLE_GATT_CALLBACK_PARAM_TYPES_H__ diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/GattCharacteristic.h b/connectivity/FEATURE_BLE/include/ble/common/ble/GattCharacteristic.h index 9ec36729f6..742f7c3dad 100644 --- a/connectivity/FEATURE_BLE/include/ble/common/ble/GattCharacteristic.h +++ b/connectivity/FEATURE_BLE/include/ble/common/ble/GattCharacteristic.h @@ -19,7 +19,7 @@ #ifndef __GATT_CHARACTERISTIC_H__ #define __GATT_CHARACTERISTIC_H__ -#include "FunctionPointerWithContext.h" +#include "ble/common/FunctionPointerWithContext.h" #include "ble/common/ble/GattAttribute.h" #include "ble/common/ble/GattCallbackParamTypes.h" diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/GattService.h b/connectivity/FEATURE_BLE/include/ble/common/ble/GattService.h index a5a72c2528..d9212439c7 100644 --- a/connectivity/FEATURE_BLE/include/ble/common/ble/GattService.h +++ b/connectivity/FEATURE_BLE/include/ble/common/ble/GattService.h @@ -19,7 +19,7 @@ #ifndef MBED_GATT_SERVICE_H__ #define MBED_GATT_SERVICE_H__ -#include "ble/common/ble/UUID.h" +#include "ble/common/UUID.h" #include "ble/common/ble/GattCharacteristic.h" /** diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/ServiceDiscovery.h b/connectivity/FEATURE_BLE/include/ble/common/ble/ServiceDiscovery.h index 9e203e2af0..3ac2d8532e 100644 --- a/connectivity/FEATURE_BLE/include/ble/common/ble/ServiceDiscovery.h +++ b/connectivity/FEATURE_BLE/include/ble/common/ble/ServiceDiscovery.h @@ -19,8 +19,8 @@ #ifndef MBED_BLE_SERVICE_DISOVERY_H__ #define MBED_BLE_SERVICE_DISOVERY_H__ -#include "ble/common/ble/blecommon.h" -#include "ble/common/ble/UUID.h" +#include "ble/common/blecommon.h" +#include "ble/common/UUID.h" #include "ble/common/ble/GattAttribute.h" class DiscoveredService; diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/blecommon.h b/connectivity/FEATURE_BLE/include/ble/common/blecommon.h similarity index 100% rename from connectivity/FEATURE_BLE/include/ble/common/ble/blecommon.h rename to connectivity/FEATURE_BLE/include/ble/common/blecommon.h diff --git a/connectivity/FEATURE_BLE/include/ble/gap/AdvertisingDataBuilder.h b/connectivity/FEATURE_BLE/include/ble/gap/AdvertisingDataBuilder.h index 92ae3d6711..e4efee6f15 100644 --- a/connectivity/FEATURE_BLE/include/ble/gap/AdvertisingDataBuilder.h +++ b/connectivity/FEATURE_BLE/include/ble/gap/AdvertisingDataBuilder.h @@ -24,9 +24,9 @@ #include #include "platform/NonCopyable.h" -#include "ble/common/ble/UUID.h" -#include "ble/common/ble/BLETypes.h" -#include "ble/common/ble/blecommon.h" +#include "ble/common/UUID.h" +#include "ble/common/BLETypes.h" +#include "ble/common/blecommon.h" #include "ble/gap/AdvertisingDataTypes.h" #include "ble/gap/Types.h" diff --git a/connectivity/FEATURE_BLE/include/ble/gap/AdvertisingDataSimpleBuilder.h b/connectivity/FEATURE_BLE/include/ble/gap/AdvertisingDataSimpleBuilder.h index 6ab7cf536c..dc2c3d8c8d 100644 --- a/connectivity/FEATURE_BLE/include/ble/gap/AdvertisingDataSimpleBuilder.h +++ b/connectivity/FEATURE_BLE/include/ble/gap/AdvertisingDataSimpleBuilder.h @@ -21,7 +21,7 @@ #include "platform/Span.h" -#include "ble/common/ble/UUID.h" +#include "ble/common/UUID.h" #include "ble/gap/AdvertisingDataBuilder.h" namespace ble { diff --git a/connectivity/FEATURE_BLE/include/ble/gap/AdvertisingDataTypes.h b/connectivity/FEATURE_BLE/include/ble/gap/AdvertisingDataTypes.h index 701c1285b6..041114916a 100644 --- a/connectivity/FEATURE_BLE/include/ble/gap/AdvertisingDataTypes.h +++ b/connectivity/FEATURE_BLE/include/ble/gap/AdvertisingDataTypes.h @@ -19,7 +19,7 @@ #ifndef BLE_GAP_ADVERTISINGDATATYPES_H #define BLE_GAP_ADVERTISINGDATATYPES_H -#include "ble/common/ble/SafeEnum.h" +#include "ble/common/SafeEnum.h" namespace ble { diff --git a/connectivity/FEATURE_BLE/include/ble/gap/AdvertisingParameters.h b/connectivity/FEATURE_BLE/include/ble/gap/AdvertisingParameters.h index 2bda38a494..c00328ad52 100644 --- a/connectivity/FEATURE_BLE/include/ble/gap/AdvertisingParameters.h +++ b/connectivity/FEATURE_BLE/include/ble/gap/AdvertisingParameters.h @@ -21,9 +21,9 @@ #include -#include "ble/common/ble/BLETypes.h" -#include "ble/common/ble/blecommon.h" -#include "ble/common/ble/SafeEnum.h" +#include "ble/common/BLETypes.h" +#include "ble/common/blecommon.h" +#include "ble/common/SafeEnum.h" namespace ble { diff --git a/connectivity/FEATURE_BLE/include/ble/gap/ConnectionParameters.h b/connectivity/FEATURE_BLE/include/ble/gap/ConnectionParameters.h index dfdc33c72a..95ab08a5fb 100644 --- a/connectivity/FEATURE_BLE/include/ble/gap/ConnectionParameters.h +++ b/connectivity/FEATURE_BLE/include/ble/gap/ConnectionParameters.h @@ -21,7 +21,7 @@ #include "mbed_assert.h" -#include "ble/common/ble/BLETypes.h" +#include "ble/common/BLETypes.h" namespace ble { diff --git a/connectivity/FEATURE_BLE/include/ble/gap/Events.h b/connectivity/FEATURE_BLE/include/ble/gap/Events.h index 454748eea9..b8f561a12c 100644 --- a/connectivity/FEATURE_BLE/include/ble/gap/Events.h +++ b/connectivity/FEATURE_BLE/include/ble/gap/Events.h @@ -19,8 +19,8 @@ #ifndef BLE_GAP_EVENTS_H #define BLE_GAP_EVENTS_H -#include "ble/common/ble/blecommon.h" -#include "ble/common/ble/BLETypes.h" +#include "ble/common/blecommon.h" +#include "ble/common/BLETypes.h" namespace ble { diff --git a/connectivity/FEATURE_BLE/include/ble/gap/ScanParameters.h b/connectivity/FEATURE_BLE/include/ble/gap/ScanParameters.h index b4eead0a34..25a9a1398d 100644 --- a/connectivity/FEATURE_BLE/include/ble/gap/ScanParameters.h +++ b/connectivity/FEATURE_BLE/include/ble/gap/ScanParameters.h @@ -21,8 +21,8 @@ #include -#include "ble/common/ble/blecommon.h" -#include "ble/common/ble/BLETypes.h" +#include "ble/common/blecommon.h" +#include "ble/common/BLETypes.h" namespace ble { diff --git a/connectivity/FEATURE_BLE/include/ble/gap/Types.h b/connectivity/FEATURE_BLE/include/ble/gap/Types.h index 45f47eb819..71b411124e 100644 --- a/connectivity/FEATURE_BLE/include/ble/gap/Types.h +++ b/connectivity/FEATURE_BLE/include/ble/gap/Types.h @@ -19,9 +19,9 @@ #ifndef BLE_GAP_TYPES_H #define BLE_GAP_TYPES_H -#include "ble/common/ble/Duration.h" -#include "ble/common/ble/Bounded.h" -#include "ble/common/ble/SafeEnum.h" +#include "ble/common/Duration.h" +#include "ble/common/Bounded.h" +#include "ble/common/SafeEnum.h" namespace ble { diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/CordioHCIDriver.h b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/CordioHCIDriver.h index 2641f87b1f..93cfadcfdb 100644 --- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/CordioHCIDriver.h +++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/CordioHCIDriver.h @@ -22,7 +22,7 @@ #include #include "wsf_buf.h" #include "CordioHCITransportDriver.h" -#include "ble/common/ble/blecommon.h" +#include "ble/common/blecommon.h" #include "mbed.h" namespace ble { diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/BLEInstanceBaseImpl.h b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/BLEInstanceBaseImpl.h index 17058324f1..77954c5c98 100644 --- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/BLEInstanceBaseImpl.h +++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/BLEInstanceBaseImpl.h @@ -20,7 +20,7 @@ #define IMPL_BLE_INSTANCE_BASE_H_ #include "ble/BLE.h" -#include "ble/common/ble/blecommon.h" +#include "ble/common/blecommon.h" #include "source/BLEInstanceBase.h" #include "CordioHCIDriver.h" diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalSecurityManagerImpl.h b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalSecurityManagerImpl.h index 84c1845ab7..0b2f781fb8 100644 --- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalSecurityManagerImpl.h +++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalSecurityManagerImpl.h @@ -20,7 +20,7 @@ #define IMPL_PAL_SECURITY_MANAGER_ #include "source/pal/PalSecurityManager.h" -#include "ble/common/ble/blecommon.h" +#include "ble/common/blecommon.h" #include "wsf_types.h" #include "wsf_os.h" #include "sec_api.h" diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalSecurityManagerImpl.cpp b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalSecurityManagerImpl.cpp index 98867919a5..474dde2fe9 100644 --- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalSecurityManagerImpl.cpp +++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalSecurityManagerImpl.cpp @@ -16,11 +16,11 @@ * limitations under the License. */ -#include "BLERoles.h" +#include "ble/common/BLERoles.h" #include -#include "ble/common/ble/blecommon.h" +#include "ble/common/blecommon.h" #include "source/pal/PalSecurityManager.h" #include "source/pal/PalAttClient.h" #include "dm_api.h" diff --git a/connectivity/FEATURE_BLE/source/generic/GapImpl.h b/connectivity/FEATURE_BLE/source/generic/GapImpl.h index 4d98ea7fce..08200e65dd 100644 --- a/connectivity/FEATURE_BLE/source/generic/GapImpl.h +++ b/connectivity/FEATURE_BLE/source/generic/GapImpl.h @@ -19,7 +19,7 @@ #ifndef IMPL_GAP_GAP_H #define IMPL_GAP_GAP_H -#include "CallChainOfFunctionPointersWithContext.h" +#include "ble/common/CallChainOfFunctionPointersWithContext.h" #include @@ -27,8 +27,8 @@ #include "drivers/LowPowerTicker.h" #include "platform/mbed_error.h" -#include "ble/common/ble/BLERoles.h" -#include "ble/common/ble/BLETypes.h" +#include "ble/common/BLERoles.h" +#include "ble/common/BLETypes.h" #include "ble/gap/AdvertisingDataBuilder.h" #include "ble/gap/AdvertisingDataSimpleBuilder.h" #include "ble/gap/ConnectionParameters.h" diff --git a/connectivity/FEATURE_BLE/source/generic/GattClientImpl.cpp b/connectivity/FEATURE_BLE/source/generic/GattClientImpl.cpp index 27f3da5297..19f66b3830 100644 --- a/connectivity/FEATURE_BLE/source/generic/GattClientImpl.cpp +++ b/connectivity/FEATURE_BLE/source/generic/GattClientImpl.cpp @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "BLERoles.h" +#include "ble/common/BLERoles.h" #if BLE_FEATURE_GATT_CLIENT @@ -27,7 +27,7 @@ #include "source/pal/AttServerMessage.h" #include "ble/common/ble/DiscoveredService.h" #include "ble/common/ble/DiscoveredCharacteristic.h" -#include "ble/common/ble/blecommon.h" +#include "ble/common/blecommon.h" #include "source/BLEInstanceBase.h" #include "ble/SecurityManager.h" #include diff --git a/connectivity/FEATURE_BLE/source/generic/GattClientImpl.h b/connectivity/FEATURE_BLE/source/generic/GattClientImpl.h index 828f7c8669..16e491f089 100644 --- a/connectivity/FEATURE_BLE/source/generic/GattClientImpl.h +++ b/connectivity/FEATURE_BLE/source/generic/GattClientImpl.h @@ -21,11 +21,11 @@ #include "ble/BLE.h" -#include "CallChainOfFunctionPointersWithContext.h" +#include "ble/common/CallChainOfFunctionPointersWithContext.h" #include -#include "ble/common/ble/blecommon.h" +#include "ble/common/blecommon.h" #include "ble/common/ble/GattAttribute.h" #include "ble/common/ble/ServiceDiscovery.h" #include "ble/common/ble/CharacteristicDescriptorDiscovery.h" diff --git a/connectivity/FEATURE_BLE/source/generic/GattServerImpl.cpp b/connectivity/FEATURE_BLE/source/generic/GattServerImpl.cpp index b6a0d95f8d..f33ad1483f 100644 --- a/connectivity/FEATURE_BLE/source/generic/GattServerImpl.cpp +++ b/connectivity/FEATURE_BLE/source/generic/GattServerImpl.cpp @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "BLERoles.h" +#include "ble/common/BLERoles.h" #include #include "GattServerImpl.h" #include "source/BLEInstanceBase.h" diff --git a/connectivity/FEATURE_BLE/source/generic/GattServerImpl.h b/connectivity/FEATURE_BLE/source/generic/GattServerImpl.h index 5fe187f7ae..e8c7c67ce7 100644 --- a/connectivity/FEATURE_BLE/source/generic/GattServerImpl.h +++ b/connectivity/FEATURE_BLE/source/generic/GattServerImpl.h @@ -19,7 +19,7 @@ #ifndef MBED_CORDIO_GATT_SERVER_H__ #define MBED_CORDIO_GATT_SERVER_H__ -#include "CallChainOfFunctionPointersWithContext.h" +#include "ble/common/CallChainOfFunctionPointersWithContext.h" #include "ble/common/ble/GattService.h" #include "ble/common/ble/GattAttribute.h" @@ -28,7 +28,7 @@ #include #include -#include "ble/common/ble/blecommon.h" +#include "ble/common/blecommon.h" #include "ble/Gap.h" #include "wsf_types.h" #include "att_api.h" diff --git a/connectivity/FEATURE_BLE/source/generic/SecurityDb.h b/connectivity/FEATURE_BLE/source/generic/SecurityDb.h index 3cbf9d8b3c..f606944e9a 100644 --- a/connectivity/FEATURE_BLE/source/generic/SecurityDb.h +++ b/connectivity/FEATURE_BLE/source/generic/SecurityDb.h @@ -22,8 +22,8 @@ #include #include "platform/Callback.h" -#include "ble/common/ble/GapTypes.h" -#include "ble/common/ble/BLETypes.h" +//#include "ble/common/ble/GapTypes.h" +#include "ble/common/BLETypes.h" #include "ble/Gap.h" namespace ble { diff --git a/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.cpp b/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.cpp index b1e5f4d45a..9fdbdb6e1e 100644 --- a/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.cpp +++ b/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.cpp @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "BLERoles.h" +#include "ble/common/BLERoles.h" #include "SecurityManagerImpl.h" #include "source/pal/PalSecurityManager.h" diff --git a/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.h b/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.h index 26a7530e23..773e01256a 100644 --- a/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.h +++ b/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.h @@ -20,15 +20,15 @@ #define IMPL_SECURITY_MANAGER_H_ #include -#include "CallChainOfFunctionPointersWithContext.h" +#include "ble/common/CallChainOfFunctionPointersWithContext.h" #include "platform/Callback.h" -#include "ble/common/ble/BLETypes.h" -#include "ble/common/ble/blecommon.h" +#include "ble/common/BLETypes.h" +#include "ble/common/blecommon.h" #include "ble/Gap.h" #include "ble/common/ble/GapTypes.h" -#include "ble/common/ble/BLETypes.h" +#include "ble/common/BLETypes.h" #include "SecurityDb.h" #include "source/pal/PalConnectionMonitor.h" #include "source/pal/PalSigningMonitor.h" diff --git a/connectivity/FEATURE_BLE/source/pal/AttServerMessage.h b/connectivity/FEATURE_BLE/source/pal/AttServerMessage.h index a60fe28b0d..e38464530d 100644 --- a/connectivity/FEATURE_BLE/source/pal/AttServerMessage.h +++ b/connectivity/FEATURE_BLE/source/pal/AttServerMessage.h @@ -19,8 +19,8 @@ #ifndef BLE_PAL_ATT_SERVER_MESSAGE_H_ #define BLE_PAL_ATT_SERVER_MESSAGE_H_ -#include "ble/common/ble/BLETypes.h" -#include "ble/common/ble/UUID.h" +#include "ble/common/BLETypes.h" +#include "ble/common/UUID.h" namespace ble { diff --git a/connectivity/FEATURE_BLE/source/pal/PalAttClient.h b/connectivity/FEATURE_BLE/source/pal/PalAttClient.h index 69a750b496..3e9a6cda4c 100644 --- a/connectivity/FEATURE_BLE/source/pal/PalAttClient.h +++ b/connectivity/FEATURE_BLE/source/pal/PalAttClient.h @@ -21,9 +21,9 @@ #include "platform/Callback.h" -#include "ble/common/ble/UUID.h" -#include "ble/common/ble/BLETypes.h" -#include "ble/common/ble/blecommon.h" +#include "ble/common/UUID.h" +#include "ble/common/BLETypes.h" +#include "ble/common/blecommon.h" #include "AttServerMessage.h" namespace ble { diff --git a/connectivity/FEATURE_BLE/source/pal/PalConnectionMonitor.h b/connectivity/FEATURE_BLE/source/pal/PalConnectionMonitor.h index 37644a386d..f4c7afed9e 100644 --- a/connectivity/FEATURE_BLE/source/pal/PalConnectionMonitor.h +++ b/connectivity/FEATURE_BLE/source/pal/PalConnectionMonitor.h @@ -20,7 +20,7 @@ #define MBED_BLE_CONNECTION_EVENT_MONITOR #include "ble/Gap.h" -#include "ble/common/ble/BLETypes.h" +#include "ble/common/BLETypes.h" namespace ble { diff --git a/connectivity/FEATURE_BLE/source/pal/PalGap.h b/connectivity/FEATURE_BLE/source/pal/PalGap.h index c602bb8bcb..9fe52714ec 100644 --- a/connectivity/FEATURE_BLE/source/pal/PalGap.h +++ b/connectivity/FEATURE_BLE/source/pal/PalGap.h @@ -23,7 +23,7 @@ #include "ble/common/ble/GapTypes.h" #include "ble/common/ble/GapEvents.h" -#include "ble/common/ble/blecommon.h" +#include "ble/common/blecommon.h" #include "dm_api.h" diff --git a/connectivity/FEATURE_BLE/source/pal/PalGattClient.h b/connectivity/FEATURE_BLE/source/pal/PalGattClient.h index 32ea92d079..c9c9b806be 100644 --- a/connectivity/FEATURE_BLE/source/pal/PalGattClient.h +++ b/connectivity/FEATURE_BLE/source/pal/PalGattClient.h @@ -21,9 +21,9 @@ #include "platform/Callback.h" -#include "ble/common/ble/UUID.h" -#include "ble/common/ble/BLETypes.h" -#include "ble/common/ble/blecommon.h" +#include "ble/common/UUID.h" +#include "ble/common/BLETypes.h" +#include "ble/common/blecommon.h" #include "AttServerMessage.h" namespace ble { diff --git a/connectivity/FEATURE_BLE/source/pal/PalGenericAccessService.h b/connectivity/FEATURE_BLE/source/pal/PalGenericAccessService.h index edc44dea19..4ea872662e 100644 --- a/connectivity/FEATURE_BLE/source/pal/PalGenericAccessService.h +++ b/connectivity/FEATURE_BLE/source/pal/PalGenericAccessService.h @@ -20,8 +20,8 @@ #define BLE_PAL_GENERIC_ACCESS_SERVICE_H_ #include "ble/common/ble/GapTypes.h" -#include "ble/common/ble/BLETypes.h" -#include "ble/common/ble/blecommon.h" +#include "ble/common/BLETypes.h" +#include "ble/common/blecommon.h" #include "ble/Gap.h" namespace ble { diff --git a/connectivity/FEATURE_BLE/source/pal/PalSecurityManager.h b/connectivity/FEATURE_BLE/source/pal/PalSecurityManager.h index 26fac4bce9..0b4ced6289 100644 --- a/connectivity/FEATURE_BLE/source/pal/PalSecurityManager.h +++ b/connectivity/FEATURE_BLE/source/pal/PalSecurityManager.h @@ -22,7 +22,7 @@ #include "platform/Callback.h" #include "platform/NonCopyable.h" -#include "ble/common/ble/BLETypes.h" +#include "ble/common/BLETypes.h" #include "ble/common/ble/GapTypes.h" #include "wsf_types.h" diff --git a/connectivity/FEATURE_BLE/source/pal/PalSigningMonitor.h b/connectivity/FEATURE_BLE/source/pal/PalSigningMonitor.h index a851b06693..19ced89d2a 100644 --- a/connectivity/FEATURE_BLE/source/pal/PalSigningMonitor.h +++ b/connectivity/FEATURE_BLE/source/pal/PalSigningMonitor.h @@ -19,7 +19,7 @@ #ifndef MBED_BLE_SIGNING_EVENT_MONITOR #define MBED_BLE_SIGNING_EVENT_MONITOR -#include "ble/common/ble/BLETypes.h" +#include "ble/common/BLETypes.h" namespace ble { diff --git a/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/HCIDriver.cpp b/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/HCIDriver.cpp index b00a3bd345..468ae96ca6 100644 --- a/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/HCIDriver.cpp +++ b/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/HCIDriver.cpp @@ -17,7 +17,7 @@ */ #include -#include "ble/common/ble/blecommon.h" +#include "ble/common/blecommon.h" #include "CordioHCIDriver.h" #include "CordioHCITransportDriver.h" #include "mbed.h"