ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BLE: Move GATT public header into ble/gatt 

Move private headers GattServerEvents.h, GapEvents,h and GapType.h in relevant part of the source tree.
pull/13475/head
Vincent Coubard 2020-08-21 21:27:22 +01:00
parent 27cb03824e
commit 13c358717f
25 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
connectivity/FEATURE_BLE/include/ble/GattClient.h
View File

@ -25,12 +25,12 @@
#include <algorithm> #include <algorithm>
#include "ble/common/blecommon.h" #include "ble/common/blecommon.h"
#include "ble/common/ble/GattAttribute.h" #include "ble/gatt/GattAttribute.h"
#include "ble/common/ble/ServiceDiscovery.h" #include "ble/gatt/ServiceDiscovery.h"
#include "ble/common/ble/CharacteristicDescriptorDiscovery.h" #include "ble/gatt/CharacteristicDescriptorDiscovery.h"
#include "ble/common/ble/GattCallbackParamTypes.h" #include "ble/gatt/GattCallbackParamTypes.h"
#include "ble/common/ble/DiscoveredService.h" #include "ble/gatt/DiscoveredService.h"
#include "ble/common/ble/DiscoveredCharacteristic.h" #include "ble/gatt/DiscoveredCharacteristic.h"
namespace ble { namespace ble {

7
connectivity/FEATURE_BLE/include/ble/GattServer.h
View File

@ -22,10 +22,9 @@
#include "ble/common/CallChainOfFunctionPointersWithContext.h" #include "ble/common/CallChainOfFunctionPointersWithContext.h"
#include "ble/common/ble/GattService.h" #include "ble/gatt/GattService.h"
#include "ble/common/ble/GattAttribute.h" #include "ble/gatt/GattAttribute.h"
#include "ble/common/ble/GattServerEvents.h" #include "ble/gatt/GattCallbackParamTypes.h"
#include "ble/common/ble/GattCallbackParamTypes.h"
#include "ble/common/blecommon.h" #include "ble/common/blecommon.h"
#include "ble/Gap.h" #include "ble/Gap.h"

0
connectivity/FEATURE_BLE/include/ble/common/ble/CharacteristicDescriptorDiscovery.h → connectivity/FEATURE_BLE/include/ble/gatt/CharacteristicDescriptorDiscovery.h
View File

8
connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredCharacteristic.h → connectivity/FEATURE_BLE/include/ble/gatt/DiscoveredCharacteristic.h
View File

@ -20,10 +20,10 @@
#define MBED_DISCOVERED_CHARACTERISTIC_H__ #define MBED_DISCOVERED_CHARACTERISTIC_H__
#include "ble/common/UUID.h" #include "ble/common/UUID.h"
#include "ble/common/ble/GattAttribute.h" #include "GattAttribute.h"
#include "ble/common/ble/GattCallbackParamTypes.h" #include "GattCallbackParamTypes.h"
#include "ble/common/ble/CharacteristicDescriptorDiscovery.h" #include "ble/gatt/CharacteristicDescriptorDiscovery.h"
#include "ble/common/ble/DiscoveredCharacteristicDescriptor.h" #include "DiscoveredCharacteristicDescriptor.h"
namespace ble { namespace ble {
class GattClient; class GattClient;

4
connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredCharacteristicDescriptor.h → connectivity/FEATURE_BLE/include/ble/gatt/DiscoveredCharacteristicDescriptor.h
View File

@ -21,8 +21,8 @@
#include "ble/common/UUID.h" #include "ble/common/UUID.h"
#include "ble/Gap.h" #include "ble/Gap.h"
#include "ble/common/ble/GattAttribute.h" #include "GattAttribute.h"
#include "ble/common/ble/CharacteristicDescriptorDiscovery.h" #include "ble/gatt/CharacteristicDescriptorDiscovery.h"
namespace ble { namespace ble {
class GattClient; class GattClient;

2
connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredService.h → connectivity/FEATURE_BLE/include/ble/gatt/DiscoveredService.h
View File

@ -20,7 +20,7 @@
#define MBED_DISCOVERED_SERVICE_H__ #define MBED_DISCOVERED_SERVICE_H__
#include "ble/common/UUID.h" #include "ble/common/UUID.h"
#include "ble/common/ble/GattAttribute.h" #include "GattAttribute.h"
/** /**
* @addtogroup ble * @addtogroup ble

0
connectivity/FEATURE_BLE/include/ble/common/ble/GattAttribute.h → connectivity/FEATURE_BLE/include/ble/gatt/GattAttribute.h
View File

0
connectivity/FEATURE_BLE/include/ble/common/ble/GattCallbackParamTypes.h → connectivity/FEATURE_BLE/include/ble/gatt/GattCallbackParamTypes.h
View File

4
connectivity/FEATURE_BLE/include/ble/common/ble/GattCharacteristic.h → connectivity/FEATURE_BLE/include/ble/gatt/GattCharacteristic.h
View File

@ -21,8 +21,8 @@
#include "ble/common/FunctionPointerWithContext.h" #include "ble/common/FunctionPointerWithContext.h"
#include "ble/common/ble/GattAttribute.h" #include "ble/gatt/GattAttribute.h"
#include "ble/common/ble/GattCallbackParamTypes.h" #include "ble/gatt/GattCallbackParamTypes.h"
/** /**
* @addtogroup ble * @addtogroup ble

2
connectivity/FEATURE_BLE/include/ble/common/ble/GattService.h → connectivity/FEATURE_BLE/include/ble/gatt/GattService.h
View File

@ -20,7 +20,7 @@
#define MBED_GATT_SERVICE_H__ #define MBED_GATT_SERVICE_H__
#include "ble/common/UUID.h" #include "ble/common/UUID.h"
#include "ble/common/ble/GattCharacteristic.h" #include "ble/gatt/GattCharacteristic.h"
/** /**
* @addtogroup ble * @addtogroup ble

2
connectivity/FEATURE_BLE/include/ble/common/ble/ServiceDiscovery.h → connectivity/FEATURE_BLE/include/ble/gatt/ServiceDiscovery.h
View File

@ -21,7 +21,7 @@
#include "ble/common/blecommon.h" #include "ble/common/blecommon.h"
#include "ble/common/UUID.h" #include "ble/common/UUID.h"
#include "ble/common/ble/GattAttribute.h" #include "ble/gatt/GattAttribute.h"
class DiscoveredService; class DiscoveredService;
class DiscoveredCharacteristic; class DiscoveredCharacteristic;

2
connectivity/FEATURE_BLE/source/DiscoveredCharacteristic.cpp
View File

@ -17,7 +17,7 @@
*/ */
#include "ble/BLE.h" #include "ble/BLE.h"
#include "ble/common/ble/DiscoveredCharacteristic.h" #include "ble/gatt/DiscoveredCharacteristic.h"
#include "ble/GattClient.h" #include "ble/GattClient.h"
ble_error_t ble_error_t

4
connectivity/FEATURE_BLE/source/generic/GapImpl.cpp
View File

@ -25,8 +25,8 @@
#include "ble/Gap.h" #include "ble/Gap.h"
#include "ble/SecurityManager.h" #include "ble/SecurityManager.h"
#include "source/pal/PalGap.h" #include "source/pal/PalGap.h"
#include "ble/common/ble/GapEvents.h" #include "source/pal/GapEvents.h"
#include "ble/common/ble/GapTypes.h" #include "source/pal/GapTypes.h"
#include "source/pal/PalGenericAccessService.h" #include "source/pal/PalGenericAccessService.h"
#include "source/pal/PalEventQueue.h" #include "source/pal/PalEventQueue.h"
#include "source/pal/PalGap.h" #include "source/pal/PalGap.h"

4
connectivity/FEATURE_BLE/source/generic/GapImpl.h
View File

@ -37,8 +37,8 @@
#include "ble/gap/Events.h" #include "ble/gap/Events.h"
#include "source/pal/PalGap.h" #include "source/pal/PalGap.h"
#include "ble/common/ble/GapEvents.h" #include "source/pal/GapEvents.h"
#include "ble/common/ble/GapTypes.h" #include "source/pal/GapTypes.h"
#include "source/pal/PalEventQueue.h" #include "source/pal/PalEventQueue.h"
#include "source/pal/PalConnectionMonitor.h" #include "source/pal/PalConnectionMonitor.h"
#include "source/pal/PalEventQueue.h" #include "source/pal/PalEventQueue.h"

4
connectivity/FEATURE_BLE/source/generic/GattClientImpl.cpp
View File

@ -25,8 +25,8 @@
#include "GattClientImpl.h" #include "GattClientImpl.h"
#include "source/pal/AttServerMessage.h" #include "source/pal/AttServerMessage.h"
#include "ble/common/ble/DiscoveredService.h" #include "ble/gatt/DiscoveredService.h"
#include "ble/common/ble/DiscoveredCharacteristic.h" #include "ble/gatt/DiscoveredCharacteristic.h"
#include "ble/common/blecommon.h" #include "ble/common/blecommon.h"
#include "source/BLEInstanceBase.h" #include "source/BLEInstanceBase.h"
#include "ble/SecurityManager.h" #include "ble/SecurityManager.h"

8
connectivity/FEATURE_BLE/source/generic/GattClientImpl.h
View File

@ -26,10 +26,10 @@
#include "ble/common/blecommon.h" #include "ble/common/blecommon.h"
#include "ble/common/ble/GattAttribute.h" #include "ble/gatt/GattAttribute.h"
#include "ble/common/ble/ServiceDiscovery.h" #include "ble/gatt/ServiceDiscovery.h"
#include "ble/common/ble/CharacteristicDescriptorDiscovery.h" #include "ble/gatt/CharacteristicDescriptorDiscovery.h"
#include "ble/common/ble/GattCallbackParamTypes.h" #include "ble/gatt/GattCallbackParamTypes.h"
#include "source/pal/PalGattClient.h" #include "source/pal/PalGattClient.h"
#include "source/pal/PalSigningMonitor.h" #include "source/pal/PalSigningMonitor.h"
#include "ble/GattClient.h" #include "ble/GattClient.h"

0
connectivity/FEATURE_BLE/include/ble/common/ble/GattServerEvents.h → connectivity/FEATURE_BLE/source/generic/GattServerEvents.h
View File

10
connectivity/FEATURE_BLE/source/generic/GattServerImpl.h
View File

@ -21,10 +21,10 @@
#include "ble/common/CallChainOfFunctionPointersWithContext.h" #include "ble/common/CallChainOfFunctionPointersWithContext.h"
#include "ble/common/ble/GattService.h" #include "ble/gatt/GattService.h"
#include "ble/common/ble/GattAttribute.h" #include "ble/gatt/GattAttribute.h"
#include "ble/common/ble/GattServerEvents.h" #include "GattServerEvents.h"
#include "ble/common/ble/GattCallbackParamTypes.h" #include "ble/gatt/GattCallbackParamTypes.h"
#include <stddef.h> #include <stddef.h>
#include <ble/GattServer.h> #include <ble/GattServer.h>
@ -34,7 +34,7 @@
#include "att_api.h" #include "att_api.h"
#include "SecurityManager.h" #include "SecurityManager.h"
#include "ble/common/ble/GattCallbackParamTypes.h" #include "ble/gatt/GattCallbackParamTypes.h"
#include "source/pal/PalSigningMonitor.h" #include "source/pal/PalSigningMonitor.h"
#include "source/BLEInstanceBase.h" #include "source/BLEInstanceBase.h"

1
connectivity/FEATURE_BLE/source/generic/SecurityDb.h
View File

@ -22,7 +22,6 @@
#include <stdlib.h> #include <stdlib.h>
#include "platform/Callback.h" #include "platform/Callback.h"
//#include "ble/common/ble/GapTypes.h"
#include "ble/common/BLETypes.h" #include "ble/common/BLETypes.h"
#include "ble/Gap.h" #include "ble/Gap.h"

2
connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.h
View File

@ -27,7 +27,7 @@
#include "ble/common/blecommon.h" #include "ble/common/blecommon.h"
#include "ble/Gap.h" #include "ble/Gap.h"
#include "ble/common/ble/GapTypes.h" #include "source/pal/GapTypes.h"
#include "ble/common/BLETypes.h" #include "ble/common/BLETypes.h"
#include "SecurityDb.h" #include "SecurityDb.h"
#include "source/pal/PalConnectionMonitor.h" #include "source/pal/PalConnectionMonitor.h"

2
connectivity/FEATURE_BLE/include/ble/common/ble/GapEvents.h → connectivity/FEATURE_BLE/source/pal/GapEvents.h
View File

@ -19,7 +19,7 @@
#ifndef BLE_PAL_GAP_MESSAGE_H_ #ifndef BLE_PAL_GAP_MESSAGE_H_
#define BLE_PAL_GAP_MESSAGE_H_ #define BLE_PAL_GAP_MESSAGE_H_
#include "ble/common/ble/GapTypes.h" #include "GapTypes.h"
#include "ble/common/BLETypes.h" #include "ble/common/BLETypes.h"
namespace ble { namespace ble {

0
connectivity/FEATURE_BLE/include/ble/common/ble/GapTypes.h → connectivity/FEATURE_BLE/source/pal/GapTypes.h
View File

4
connectivity/FEATURE_BLE/source/pal/PalGap.h
View File

@ -21,8 +21,8 @@
#include "platform/Callback.h" #include "platform/Callback.h"
#include "ble/common/ble/GapTypes.h" #include "GapTypes.h"
#include "ble/common/ble/GapEvents.h" #include "GapEvents.h"
#include "ble/common/blecommon.h" #include "ble/common/blecommon.h"
#include "dm_api.h" #include "dm_api.h"

2
connectivity/FEATURE_BLE/source/pal/PalGenericAccessService.h
View File

@ -19,7 +19,7 @@
#ifndef BLE_PAL_GENERIC_ACCESS_SERVICE_H_ #ifndef BLE_PAL_GENERIC_ACCESS_SERVICE_H_
#define BLE_PAL_GENERIC_ACCESS_SERVICE_H_ #define BLE_PAL_GENERIC_ACCESS_SERVICE_H_
#include "ble/common/ble/GapTypes.h" #include "GapTypes.h"
#include "ble/common/BLETypes.h" #include "ble/common/BLETypes.h"
#include "ble/common/blecommon.h" #include "ble/common/blecommon.h"
#include "ble/Gap.h" #include "ble/Gap.h"

2
connectivity/FEATURE_BLE/source/pal/PalSecurityManager.h
View File

@ -23,7 +23,7 @@
#include "platform/NonCopyable.h" #include "platform/NonCopyable.h"
#include "ble/common/BLETypes.h" #include "ble/common/BLETypes.h"
#include "ble/common/ble/GapTypes.h" #include "GapTypes.h"
#include "wsf_types.h" #include "wsf_types.h"
#include "wsf_os.h" #include "wsf_os.h"