Merge pull request #9727 from pan-/optimize-size

BLE API devirtualization

Author: Cruz Monrreal

features/FEATURE_BLE/ble/BLE.h

@@ -19,9 +19,9 @@
 
 #include "blecommon.h"
 #include "ble/Gap.h"
-#include "GattServer.h"
-#include "GattClient.h"
-#include "SecurityManager.h"
+#include "ble/GattServer.h"
+#include "ble/GattClient.h"
+#include "ble/SecurityManager.h"
 
 #include "ble/FunctionPointerWithContext.h"
 

features/FEATURE_BLE/ble/BLEInstanceBase.h

@@ -21,13 +21,13 @@
 #ifndef MBED_BLE_DEVICE_INSTANCE_BASE__
 #define MBED_BLE_DEVICE_INSTANCE_BASE__
 
+#include "ble/BLE.h"
 #include "ble/Gap.h"
 #include "ble/SecurityManager.h"
-#include "ble/BLE.h"
+#include "ble/GattServer.h"
+#include "ble/GattClient.h"
+
 
-/* Forward declarations. */
-class GattServer;
-class GattClient;
 
 /**
  * @addtogroup ble

features/FEATURE_BLE/ble/DiscoveredCharacteristic.h

@@ -537,7 +537,7 @@ class DiscoveredCharacteristic {
      * @return Connection handle to the GattServer, which contains this
      * characteristic.
      */
-    Gap::Handle_t getConnectionHandle() const
+    ble::connection_handle_t getConnectionHandle() const
     {
         return connHandle;
     }
@@ -625,7 +625,7 @@ class DiscoveredCharacteristic {
     /**
      * Handle of the connection where the characteristic was discovered.
      */
-    Gap::Handle_t connHandle;
+    ble::connection_handle_t connHandle;
 };
 
 /**

features/FEATURE_BLE/ble/DiscoveredCharacteristicDescriptor.h

@@ -73,7 +73,7 @@ class DiscoveredCharacteristicDescriptor {
      */
     DiscoveredCharacteristicDescriptor(
         GattClient *client,
-        Gap::Handle_t connectionHandle,
+        ble::connection_handle_t connectionHandle,
         GattAttribute::Handle_t attributeHandle,
         const UUID &uuid
     ) : _client(client),
@@ -109,7 +109,7 @@ class DiscoveredCharacteristicDescriptor {
      * @return the connection handle to the GattServer containing this
      * descriptor.
      */
-    Gap::Handle_t getConnectionHandle() const
+    ble::connection_handle_t getConnectionHandle() const
     {
         return _connectionHandle;
     }
@@ -139,7 +139,7 @@ class DiscoveredCharacteristicDescriptor {
 
 private:
     GattClient  *_client;
-    Gap::Handle_t _connectionHandle;
+    ble::connection_handle_t _connectionHandle;
     UUID _uuid;
     GattAttribute::Handle_t _gattHandle;
 };