Skip to content

Commit ec4cbb7

Browse files
make include path backwards compatible
1 parent dbc006b commit ec4cbb7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+132
-132
lines changed

connectivity/FEATURE_BLE/include/ble/BLE.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
#include "platform/mbed_assert.h"
2525
#include "platform/mbed_toolchain.h"
2626

27-
#include "ble/types/BLERoles.h"
28-
#include "ble/types/BLETypes.h"
29-
#include "ble/types/blecommon.h"
27+
#include "ble/common/ble/BLERoles.h"
28+
#include "ble/common/ble/BLETypes.h"
29+
#include "ble/common/ble/blecommon.h"
3030

3131
#include "ble/Gap.h"
3232
#include "ble/GattClient.h"

connectivity/FEATURE_BLE/include/ble/Gap.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@
2727
#include "drivers/LowPowerTicker.h"
2828
#include "platform/mbed_error.h"
2929

30-
#include "ble/types/BLERoles.h"
31-
#include "ble/types/BLETypes.h"
32-
#include "ble/types/gap/AdvertisingDataBuilder.h"
33-
#include "ble/types/gap/AdvertisingDataParser.h"
34-
#include "ble/types/gap/AdvertisingDataSimpleBuilder.h"
35-
#include "ble/types/gap/AdvertisingDataTypes.h"
36-
#include "ble/types/gap/AdvertisingParameters.h"
37-
#include "ble/types/gap/ConnectionParameters.h"
38-
#include "ble/types/gap/Events.h"
39-
#include "ble/types/gap/ScanParameters.h"
40-
#include "ble/types/gap/Types.h"
30+
#include "ble/common/ble/BLERoles.h"
31+
#include "ble/common/ble/BLETypes.h"
32+
#include "ble/common/ble/gap/AdvertisingDataBuilder.h"
33+
#include "ble/common/ble/gap/AdvertisingDataParser.h"
34+
#include "ble/common/ble/gap/AdvertisingDataSimpleBuilder.h"
35+
#include "ble/common/ble/gap/AdvertisingDataTypes.h"
36+
#include "ble/common/ble/gap/AdvertisingParameters.h"
37+
#include "ble/common/ble/gap/ConnectionParameters.h"
38+
#include "ble/common/ble/gap/Events.h"
39+
#include "ble/common/ble/gap/ScanParameters.h"
40+
#include "ble/common/ble/gap/Types.h"
4141

