BLE: Move GATT public header into ble/gatt

pan- · pan- · commit 13c358717fe0 · 2020-08-25T11:26:26.000+01:00
Move private headers GattServerEvents.h, GapEvents,h and GapType.h in relevant part of the source tree.
diff --git a/connectivity/FEATURE_BLE/include/ble/GattClient.h b/connectivity/FEATURE_BLE/include/ble/GattClient.h
@@ -25,12 +25,12 @@
 #include <algorithm>
 
 #include "ble/common/blecommon.h"
-#include "ble/common/ble/GattAttribute.h"
-#include "ble/common/ble/ServiceDiscovery.h"
-#include "ble/common/ble/CharacteristicDescriptorDiscovery.h"
-#include "ble/common/ble/GattCallbackParamTypes.h"
-#include "ble/common/ble/DiscoveredService.h"
-#include "ble/common/ble/DiscoveredCharacteristic.h"
+#include "ble/gatt/GattAttribute.h"
+#include "ble/gatt/ServiceDiscovery.h"
+#include "ble/gatt/CharacteristicDescriptorDiscovery.h"
+#include "ble/gatt/GattCallbackParamTypes.h"
+#include "ble/gatt/DiscoveredService.h"
+#include "ble/gatt/DiscoveredCharacteristic.h"
 
 namespace ble {
 
diff --git a/connectivity/FEATURE_BLE/include/ble/GattServer.h b/connectivity/FEATURE_BLE/include/ble/GattServer.h
@@ -22,10 +22,9 @@
 
 #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/gatt/GattService.h"
+#include "ble/gatt/GattAttribute.h"
+#include "ble/gatt/GattCallbackParamTypes.h"
 
 #include "ble/common/blecommon.h"
 #include "ble/Gap.h"
diff --git a/connectivity/FEATURE_BLE/include/ble/gatt/CharacteristicDescriptorDiscovery.h b/connectivity/FEATURE_BLE/include/ble/gatt/CharacteristicDescriptorDiscovery.h
diff --git a/connectivity/FEATURE_BLE/include/ble/gatt/DiscoveredCharacteristic.h b/connectivity/FEATURE_BLE/include/ble/gatt/DiscoveredCharacteristic.h
@@ -20,10 +20,10 @@
 #define MBED_DISCOVERED_CHARACTERISTIC_H__
 
 #include "ble/common/UUID.h"
-#include "ble/common/ble/GattAttribute.h"
-#include "ble/common/ble/GattCallbackParamTypes.h"
-#include "ble/common/ble/CharacteristicDescriptorDiscovery.h"
-#include "ble/common/ble/DiscoveredCharacteristicDescriptor.h"
+#include "GattAttribute.h"
+#include "GattCallbackParamTypes.h"
+#include "ble/gatt/CharacteristicDescriptorDiscovery.h"
+#include "DiscoveredCharacteristicDescriptor.h"
 
 namespace ble {
 class GattClient;
diff --git a/connectivity/FEATURE_BLE/include/ble/gatt/DiscoveredCharacteristicDescriptor.h b/connectivity/FEATURE_BLE/include/ble/gatt/DiscoveredCharacteristicDescriptor.h
@@ -21,8 +21,8 @@
 
 #include "ble/common/UUID.h"
 #include "ble/Gap.h"
-#include "ble/common/ble/GattAttribute.h"
-#include "ble/common/ble/CharacteristicDescriptorDiscovery.h"
+#include "GattAttribute.h"
+#include "ble/gatt/CharacteristicDescriptorDiscovery.h"
 
 namespace ble {
 class GattClient;
diff --git a/connectivity/FEATURE_BLE/include/ble/gatt/DiscoveredService.h b/connectivity/FEATURE_BLE/include/ble/gatt/DiscoveredService.h
@@ -20,7 +20,7 @@
 #define MBED_DISCOVERED_SERVICE_H__
 
 #include "ble/common/UUID.h"
-#include "ble/common/ble/GattAttribute.h"
+#include "GattAttribute.h"
 
 /**
  * @addtogroup ble
diff --git a/connectivity/FEATURE_BLE/include/ble/gatt/GattAttribute.h b/connectivity/FEATURE_BLE/include/ble/gatt/GattAttribute.h
diff --git a/connectivity/FEATURE_BLE/include/ble/gatt/GattCallbackParamTypes.h b/connectivity/FEATURE_BLE/include/ble/gatt/GattCallbackParamTypes.h
diff --git a/connectivity/FEATURE_BLE/include/ble/gatt/GattCharacteristic.h b/connectivity/FEATURE_BLE/include/ble/gatt/GattCharacteristic.h
@@ -21,8 +21,8 @@
 
 #include "ble/common/FunctionPointerWithContext.h"
 
-#include "ble/common/ble/GattAttribute.h"
-#include "ble/common/ble/GattCallbackParamTypes.h"
+#include "ble/gatt/GattAttribute.h"
+#include "ble/gatt/GattCallbackParamTypes.h"
 
 /**
  * @addtogroup ble
diff --git a/connectivity/FEATURE_BLE/include/ble/gatt/GattService.h b/connectivity/FEATURE_BLE/include/ble/gatt/GattService.h
@@ -20,7 +20,7 @@
 #define MBED_GATT_SERVICE_H__
 
 #include "ble/common/UUID.h"
-#include "ble/common/ble/GattCharacteristic.h"
+#include "ble/gatt/GattCharacteristic.h"
 
 /**
  * @addtogroup ble
diff --git a/connectivity/FEATURE_BLE/include/ble/gatt/ServiceDiscovery.h b/connectivity/FEATURE_BLE/include/ble/gatt/ServiceDiscovery.h
@@ -21,7 +21,7 @@
 
 #include "ble/common/blecommon.h"
 #include "ble/common/UUID.h"
-#include "ble/common/ble/GattAttribute.h"
+#include "ble/gatt/GattAttribute.h"
 
 class DiscoveredService;
 class DiscoveredCharacteristic;
diff --git a/connectivity/FEATURE_BLE/source/DiscoveredCharacteristic.cpp b/connectivity/FEATURE_BLE/source/DiscoveredCharacteristic.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "ble/BLE.h"
-#include "ble/common/ble/DiscoveredCharacteristic.h"
+#include "ble/gatt/DiscoveredCharacteristic.h"
 #include "ble/GattClient.h"
 
 ble_error_t
diff --git a/connectivity/FEATURE_BLE/source/generic/GapImpl.cpp b/connectivity/FEATURE_BLE/source/generic/GapImpl.cpp
@@ -25,8 +25,8 @@
 #include "ble/Gap.h"
 #include "ble/SecurityManager.h"
 #include "source/pal/PalGap.h"
-#include "ble/common/ble/GapEvents.h"
-#include "ble/common/ble/GapTypes.h"
+#include "source/pal/GapEvents.h"
+#include "source/pal/GapTypes.h"
 #include "source/pal/PalGenericAccessService.h"
 #include "source/pal/PalEventQueue.h"
 #include "source/pal/PalGap.h"
diff --git a/connectivity/FEATURE_BLE/source/generic/GapImpl.h b/connectivity/FEATURE_BLE/source/generic/GapImpl.h
@@ -37,8 +37,8 @@
 #include "ble/gap/Events.h"
 
 #include "source/pal/PalGap.h"
-#include "ble/common/ble/GapEvents.h"
-#include "ble/common/ble/GapTypes.h"
+#include "source/pal/GapEvents.h"
+#include "source/pal/GapTypes.h"
 #include "source/pal/PalEventQueue.h"
 #include "source/pal/PalConnectionMonitor.h"
 #include "source/pal/PalEventQueue.h"
diff --git a/connectivity/FEATURE_BLE/source/generic/GattClientImpl.cpp b/connectivity/FEATURE_BLE/source/generic/GattClientImpl.cpp
@@ -25,8 +25,8 @@
 
 #include "GattClientImpl.h"
 #include "source/pal/AttServerMessage.h"
-#include "ble/common/ble/DiscoveredService.h"
-#include "ble/common/ble/DiscoveredCharacteristic.h"
+#include "ble/gatt/DiscoveredService.h"
+#include "ble/gatt/DiscoveredCharacteristic.h"
 #include "ble/common/blecommon.h"
 #include "source/BLEInstanceBase.h"
 #include "ble/SecurityManager.h"
diff --git a/connectivity/FEATURE_BLE/source/generic/GattClientImpl.h b/connectivity/FEATURE_BLE/source/generic/GattClientImpl.h
@@ -26,10 +26,10 @@
 
 
 #include "ble/common/blecommon.h"
-#include "ble/common/ble/GattAttribute.h"
-#include "ble/common/ble/ServiceDiscovery.h"
-#include "ble/common/ble/CharacteristicDescriptorDiscovery.h"
-#include "ble/common/ble/GattCallbackParamTypes.h"
+#include "ble/gatt/GattAttribute.h"
+#include "ble/gatt/ServiceDiscovery.h"
+#include "ble/gatt/CharacteristicDescriptorDiscovery.h"
+#include "ble/gatt/GattCallbackParamTypes.h"
 #include "source/pal/PalGattClient.h"
 #include "source/pal/PalSigningMonitor.h"
 #include "ble/GattClient.h"
diff --git a/connectivity/FEATURE_BLE/source/generic/GattServerEvents.h b/connectivity/FEATURE_BLE/source/generic/GattServerEvents.h
diff --git a/connectivity/FEATURE_BLE/source/generic/GattServerImpl.h b/connectivity/FEATURE_BLE/source/generic/GattServerImpl.h
@@ -21,10 +21,10 @@
 
 #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/gatt/GattService.h"
+#include "ble/gatt/GattAttribute.h"
+#include "GattServerEvents.h"
+#include "ble/gatt/GattCallbackParamTypes.h"
 
 #include <stddef.h>
 #include <ble/GattServer.h>
@@ -34,7 +34,7 @@
 #include "att_api.h"
 #include "SecurityManager.h"
 
-#include "ble/common/ble/GattCallbackParamTypes.h"
+#include "ble/gatt/GattCallbackParamTypes.h"
 #include "source/pal/PalSigningMonitor.h"
 #include "source/BLEInstanceBase.h"
 
diff --git a/connectivity/FEATURE_BLE/source/generic/SecurityDb.h b/connectivity/FEATURE_BLE/source/generic/SecurityDb.h
@@ -22,7 +22,6 @@
 #include <stdlib.h>
 #include "platform/Callback.h"
 
-//#include "ble/common/ble/GapTypes.h"
 #include "ble/common/BLETypes.h"
 #include "ble/Gap.h"
 
diff --git a/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.h b/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.h
@@ -27,7 +27,7 @@
 #include "ble/common/blecommon.h"
 #include "ble/Gap.h"
 
-#include "ble/common/ble/GapTypes.h"
+#include "source/pal/GapTypes.h"
 #include "ble/common/BLETypes.h"
 #include "SecurityDb.h"
 #include "source/pal/PalConnectionMonitor.h"
diff --git a/connectivity/FEATURE_BLE/source/pal/GapEvents.h b/connectivity/FEATURE_BLE/source/pal/GapEvents.h
@@ -19,7 +19,7 @@
 #ifndef 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"
 
 namespace ble {
diff --git a/connectivity/FEATURE_BLE/source/pal/GapTypes.h b/connectivity/FEATURE_BLE/source/pal/GapTypes.h
diff --git a/connectivity/FEATURE_BLE/source/pal/PalGap.h b/connectivity/FEATURE_BLE/source/pal/PalGap.h
@@ -21,8 +21,8 @@
 
 #include "platform/Callback.h"
 
-#include "ble/common/ble/GapTypes.h"
-#include "ble/common/ble/GapEvents.h"
+#include "GapTypes.h"
+#include "GapEvents.h"
 #include "ble/common/blecommon.h"
 
 #include "dm_api.h"
diff --git a/connectivity/FEATURE_BLE/source/pal/PalGenericAccessService.h b/connectivity/FEATURE_BLE/source/pal/PalGenericAccessService.h
@@ -19,7 +19,7 @@
 #ifndef 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/blecommon.h"
 #include "ble/Gap.h"
diff --git a/connectivity/FEATURE_BLE/source/pal/PalSecurityManager.h b/connectivity/FEATURE_BLE/source/pal/PalSecurityManager.h
@@ -23,7 +23,7 @@
 #include "platform/NonCopyable.h"
 
 #include "ble/common/BLETypes.h"
-#include "ble/common/ble/GapTypes.h"
+#include "GapTypes.h"
 
 #include "wsf_types.h"
 #include "wsf_os.h"
