BLE: Cleanup public headers

Author: pan-

connectivity/FEATURE_BLE/include/ble/BLE.h

@@ -19,20 +19,20 @@
 #ifndef MBED_BLE_H__
 #define MBED_BLE_H__
 
-#include "ble/common/FunctionPointerWithContext.h"
 #include "platform/mbed_error.h"
 #include "platform/mbed_assert.h"
 #include "platform/mbed_toolchain.h"
 
-#include "ble/common/BLERoles.h"
-#include "ble/common/BLETypes.h"
-#include "ble/common/blecommon.h"
-
 #include "ble/Gap.h"
 #include "ble/GattClient.h"
 #include "ble/GattServer.h"
 #include "ble/SecurityManager.h"
 
+#include "ble/common/BLERoles.h"
+#include "ble/common/BLETypes.h"
+#include "ble/common/blecommon.h"
+#include "ble/common/FunctionPointerWithContext.h"
+
 /* Forward declaration for the implementation class */
 
 namespace ble {
@@ -479,7 +479,7 @@ class BLE {
 
 using ble::BLE;
 /**
- * @namespace ble Entry namespace for all %BLE API definitions.
+ * @namespace ble Entry namespace for all BLE API definitions.
  */
 
 /**

connectivity/FEATURE_BLE/include/ble/Gap.h

@@ -21,12 +21,6 @@
 
 #include "ble/common/CallChainOfFunctionPointersWithContext.h"
 
-#include <algorithm>
-
-#include "drivers/LowPowerTimeout.h"
-#include "drivers/LowPowerTicker.h"
-#include "platform/mbed_error.h"
-
 #include "ble/common/BLERoles.h"
 #include "ble/common/BLETypes.h"
 #include "ble/gap/AdvertisingDataBuilder.h"
@@ -35,12 +29,17 @@
 #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/Events.h"
 #include "ble/gap/Types.h"
 
 namespace ble {
-class PalGenericAccessService;
+
+#if !defined(DOXYGEN_ONLY)
+namespace impl {
+class Gap;
+}
+#endif // !defined(DOXYGEN_ONLY)
 
 /**
  * @addtogroup ble
@@ -280,11 +279,6 @@ class PalGenericAccessService;
  * PHY and of any changes to PHYs which may be triggered autonomously by the
  * controller or by the peer.
  */
-#if !defined(DOXYGEN_ONLY)
-namespace impl {
-class Gap;
-}
-#endif // !defined(DOXYGEN_ONLY)
 class Gap {
 public:
     /**
@@ -1467,10 +1461,6 @@ class Gap {
 
 } // namespace ble
 
-/* This includes the concrete class implementation, to provide a an alternative API implementation
- * disable ble-api-implementation and place your header in a path with the same structure */
-//#include "ble/internal/GapImpl.h"
-
 /** @deprecated Use the namespaced ble::Gap instead of the global Gap. */
 using ble::Gap;
 

connectivity/FEATURE_BLE/include/ble/GattClient.h

@@ -22,9 +22,8 @@
 #define MBED_GATT_CLIENT_H__
 
 #include "ble/common/CallChainOfFunctionPointersWithContext.h"
-#include <algorithm>
-
 #include "ble/common/blecommon.h"
+
 #include "ble/gatt/GattAttribute.h"
 #include "ble/gatt/ServiceDiscovery.h"
 #include "ble/gatt/CharacteristicDescriptorDiscovery.h"
@@ -34,6 +33,12 @@
 
 namespace ble {
 
+#if !defined(DOXYGEN_ONLY)
+namespace impl {
+class GattClient;
+}
+#endif // !defined(DOXYGEN_ONLY)
+
 /**
  * @addtogroup ble
  * @{
@@ -89,11 +94,6 @@ namespace ble {
  * indicate properties are set. The client discovers that descriptor
  * if it intends to register to server initiated events.
  */
-#if !defined(DOXYGEN_ONLY)
-namespace impl {
-class GattClient;
-}
-#endif // !defined(DOXYGEN_ONLY)
 class GattClient {
 public:
     /**
@@ -724,10 +724,6 @@ class GattClient {
 
 } // namespace ble
 
-/* This includes the concrete class implementation, to provide a an alternative API implementation
- * disable ble-api-implementation and place your header in a path with the same structure */
-//#include "ble/internal/GattClientImpl.h"
-
 /** @deprecated Use the namespaced ble::GattClient instead of the global GattClient. */
 using ble::GattClient;
 

connectivity/FEATURE_BLE/include/ble/GattServer.h

@@ -21,17 +21,21 @@
 #define MBED_GATT_SERVER_H__
 
 #include "ble/common/CallChainOfFunctionPointersWithContext.h"
+#include "ble/common/blecommon.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"
-#include "SecurityManager.h"
-
 namespace ble {
 
+#if !defined(DOXYGEN_ONLY)
+namespace impl {
+class GattServer;
+}
+#endif // !defined(DOXYGEN_ONLY)
+
+
 /**
  * @addtogroup ble
  * @{
@@ -93,13 +97,6 @@ namespace ble {
  * Characteristic Value Notification and Characteristic Value Indication when
  * the nature of the server initiated is not relevant.
  */
-#if !defined(DOXYGEN_ONLY)
-namespace impl {
-class GattServer;
-}
-
-namespace interface {
-#endif // !defined(DOXYGEN_ONLY)
 class GattServer {
 public:
     /**
@@ -607,19 +604,9 @@ class GattServer {
  * @}
  */
 
-#if !defined(DOXYGEN_ONLY)
-} // namespace interface
-#endif // !defined(DOXYGEN_ONLY)
-
-using ble::interface::GattServer;
-
 } // ble
 
-/* This includes the concrete class implementation, to provide a an alternative API implementation
- * disable ble-api-implementation and place your header in a path with the same structure */
-//#include "ble/internal/GattServerImpl.h"
-
 /** @deprecated Use the namespaced ble::GattServer instead of the global GattServer. */
-using ble::interface::GattServer;
+using ble::GattServer;
 
 #endif /* ifndef MBED_GATT_SERVER_H__ */

connectivity/FEATURE_BLE/include/ble/SecurityManager.h

@@ -20,16 +20,19 @@
 #define BLE_SECURITY_MANAGER_H_
 
 #include <cstdint>
-#include "ble/common/CallChainOfFunctionPointersWithContext.h"
-#include "platform/Callback.h"
 
 #include "ble/common/BLETypes.h"
 #include "ble/common/blecommon.h"
-
-#include "ble/common/BLETypes.h"
+#include "ble/common/CallChainOfFunctionPointersWithContext.h"
 
 namespace ble {
 
+#if !defined(DOXYGEN_ONLY)
+namespace impl {
+class SecurityManager;
+}
+#endif // !defined(DOXYGEN_ONLY)
+
 /**
  * Overview
  *
@@ -183,12 +186,6 @@ namespace ble {
  * @endverbatim
  *
  */
-#if !defined(DOXYGEN_ONLY)
-namespace impl {
-class SecurityManager;
-}
-#endif // !defined(DOXYGEN_ONLY)
-
 class SecurityManager
 {
 public:
@@ -905,7 +902,6 @@ class SecurityManager
     impl::SecurityManager *impl;
 };
 
-
 } // ble
 
 /** @deprecated Use the namespaced ble::SecurityManager instead of the global SecurityManager. */

connectivity/FEATURE_BLE/include/ble/common/BLETypes.h

@@ -22,9 +22,10 @@
 #include <cstddef>
 #include <cstdint>
 #include <cstring>
-#include "ble/common/SafeEnum.h"
+
 #include "platform/Span.h"
 
+#include "ble/common/SafeEnum.h"
 #include "ble/gap/Types.h"
 
 /**

connectivity/FEATURE_BLE/include/ble/driver/CordioHCIDriver.h

@@ -20,12 +20,13 @@
 #include <cstddef>
 #include <cstdint>
 #include <BLETypes.h>
-// FIXME: make this invisible!
-#include "wsf_buf.h"
-#include "CordioHCITransportDriver.h"
+#include "ble/driver/CordioHCITransportDriver.h"
 #include "ble/common/blecommon.h"
 #include "mbed.h"
 
+// FIXME: make this invisible!
+#include "wsf_buf.h"
+
 namespace ble {
 
 /**

connectivity/FEATURE_BLE/include/ble/driver/H4TransportDriver.h

@@ -21,7 +21,7 @@
 
 #include <cstdint>
 #include "mbed.h"
-#include "driver/CordioHCITransportDriver.h"
+#include "ble/driver/CordioHCITransportDriver.h"
 
 namespace ble {
 

connectivity/FEATURE_BLE/include/ble/gap/ConnectionParameters.h

@@ -19,7 +19,7 @@
 #ifndef MBED_EXTENDED_CONNECT_PARAMETERS_H__
 #define MBED_EXTENDED_CONNECT_PARAMETERS_H__
 
-#include "mbed_assert.h"
+#include "platform/mbed_assert.h"
 
 #include "ble/common/BLETypes.h"
 

connectivity/FEATURE_BLE/include/ble/gatt/DiscoveredCharacteristic.h

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