BLE - replace some usages of Gap::Handle_t by ble::connection_handle_t

Author: pan-

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;
 };

features/FEATURE_BLE/ble/GattCallbackParamTypes.h

@@ -83,7 +83,7 @@ struct GattWriteCallbackParams {
     /**
      * Handle of the connection that triggered the event.
      */
-    Gap::Handle_t connHandle;
+    ble::connection_handle_t connHandle;
 
     /**
      * Handle of the attribute to which the write operation applies.
@@ -152,7 +152,7 @@ struct GattReadCallbackParams {
     /**
      * Handle of the connection that triggered the event.
      */
-    Gap::Handle_t connHandle;
+    ble::connection_handle_t connHandle;
 
     /**
      * Attribute Handle to which the read operation applies.
@@ -274,7 +274,7 @@ struct GattWriteAuthCallbackParams {
     /**
      * Handle of the connection that triggered the event.
      */
-    Gap::Handle_t connHandle;
+    ble::connection_handle_t connHandle;
 
     /**
      * Attribute Handle to which the write operation applies.
@@ -313,7 +313,7 @@ struct GattReadAuthCallbackParams {
     /**
      * The handle of the connection that triggered the event.
      */
-    Gap::Handle_t connHandle;
+    ble::connection_handle_t connHandle;
 
     /**
      * Attribute Handle to which the read operation applies.
@@ -357,7 +357,7 @@ struct GattHVXCallbackParams {
     /**
      * The handle of the connection that triggered the event.
      */
-    Gap::Handle_t connHandle;
+    ble::connection_handle_t connHandle;
 
     /**
      * Attribute Handle to which the HVx operation applies.

features/FEATURE_BLE/ble/ServiceDiscovery.h

@@ -78,7 +78,7 @@ class ServiceDiscovery {
      * parameter is used to identify on which connection the service discovery
      * process ended.
      */
-    typedef FunctionPointerWithContext<Gap::Handle_t> TerminationCallback_t;
+    typedef FunctionPointerWithContext<ble::connection_handle_t> TerminationCallback_t;
 
 public:
     /**
@@ -135,7 +135,7 @@ class ServiceDiscovery {
      * @return
      *           BLE_ERROR_NONE if service discovery is launched successfully; else an appropriate error.
      */
-    virtual ble_error_t launch(Gap::Handle_t             connectionHandle,
+    virtual ble_error_t launch(ble::connection_handle_t             connectionHandle,
                                ServiceCallback_t         sc = NULL,
                                CharacteristicCallback_t  cc = NULL,
                                const UUID               &matchingServiceUUID = UUID::ShortUUIDBytes_t(BLE_UUID_UNKNOWN),
@@ -182,7 +182,7 @@ class ServiceDiscovery {
     /**
      * Connection handle as provided by the SoftDevice.
      */
-    Gap::Handle_t            connHandle;
+    ble::connection_handle_t            connHandle;
     /**
      * UUID-based filter that specifies the service that the application is
      * interested in.

features/FEATURE_BLE/source/DiscoveredCharacteristic.cpp

@@ -32,15 +32,15 @@ DiscoveredCharacteristic::read(uint16_t offset) const
 }
 
 struct OneShotReadCallback {
-    static void launch(GattClient* client, Gap::Handle_t connHandle,
+    static void launch(GattClient* client, ble::connection_handle_t connHandle,
                        GattAttribute::Handle_t handle, const GattClient::ReadCallback_t& cb) {
         OneShotReadCallback* oneShot = new OneShotReadCallback(client, connHandle, handle, cb);
         oneShot->attach();
         // delete will be made when this callback is called
     }
 
 private:
-    OneShotReadCallback(GattClient* client, Gap::Handle_t connHandle,
+    OneShotReadCallback(GattClient* client, ble::connection_handle_t connHandle,
                         GattAttribute::Handle_t handle, const GattClient::ReadCallback_t& cb) :
         _client(client),
         _connHandle(connHandle),
@@ -61,7 +61,7 @@ struct OneShotReadCallback {
     }
 
     GattClient* _client;
-    Gap::Handle_t _connHandle;
+    ble::connection_handle_t _connHandle;
     GattAttribute::Handle_t _handle;
     GattClient::ReadCallback_t _callback;
 };
@@ -106,15 +106,15 @@ DiscoveredCharacteristic::writeWoResponse(uint16_t length, const uint8_t *value)
 }
 
 struct OneShotWriteCallback {
-    static void launch(GattClient* client, Gap::Handle_t connHandle,
+    static void launch(GattClient* client, ble::connection_handle_t connHandle,
                        GattAttribute::Handle_t handle, const GattClient::WriteCallback_t& cb) {
         OneShotWriteCallback* oneShot = new OneShotWriteCallback(client, connHandle, handle, cb);
         oneShot->attach();
         // delete will be made when this callback is called
     }
 
 private:
-    OneShotWriteCallback(GattClient* client, Gap::Handle_t connHandle,
+    OneShotWriteCallback(GattClient* client, ble::connection_handle_t connHandle,
                         GattAttribute::Handle_t handle, const GattClient::WriteCallback_t& cb) :
         _client(client),
         _connHandle(connHandle),
@@ -135,7 +135,7 @@ struct OneShotWriteCallback {
     }
 
     GattClient* _client;
-    Gap::Handle_t _connHandle;
+    ble::connection_handle_t _connHandle;
     GattAttribute::Handle_t _handle;
     GattClient::WriteCallback_t _callback;
 };