Update parameters passed to onDataSent, onUpdatesEnabled/Disabled, and onConfirmationReceived callbacks

Author: AGlass0fMilk

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

@@ -384,6 +384,29 @@ struct GattHVXCallbackParams {
 
 };
 
+/**
+ * Gatt Data Sent Attribute related events
+ *
+ * Used by `onDataSent`
+ */
+struct GattDataSentCallbackParams {
+
+    /**
+     * The handle of the connection that triggered the event.
+     */
+    ble::connection_handle_t connHandle;
+
+    /**
+     * Attribute Handle to which the event applies
+     */
+    GattAttribute::Handle_t handle;
+
+};
+
+using GattUpdatesEnabledCallbackParams        = GattDataSentCallbackParams;
+using GattUpdatesDisabledCallbackParams       = GattDataSentCallbackParams;
+using GattConfirmationReceivedCallbackParams  = GattDataSentCallbackParams;
+
 namespace ble {
 
 /**

connectivity/FEATURE_BLE/source/GattServer.cpp

@@ -139,17 +139,17 @@ GattServer::GattServerShutdownCallbackChain_t& GattServer::onShutdown()
 
 void GattServer::onUpdatesEnabled(EventCallback_t callback)
 {
-    return impl->onUpdatesEnabled(callback);
+    impl->onUpdatesEnabled(callback);
 }
 
 void GattServer::onUpdatesDisabled(EventCallback_t callback)
 {
-    return impl->onUpdatesDisabled(callback);
+    impl->onUpdatesDisabled(callback);
 }
 
 void GattServer::onConfirmationReceived(EventCallback_t callback)
 {
-    return impl->onConfirmationReceived(callback);
+    impl->onConfirmationReceived(callback);
 }
 
-} // ble
+} // ble

connectivity/FEATURE_BLE/source/cordio/source/GattServerImpl.cpp

@@ -950,7 +950,7 @@ void GattServer::cccd_cb(attsCccEvt_t *evt)
             GattServerEvents::GATT_EVENT_UPDATES_ENABLED :
             GattServerEvents::GATT_EVENT_UPDATES_DISABLED;
 
-    getInstance().handleEvent(evt_type, evt->handle);
+    getInstance().handleEvent(evt_type, evt->hdr.param, evt->handle);
 }
 
 void GattServer::att_cb(const attEvt_t *evt)
@@ -961,7 +961,7 @@ void GattServer::att_cb(const attEvt_t *evt)
             handler->onAttMtuChange(evt->hdr.param, evt->mtu);
         }
     } else if (evt->hdr.status == ATT_SUCCESS && evt->hdr.event == ATTS_HANDLE_VALUE_CNF) {
-        getInstance().handleEvent(GattServerEvents::GATT_EVENT_DATA_SENT, evt->handle);
+        getInstance().handleEvent(GattServerEvents::GATT_EVENT_DATA_SENT, evt->hdr.param, evt->handle);
     }
 }
 
@@ -1516,6 +1516,7 @@ void GattServer::handleDataReadEvent(const GattReadCallbackParams *params)
 
 void GattServer::handleEvent(
     GattServerEvents::gattEvent_e type,
+    ble::connection_handle_t connHandle,
     GattAttribute::Handle_t attributeHandle
 )
 {

connectivity/FEATURE_BLE/source/cordio/source/GattServerImpl.h

@@ -153,6 +153,7 @@ class GattServer : public PalSigningMonitor {
 
     void handleEvent(
         GattServerEvents::gattEvent_e type,
+        ble::connection_handle_t connHandle,
         GattAttribute::Handle_t attributeHandle
     );