From d3427ca49584ffcb5a25b6d69c0774bc77399877 Mon Sep 17 00:00:00 2001 From: Vincent Coubard Date: Fri, 21 Aug 2020 17:52:35 +0100 Subject: [PATCH] BLE: Move gap public header at the root. --- connectivity/FEATURE_BLE/include/ble/Gap.h | 18 +++++++++--------- .../include/ble/common/ble/BLETypes.h | 2 +- .../ble => }/gap/AdvertisingDataBuilder.h | 4 ++-- .../ble => }/gap/AdvertisingDataParser.h | 2 +- .../gap/AdvertisingDataSimpleBuilder.h | 2 +- .../ble => }/gap/AdvertisingDataTypes.h | 0 .../ble => }/gap/AdvertisingParameters.h | 0 .../ble => }/gap/ConnectionParameters.h | 0 .../include/ble/{common/ble => }/gap/Events.h | 0 .../include/ble/{common/ble => }/gap/Gap.h | 0 .../ble/{common/ble => }/gap/ScanParameters.h | 0 .../include/ble/{common/ble => }/gap/Types.h | 0 .../FEATURE_BLE/source/generic/GapImpl.h | 12 ++++++------ 13 files changed, 20 insertions(+), 20 deletions(-) rename connectivity/FEATURE_BLE/include/ble/{common/ble => }/gap/AdvertisingDataBuilder.h (99%) rename connectivity/FEATURE_BLE/include/ble/{common/ble => }/gap/AdvertisingDataParser.h (98%) rename connectivity/FEATURE_BLE/include/ble/{common/ble => }/gap/AdvertisingDataSimpleBuilder.h (99%) rename connectivity/FEATURE_BLE/include/ble/{common/ble => }/gap/AdvertisingDataTypes.h (100%) rename connectivity/FEATURE_BLE/include/ble/{common/ble => }/gap/AdvertisingParameters.h (100%) rename connectivity/FEATURE_BLE/include/ble/{common/ble => }/gap/ConnectionParameters.h (100%) rename connectivity/FEATURE_BLE/include/ble/{common/ble => }/gap/Events.h (100%) rename connectivity/FEATURE_BLE/include/ble/{common/ble => }/gap/Gap.h (100%) rename connectivity/FEATURE_BLE/include/ble/{common/ble => }/gap/ScanParameters.h (100%) rename connectivity/FEATURE_BLE/include/ble/{common/ble => }/gap/Types.h (100%) diff --git a/connectivity/FEATURE_BLE/include/ble/Gap.h b/connectivity/FEATURE_BLE/include/ble/Gap.h index 239bf87cc9..8273be219f 100644 --- a/connectivity/FEATURE_BLE/include/ble/Gap.h +++ b/connectivity/FEATURE_BLE/include/ble/Gap.h @@ -29,15 +29,15 @@ #include "ble/common/ble/BLERoles.h" #include "ble/common/ble/BLETypes.h" -#include "ble/common/ble/gap/AdvertisingDataBuilder.h" -#include "ble/common/ble/gap/AdvertisingDataParser.h" -#include "ble/common/ble/gap/AdvertisingDataSimpleBuilder.h" -#include "ble/common/ble/gap/AdvertisingDataTypes.h" -#include "ble/common/ble/gap/AdvertisingParameters.h" -#include "ble/common/ble/gap/ConnectionParameters.h" -#include "ble/common/ble/gap/Events.h" -#include "ble/common/ble/gap/ScanParameters.h" -#include "ble/common/ble/gap/Types.h" +#include "ble/gap/AdvertisingDataBuilder.h" +#include "ble/gap/AdvertisingDataParser.h" +#include "ble/gap/AdvertisingDataSimpleBuilder.h" +#include "ble/gap/AdvertisingDataTypes.h" +#include "ble/gap/AdvertisingParameters.h" +#include "ble/gap/ConnectionParameters.h" +#include "ble/gap/Events.h" +#include "ble/gap/ScanParameters.h" +#include "ble/gap/Types.h" namespace ble { class PalGenericAccessService; diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/BLETypes.h b/connectivity/FEATURE_BLE/include/ble/common/ble/BLETypes.h index 87105725d2..75b602669b 100644 --- a/connectivity/FEATURE_BLE/include/ble/common/ble/BLETypes.h +++ b/connectivity/FEATURE_BLE/include/ble/common/ble/BLETypes.h @@ -25,7 +25,7 @@ #include "SafeEnum.h" #include "platform/Span.h" -#include "ble/common/ble/gap/Types.h" +#include "ble/gap/Types.h" /** * @addtogroup ble diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataBuilder.h b/connectivity/FEATURE_BLE/include/ble/gap/AdvertisingDataBuilder.h similarity index 99% rename from connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataBuilder.h rename to connectivity/FEATURE_BLE/include/ble/gap/AdvertisingDataBuilder.h index 4e2f91ba89..92ae3d6711 100644 --- a/connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataBuilder.h +++ b/connectivity/FEATURE_BLE/include/ble/gap/AdvertisingDataBuilder.h @@ -27,8 +27,8 @@ #include "ble/common/ble/UUID.h" #include "ble/common/ble/BLETypes.h" #include "ble/common/ble/blecommon.h" -#include "ble/common/ble/gap/AdvertisingDataTypes.h" -#include "ble/common/ble/gap/Types.h" +#include "ble/gap/AdvertisingDataTypes.h" +#include "ble/gap/Types.h" namespace ble { diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataParser.h b/connectivity/FEATURE_BLE/include/ble/gap/AdvertisingDataParser.h similarity index 98% rename from connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataParser.h rename to connectivity/FEATURE_BLE/include/ble/gap/AdvertisingDataParser.h index 9e61629c54..a3e0906055 100644 --- a/connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataParser.h +++ b/connectivity/FEATURE_BLE/include/ble/gap/AdvertisingDataParser.h @@ -22,7 +22,7 @@ #include #include "platform/Span.h" -#include "ble/common/ble/gap/AdvertisingDataTypes.h" +#include "ble/gap/AdvertisingDataTypes.h" namespace ble { diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataSimpleBuilder.h b/connectivity/FEATURE_BLE/include/ble/gap/AdvertisingDataSimpleBuilder.h similarity index 99% rename from connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataSimpleBuilder.h rename to connectivity/FEATURE_BLE/include/ble/gap/AdvertisingDataSimpleBuilder.h index bc7c69d09b..6ab7cf536c 100644 --- a/connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataSimpleBuilder.h +++ b/connectivity/FEATURE_BLE/include/ble/gap/AdvertisingDataSimpleBuilder.h @@ -22,7 +22,7 @@ #include "platform/Span.h" #include "ble/common/ble/UUID.h" -#include "ble/common/ble/gap/AdvertisingDataBuilder.h" +#include "ble/gap/AdvertisingDataBuilder.h" namespace ble { diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataTypes.h b/connectivity/FEATURE_BLE/include/ble/gap/AdvertisingDataTypes.h similarity index 100% rename from connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataTypes.h rename to connectivity/FEATURE_BLE/include/ble/gap/AdvertisingDataTypes.h diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingParameters.h b/connectivity/FEATURE_BLE/include/ble/gap/AdvertisingParameters.h similarity index 100% rename from connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingParameters.h rename to connectivity/FEATURE_BLE/include/ble/gap/AdvertisingParameters.h diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/gap/ConnectionParameters.h b/connectivity/FEATURE_BLE/include/ble/gap/ConnectionParameters.h similarity index 100% rename from connectivity/FEATURE_BLE/include/ble/common/ble/gap/ConnectionParameters.h rename to connectivity/FEATURE_BLE/include/ble/gap/ConnectionParameters.h diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/gap/Events.h b/connectivity/FEATURE_BLE/include/ble/gap/Events.h similarity index 100% rename from connectivity/FEATURE_BLE/include/ble/common/ble/gap/Events.h rename to connectivity/FEATURE_BLE/include/ble/gap/Events.h diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/gap/Gap.h b/connectivity/FEATURE_BLE/include/ble/gap/Gap.h similarity index 100% rename from connectivity/FEATURE_BLE/include/ble/common/ble/gap/Gap.h rename to connectivity/FEATURE_BLE/include/ble/gap/Gap.h diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/gap/ScanParameters.h b/connectivity/FEATURE_BLE/include/ble/gap/ScanParameters.h similarity index 100% rename from connectivity/FEATURE_BLE/include/ble/common/ble/gap/ScanParameters.h rename to connectivity/FEATURE_BLE/include/ble/gap/ScanParameters.h diff --git a/connectivity/FEATURE_BLE/include/ble/common/ble/gap/Types.h b/connectivity/FEATURE_BLE/include/ble/gap/Types.h similarity index 100% rename from connectivity/FEATURE_BLE/include/ble/common/ble/gap/Types.h rename to connectivity/FEATURE_BLE/include/ble/gap/Types.h diff --git a/connectivity/FEATURE_BLE/source/generic/GapImpl.h b/connectivity/FEATURE_BLE/source/generic/GapImpl.h index 7565dc75a2..4d98ea7fce 100644 --- a/connectivity/FEATURE_BLE/source/generic/GapImpl.h +++ b/connectivity/FEATURE_BLE/source/generic/GapImpl.h @@ -29,12 +29,12 @@ #include "ble/common/ble/BLERoles.h" #include "ble/common/ble/BLETypes.h" -#include "ble/common/ble/gap/AdvertisingDataBuilder.h" -#include "ble/common/ble/gap/AdvertisingDataSimpleBuilder.h" -#include "ble/common/ble/gap/ConnectionParameters.h" -#include "ble/common/ble/gap/ScanParameters.h" -#include "ble/common/ble/gap/AdvertisingParameters.h" -#include "ble/common/ble/gap/Events.h" +#include "ble/gap/AdvertisingDataBuilder.h" +#include "ble/gap/AdvertisingDataSimpleBuilder.h" +#include "ble/gap/ConnectionParameters.h" +#include "ble/gap/ScanParameters.h" +#include "ble/gap/AdvertisingParameters.h" +#include "ble/gap/Events.h" #include "source/pal/PalGap.h" #include "ble/common/ble/GapEvents.h"