4242
namespace ble {
4343
class PalGenericAccessService;

connectivity/FEATURE_BLE/include/ble/GattClient.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
#include "CallChainOfFunctionPointersWithContext.h"
2525
#include <algorithm>
2626

27-
#include "ble/types/blecommon.h"
28-
#include "ble/types/GattAttribute.h"
29-
#include "ble/types/ServiceDiscovery.h"
30-
#include "ble/types/CharacteristicDescriptorDiscovery.h"
31-
#include "ble/types/GattCallbackParamTypes.h"
32-
#include "ble/types/DiscoveredService.h"
33-
#include "ble/types/DiscoveredCharacteristic.h"
27+
#include "ble/common/ble/blecommon.h"
28+
#include "ble/common/ble/GattAttribute.h"
29+
#include "ble/common/ble/ServiceDiscovery.h"
30+
#include "ble/common/ble/CharacteristicDescriptorDiscovery.h"
31+
#include "ble/common/ble/GattCallbackParamTypes.h"
32+
#include "ble/common/ble/DiscoveredService.h"
33+
#include "ble/common/ble/DiscoveredCharacteristic.h"
3434

3535
namespace ble {
3636

connectivity/FEATURE_BLE/include/ble/GattServer.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222

2323
#include "CallChainOfFunctionPointersWithContext.h"
2424

25-
#include "ble/types/GattService.h"
26-
#include "ble/types/GattAttribute.h"
27-
#include "ble/types/GattServerEvents.h"
28-
#include "ble/types/GattCallbackParamTypes.h"
25+
#include "ble/common/ble/GattService.h"
26+
#include "ble/common/ble/GattAttribute.h"
27+
#include "ble/common/ble/GattServerEvents.h"
28+
#include "ble/common/ble/GattCallbackParamTypes.h"
2929

30-
#include "ble/types/blecommon.h"
30+
#include "ble/common/ble/blecommon.h"
3131
#include "ble/Gap.h"
3232
#include "SecurityManager.h"
3333

connectivity/FEATURE_BLE/include/ble/SecurityManager.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
#include "CallChainOfFunctionPointersWithContext.h"
2424
#include "platform/Callback.h"
2525

26-
#include "ble/types/BLETypes.h"
27-
#include "ble/types/blecommon.h"
26+
#include "ble/common/ble/BLETypes.h"
27+
#include "ble/common/ble/blecommon.h"
2828

29-
#include "ble/types/BLETypes.h"
29+
#include "ble/common/ble/BLETypes.h"
3030
#include "ble/internal/SecurityDb.h"
3131
#include "ble/internal/PalConnectionMonitor.h"
3232
#include "ble/internal/PalSecurityManager.h"

connectivity/FEATURE_BLE/include/ble/types/BLETypes.h renamed to connectivity/FEATURE_BLE/include/ble/common/ble/BLETypes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "SafeEnum.h"
2626
#include "platform/Span.h"
2727

28-
#include "ble/types/gap/Types.h"
28+
#include "ble/common/ble/gap/Types.h"
2929

3030
/**
3131
* @addtogroup ble

connectivity/FEATURE_BLE/include/ble/types/DiscoveredCharacteristic.h renamed to connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredCharacteristic.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
#ifndef MBED_DISCOVERED_CHARACTERISTIC_H__
2020
#define MBED_DISCOVERED_CHARACTERISTIC_H__
2121

22-
#include "ble/types/UUID.h"
23-
#include "ble/types/GattAttribute.h"
24-
#include "ble/types/GattCallbackParamTypes.h"
25-
#include "ble/types/CharacteristicDescriptorDiscovery.h"
26-
#include "ble/types/DiscoveredCharacteristicDescriptor.h"
22+
#include "ble/common/ble/UUID.h"
23+
#include "ble/common/ble/GattAttribute.h"
24+
#include "ble/common/ble/GattCallbackParamTypes.h"
25+
#include "ble/common/ble/CharacteristicDescriptorDiscovery.h"
26+
#include "ble/common/ble/DiscoveredCharacteristicDescriptor.h"
2727

2828
namespace ble {
2929
class GattClient;

connectivity/FEATURE_BLE/include/ble/types/DiscoveredCharacteristicDescriptor.h renamed to connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredCharacteristicDescriptor.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
#ifndef MBED_DISCOVERED_CHARACTERISTIC_DESCRIPTOR_H__
2020
#define MBED_DISCOVERED_CHARACTERISTIC_DESCRIPTOR_H__
2121

22-
#include "ble/types/UUID.h"
22+
#include "ble/common/ble/UUID.h"
2323
#include "ble/Gap.h"
24-
#include "ble/types/GattAttribute.h"
25-
#include "ble/types/CharacteristicDescriptorDiscovery.h"
24+
#include "ble/common/ble/GattAttribute.h"
25+
#include "ble/common/ble/CharacteristicDescriptorDiscovery.h"
2626

2727
namespace ble {
2828
class GattClient;

connectivity/FEATURE_BLE/include/ble/types/DiscoveredService.h renamed to connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredService.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#ifndef MBED_DISCOVERED_SERVICE_H__
2020
#define MBED_DISCOVERED_SERVICE_H__
2121

22-
#include "ble/types/UUID.h"
23-
#include "ble/types/GattAttribute.h"
22+
#include "ble/common/ble/UUID.h"
23+
#include "ble/common/ble/GattAttribute.h"
2424

2525
/**
2626
* @addtogroup ble

connectivity/FEATURE_BLE/include/ble/internal/GapEvents.h renamed to connectivity/FEATURE_BLE/include/ble/common/ble/GapEvents.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#ifndef BLE_PAL_GAP_MESSAGE_H_
2020
#define BLE_PAL_GAP_MESSAGE_H_
2121

22-
#include "ble/internal/GapTypes.h"
23-
#include "ble/types/BLETypes.h"
22+
#include "ble/common/ble/GapTypes.h"
23+
#include "ble/common/ble/BLETypes.h"
2424

2525
namespace ble {
2626

connectivity/FEATURE_BLE/include/ble/internal/GapTypes.h renamed to connectivity/FEATURE_BLE/include/ble/common/ble/GapTypes.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
#include <algorithm>
2323

24-
#include "ble/types/BLETypes.h"
25-
#include "ble/types/SafeEnum.h"
24+
#include "ble/common/ble/BLETypes.h"
25+
#include "ble/common/ble/SafeEnum.h"
2626

2727
namespace ble {
2828

connectivity/FEATURE_BLE/include/ble/types/GattAttribute.h renamed to connectivity/FEATURE_BLE/include/ble/common/ble/GattAttribute.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#ifndef MBED_GATT_ATTRIBUTE_H__
2020
#define MBED_GATT_ATTRIBUTE_H__
2121

22-
#include "ble/types/UUID.h"
23-
#include "ble/types/BLETypes.h"
22+
#include "ble/common/ble/UUID.h"
23+
#include "ble/common/ble/BLETypes.h"
2424

2525
/**
2626
* @addtogroup ble

connectivity/FEATURE_BLE/include/ble/types/GattCharacteristic.h renamed to connectivity/FEATURE_BLE/include/ble/common/ble/GattCharacteristic.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
#include "FunctionPointerWithContext.h"
2323

24-
#include "ble/types/GattAttribute.h"
25-
#include "ble/types/GattCallbackParamTypes.h"
24+
#include "ble/common/ble/GattAttribute.h"
25+
#include "ble/common/ble/GattCallbackParamTypes.h"
2626

2727
/**
2828
* @addtogroup ble

connectivity/FEATURE_BLE/include/ble/types/GattService.h renamed to connectivity/FEATURE_BLE/include/ble/common/ble/GattService.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#ifndef MBED_GATT_SERVICE_H__
2020
#define MBED_GATT_SERVICE_H__
2121

22-
#include "ble/types/UUID.h"
23-
#include "ble/types/GattCharacteristic.h"
22+
#include "ble/common/ble/UUID.h"
23+
#include "ble/common/ble/GattCharacteristic.h"
2424

2525
/**
2626
* @addtogroup ble

connectivity/FEATURE_BLE/include/ble/types/ServiceDiscovery.h renamed to connectivity/FEATURE_BLE/include/ble/common/ble/ServiceDiscovery.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
#ifndef MBED_BLE_SERVICE_DISOVERY_H__
2020
#define MBED_BLE_SERVICE_DISOVERY_H__
2121

22-
#include "ble/types/blecommon.h"
23-
#include "ble/types/UUID.h"
24-
#include "ble/types/GattAttribute.h"
22+
#include "ble/common/ble/blecommon.h"
23+
#include "ble/common/ble/UUID.h"
24+
#include "ble/common/ble/GattAttribute.h"
2525

2626
class DiscoveredService;
2727
class DiscoveredCharacteristic;

connectivity/FEATURE_BLE/include/ble/types/UUID.h renamed to connectivity/FEATURE_BLE/include/ble/common/ble/UUID.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <string.h>
2525
#include <algorithm>
2626

27-
#include "ble/types/blecommon.h"
27+
#include "ble/common/ble/blecommon.h"
2828

2929
/**
3030
* @file

connectivity/FEATURE_BLE/include/ble/types/gap/AdvertisingDataBuilder.h renamed to connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataBuilder.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
#include <stdlib.h>
2525
#include "platform/NonCopyable.h"
2626

27-
#include "ble/types/UUID.h"
28-
#include "ble/types/BLETypes.h"
29-
#include "ble/types/blecommon.h"
30-
#include "ble/types/gap/AdvertisingDataTypes.h"
31-
#include "ble/types/gap/Types.h"
27+
#include "ble/common/ble/UUID.h"
28+
#include "ble/common/ble/BLETypes.h"
29+
#include "ble/common/ble/blecommon.h"
30+
#include "ble/common/ble/gap/AdvertisingDataTypes.h"
31+
#include "ble/common/ble/gap/Types.h"
3232

3333
namespace ble {
3434

connectivity/FEATURE_BLE/include/ble/types/gap/AdvertisingDataParser.h renamed to connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataParser.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <stdint.h>
2323
#include "platform/Span.h"
2424

25-
#include "ble/types/gap/AdvertisingDataTypes.h"
25+
#include "ble/common/ble/gap/AdvertisingDataTypes.h"
2626

2727
namespace ble {
2828

@@ -73,7 +73,7 @@ class AdvertisingDataParser {
7373
if (position >= data.size()) {
7474
return false;
7575
}
76-
76+
7777
/* early termination of packet, no more meaningful octets */
7878
if (current_length() == 0) {
7979
return false;

connectivity/FEATURE_BLE/include/ble/types/gap/AdvertisingDataSimpleBuilder.h renamed to connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataSimpleBuilder.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
#include "platform/Span.h"
2323

24-
#include "ble/types/UUID.h"
25-
#include "ble/types/gap/AdvertisingDataBuilder.h"
24+
#include "ble/common/ble/UUID.h"
25+
#include "ble/common/ble/gap/AdvertisingDataBuilder.h"
2626

2727
namespace ble {
2828

connectivity/FEATURE_BLE/include/ble/types/gap/AdvertisingDataTypes.h renamed to connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataTypes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#ifndef BLE_GAP_ADVERTISINGDATATYPES_H
2020
#define BLE_GAP_ADVERTISINGDATATYPES_H
2121

22-
#include "ble/types/SafeEnum.h"
22+
#include "ble/common/ble/SafeEnum.h"
2323

2424
namespace ble {
2525

connectivity/FEATURE_BLE/include/ble/types/gap/AdvertisingParameters.h renamed to connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingParameters.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121

2222
#include <algorithm>
2323

24-
#include "ble/types/BLETypes.h"
25-
#include "ble/types/blecommon.h"
26-
#include "ble/types/SafeEnum.h"
24+
#include "ble/common/ble/BLETypes.h"
25+
#include "ble/common/ble/blecommon.h"
26+
#include "ble/common/ble/SafeEnum.h"
2727

2828
namespace ble {
2929

connectivity/FEATURE_BLE/include/ble/types/gap/ConnectionParameters.h renamed to connectivity/FEATURE_BLE/include/ble/common/ble/gap/ConnectionParameters.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include "mbed_assert.h"
2323

24-
#include "ble/types/BLETypes.h"
24+
#include "ble/common/ble/BLETypes.h"
2525

2626
namespace ble {
2727

connectivity/FEATURE_BLE/include/ble/types/gap/Events.h renamed to connectivity/FEATURE_BLE/include/ble/common/ble/gap/Events.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#ifndef BLE_GAP_EVENTS_H
2020
#define BLE_GAP_EVENTS_H
2121

22-
#include "ble/types/blecommon.h"
23-
#include "ble/types/BLETypes.h"
22+
#include "ble/common/ble/blecommon.h"
23+
#include "ble/common/ble/BLETypes.h"
2424

2525
namespace ble {
2626

connectivity/FEATURE_BLE/include/ble/types/gap/ScanParameters.h renamed to connectivity/FEATURE_BLE/include/ble/common/ble/gap/ScanParameters.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
#include <stdint.h>
2323

24-
#include "ble/types/blecommon.h"
25-
#include "ble/types/BLETypes.h"
24+
#include "ble/common/ble/blecommon.h"
25+
#include "ble/common/ble/BLETypes.h"
2626

2727
namespace ble {
2828

connectivity/FEATURE_BLE/include/ble/types/gap/Types.h renamed to connectivity/FEATURE_BLE/include/ble/common/ble/gap/Types.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
#ifndef BLE_GAP_TYPES_H
2020
#define BLE_GAP_TYPES_H
2121

22-
#include "ble/types/Duration.h"
23-
#include "ble/types/Bounded.h"
24-
#include "ble/types/SafeEnum.h"
22+
#include "ble/common/ble/Duration.h"
23+
#include "ble/common/ble/Bounded.h"
24+
#include "ble/common/ble/SafeEnum.h"
2525

2626
namespace ble {
2727

connectivity/FEATURE_BLE/include/ble/internal/AttServerMessage.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
#ifndef BLE_PAL_ATT_SERVER_MESSAGE_H_
2020
#define BLE_PAL_ATT_SERVER_MESSAGE_H_
2121

22-
#include "ble/types/BLETypes.h"
23-
#include "ble/types/UUID.h"
22+
#include "ble/common/ble/BLETypes.h"
23+
#include "ble/common/ble/UUID.h"
2424

2525
namespace ble {
2626

connectivity/FEATURE_BLE/include/ble/internal/PalAttClient.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121

2222
#include "platform/Callback.h"
2323

24-
#include "ble/types/UUID.h"
25-
#include "ble/types/BLETypes.h"
26-
#include "ble/types/blecommon.h"
24+
#include "ble/common/ble/UUID.h"
25+
#include "ble/common/ble/BLETypes.h"
26+
#include "ble/common/ble/blecommon.h"
2727
#include "ble/internal/AttServerMessage.h"
2828

2929
namespace ble {

connectivity/FEATURE_BLE/include/ble/internal/PalConnectionMonitor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#define MBED_BLE_CONNECTION_EVENT_MONITOR
2121

2222
#include "ble/Gap.h"
23-
#include "ble/types/BLETypes.h"
23+
#include "ble/common/ble/BLETypes.h"
2424

2525
namespace ble {
2626

connectivity/FEATURE_BLE/include/ble/internal/PalGap.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121

2222
#include "platform/Callback.h"
2323

24-
#include "ble/internal/GapTypes.h"
25-
#include "ble/internal/GapEvents.h"
26-
#include "ble/types/blecommon.h"
24+
#include "ble/common/ble/GapTypes.h"
25+
#include "ble/common/ble/GapEvents.h"
26+
#include "ble/common/ble/blecommon.h"
2727

2828
#include "dm_api.h"
2929

connectivity/FEATURE_BLE/include/ble/internal/PalGattClient.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121

2222
#include "platform/Callback.h"
2323

24-
#include "ble/types/UUID.h"
25-
#include "ble/types/BLETypes.h"
26-
#include "ble/types/blecommon.h"
24+
#include "ble/common/ble/UUID.h"
25+
#include "ble/common/ble/BLETypes.h"
26+
#include "ble/common/ble/blecommon.h"
2727
#include "ble/internal/AttServerMessage.h"
2828

2929
namespace ble {

0 commit comments

Comments
 (0)