route mtu changed events to server and client instead of gap

paul-szczepanek-arm · paul-szczepanek-arm · commit b62828525430 · 2019-02-14T12:34:33.000Z
diff --git a/features/FEATURE_BLE/ble/GattClient.h b/features/FEATURE_BLE/ble/GattClient.h
@@ -83,6 +83,38 @@
  */
 class GattClient {
 public:
+
+    /**
+     * Definition of the general handler of GattClient related events.
+     */
+    struct EventHandler {
+        /**
+         * Function invoked when the connections changes the ATT_MTU which controls
+         * the maximum size of an attribute that can be read in a single L2CAP packet
+         * which might be fragmented across multiple packets.
+         *
+         * @param connectionHandle The handle of the connection that changed the size.
+         * @param attMtuSize
+         */
+        virtual void onAttMtuChange(
+            ble::connection_handle_t connectionHandle,
+            uint16_t attMtuSize
+        )
+        {
+        }
+    };
+
+    /**
+     * Assign the event handler implementation that will be used by the
+     * module to signal events back to the application.
+     *
+     * @param handler Application implementation of an EventHandler.
+     */
+    void setEventHandler(EventHandler *handler)
+    {
+        _eventHandler = handler;
+    }
+
     /**
      * Attribute read event handler.
      *
@@ -815,6 +847,11 @@ class GattClient {
     }
 
 protected:
+    /**
+     * Event handler provided by the application.
+     */
+    EventHandler *_eventHandler;
+
     /**
      * Callchain containing all registered event handlers for data read
      * events.
diff --git a/features/FEATURE_BLE/ble/GattServer.h b/features/FEATURE_BLE/ble/GattServer.h
@@ -87,6 +87,38 @@
  */
 class GattServer {
 public:
+
+    /**
+     * Definition of the general handler of GattServer related events.
+     */
+    struct EventHandler {
+        /**
+         * Function invoked when the connections changes the ATT_MTU which controls
+         * the maximum size of an attribute that can be read in a single L2CAP packet
+         * which might be fragmented across multiple packets.
+         *
+         * @param connectionHandle The handle of the connection that changed the size.
+         * @param attMtuSize
+         */
+        virtual void onAttMtuChange(
+            ble::connection_handle_t connectionHandle,
+            uint16_t attMtuSize
+        )
+        {
+        }
+    };
+
+    /**
+     * Assign the event handler implementation that will be used by the
+     * module to signal events back to the application.
+     *
+     * @param handler Application implementation of an EventHandler.
+     */
+    void setEventHandler(EventHandler *handler)
+    {
+        _eventHandler = handler;
+    }
+
     /**
      * Event handler invoked when the server has sent data to a client.
      *
@@ -778,6 +810,11 @@ class GattServer {
     }
 
 protected:
+    /**
+     * Event handler provided by the application.
+     */
+    EventHandler *_eventHandler;
+
     /**
      * The total number of services added to the ATT table.
      */
diff --git a/features/FEATURE_BLE/ble/gap/Gap.h b/features/FEATURE_BLE/ble/gap/Gap.h
@@ -492,21 +492,6 @@ class Gap {
         {
         }
 
-        /**
-         * Function invoked when the connections changes the ATT_MTU which controls
-         * the maximum size of an attribute that can be read in a single L2CAP packet
-         * which might be fragmented across multiple packets.
-         *
-         * @param connectionHandle The handle of the connection that changed the size.
-         * @param attMtuSize
-         */
-        virtual void onAttMtuChange(
-            connection_handle_t connectionHandle,
-            uint16_t attMtuSize
-        )
-        {
-        }
-
         /**
          * Function invoked when the connections changes the maximum number of octets
          * that can be sent or received by the controller in a single packet. A single
diff --git a/features/FEATURE_BLE/ble/generic/GenericGap.h b/features/FEATURE_BLE/ble/generic/GenericGap.h
@@ -627,11 +627,6 @@ class GenericGap :
         phy_t rx_phy
     );
 
-    virtual void on_att_mtu_changed(
-        connection_handle_t connection_handle,
-        uint16_t att_mtu_size
-    );
-
     virtual void on_data_length_change(
         connection_handle_t connection_handle,
         uint16_t tx_size,
diff --git a/features/FEATURE_BLE/ble/generic/GenericGattClient.h b/features/FEATURE_BLE/ble/generic/GenericGattClient.h
@@ -33,8 +33,20 @@ namespace generic {
  * @attention: Not part of the public interface of BLE API.
  */
 class GenericGattClient : public GattClient,
-                          public pal::SigningEventMonitor {
+                          public pal::SigningEventMonitor,
+                          public pal::GattClient::EventHandler {
 public:
+
+    virtual void on_att_mtu_change(
+        ble::connection_handle_t connection_handle,
+        uint16_t att_mtu_size
+    )
+    {
+        if (_eventHandler) {
+            _eventHandler->onAttMtuChange(connection_handle, att_mtu_size);
+        }
+    }
+
     /**
      * Create a GenericGattClient from a pal::GattClient
      */
@@ -128,6 +140,10 @@ class GenericGattClient : public GattClient,
      */
     virtual void set_signing_event_handler(pal::SigningEventMonitor::EventHandler *signing_event_handler);
 
+    ::GattClient::EventHandler* getEventHandler() {
+        return _eventHandler;
+    }
+
 private:
     struct ProcedureControlBlock;
     struct DiscoveryControlBlock;
diff --git a/features/FEATURE_BLE/ble/pal/PalGap.h b/features/FEATURE_BLE/ble/pal/PalGap.h
@@ -44,14 +44,6 @@ struct Gap {
             ble::phy_t rx_phy
         ) = 0;
 
-        /**
-         * @copydoc Gap::EventHandler::onAttMtuChange
-         */
-        virtual void on_att_mtu_changed(
-            connection_handle_t connection_handle,
-            uint16_t att_mtu_size
-        ) = 0;
-
         /**
          * @copydoc Gap::EventHandler::onDataLengthChange
          */
diff --git a/features/FEATURE_BLE/ble/pal/PalGattClient.h b/features/FEATURE_BLE/ble/pal/PalGattClient.h
@@ -55,8 +55,27 @@ namespace pal {
  * the class AttClientToGattClientAdapter
  */
 class GattClient {
-
 public:
+    /**
+     * Definition of the general handler of GattClient related events.
+     */
+    struct EventHandler {
+        /**
+         * Function invoked when the connections changes the ATT_MTU which controls
+         * the maximum size of an attribute that can be read in a single L2CAP packet
+         * which might be fragmented across multiple packets.
+         *
+         * @param connectionHandle The handle of the connection that changed the size.
+         * @param attMtuSize
+         */
+        virtual void on_att_mtu_change(
+            ble::connection_handle_t connection_handle,
+            uint16_t att_mtu_size
+        )
+        {
+        }
+    };
+
     /**
      * Initialisation of the instance. An implementation can use this function
      * to initialise the subsystems needed to realize the operations of this
diff --git a/features/FEATURE_BLE/source/generic/GenericGap.cpp b/features/FEATURE_BLE/source/generic/GenericGap.cpp
@@ -860,16 +860,6 @@ void GenericGap::on_read_phy(
     }
 }
 
-void GenericGap::on_att_mtu_changed(
-    Handle_t connection_handle,
-    uint16_t att_mtu_size
-)
-{
-    if (_eventHandler) {
-        _eventHandler->onAttMtuChange(connection_handle, att_mtu_size);
-    }
-}
-
 void GenericGap::on_data_length_change(
     Handle_t connection_handle,
     uint16_t tx_size,
diff --git a/features/FEATURE_BLE/source/generic/GenericGattClient.cpp b/features/FEATURE_BLE/source/generic/GenericGattClient.cpp
@@ -1280,7 +1280,7 @@ ble_error_t GenericGattClient::reset(void) {
 }
 
 void GenericGattClient::set_signing_event_handler(
-    EventHandler *signing_event_handler
+    pal::SigningEventMonitor::EventHandler *signing_event_handler
 ) {
     _signing_event_handler = signing_event_handler;
 }
diff --git a/features/FEATURE_BLE/targets/TARGET_CORDIO/CordioGattServer.h b/features/FEATURE_BLE/targets/TARGET_CORDIO/CordioGattServer.h
@@ -62,6 +62,10 @@ class GattServer : public ::GattServer,
      */
     static GattServer &getInstance();
 
+    ::GattServer::EventHandler* getEventHandler() {
+        return _eventHandler;
+    }
+
     /**
      * Initialize the GattServer and add mandatory services (generic access and
      * generic attribute service).
diff --git a/features/FEATURE_BLE/targets/TARGET_CORDIO/CordioPalAttClient.cpp b/features/FEATURE_BLE/targets/TARGET_CORDIO/CordioPalAttClient.cpp
@@ -0,0 +1,73 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2019 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "CordioPalAttClient.h"
+#include "CordioBLE.h"
+
+namespace ble {
+namespace pal {
+namespace vendor {
+namespace cordio {
+
+void CordioAttClient::att_client_handler(const attEvt_t* event)
+{
+    if (event->hdr.status == ATT_SUCCESS && event->hdr.event == ATT_MTU_UPDATE_IND) {
+        ble::vendor::cordio::BLE& ble = ble::vendor::cordio::BLE::deviceInstance();
+        ble::pal::GattClient::EventHandler &handler = ble.getGattClient();
+        handler.on_att_mtu_change(event->hdr.param, event->mtu);
+    } else {
+        // all handlers are stored in a static array
+        static const event_handler_t handlers[] = {
+            &timeout_event_handler,
+            &event_handler<ErrorResponseConverter>,
+            //&event_handler<ExchangeMtuResponseConverter>,
+            &event_handler<FindInformationResponseConverter>,
+            &event_handler<FindByTypeValueResponseConverter>,
+            &event_handler<ReadByTypeResponseConverter>,
+            &event_handler<ReadResponseConverter>,
+            &event_handler<ReadBlobResponseConverter>,
+            &event_handler<ReadMultipleResponseConverter>,
+            &event_handler<ReadBygroupTypeResponseConverter>,
+            &event_handler<WriteResponseConverter>,
+            &event_handler<PrepareWriteResponseConverter>,
+            &event_handler<ExecuteWriteResponseConverter>,
+            &event_handler<HandleValueIndicationConverter>,
+            &event_handler<HandleValueNotificationConverter>
+        };
+
+        // event->hdr.param: connection handle
+        // event->header.event: opcode from the request
+        // event->header.status: success or error code ...
+        // event->pValue: starting after opcode for response; starting after opcode + handle for server initiated responses.
+        // event->handle: handle for server initiated responses
+
+        // traverse all handlers and execute them with the event in input.
+        // exit if an handler has handled the event.
+        for(size_t i = 0; i < (sizeof(handlers)/sizeof(handlers[0])); ++i) {
+            if (handlers[i](event)) {
+                return;
+            }
+        }
+    }
+
+    // pass events not handled to the server side
+    ble::vendor::cordio::GattServer::getInstance().att_cb(event);
+}
+
+} // cordio
+} // vendor
+} // pal
+} // ble
diff --git a/features/FEATURE_BLE/targets/TARGET_CORDIO/CordioPalAttClient.h b/features/FEATURE_BLE/targets/TARGET_CORDIO/CordioPalAttClient.h
@@ -24,6 +24,8 @@
 #include "att_defs.h"
 #include "ble/pal/PalGap.h"
 #include "CordioPalGap.h"
+#include "PalGattClient.h"
+#include "CordioBLE.h"
 
 namespace ble {
 namespace pal {
@@ -318,53 +320,7 @@ class CordioAttClient : public ::ble::pal::AttClient {
     /**
      * Callback which handle attEvt_t and forward them to on_server_event.
      */
-    static void att_client_handler(const attEvt_t* event)
-    {
-        if (event->hdr.status == ATT_SUCCESS && event->hdr.event == ATT_MTU_UPDATE_IND) {
-            ble::pal::Gap::EventHandler *handler;
-            handler = ble::pal::vendor::cordio::Gap::get_gap().get_event_handler();
-            if (handler) {
-                handler->on_att_mtu_changed(event->hdr.param, event->mtu);
-            }
-            return;
-        }
-
-        // all handlers are stored in a static array
-        static const event_handler_t handlers[] = {
-            &timeout_event_handler,
-            &event_handler<ErrorResponseConverter>,
-            //&event_handler<ExchangeMtuResponseConverter>,
-            &event_handler<FindInformationResponseConverter>,
-            &event_handler<FindByTypeValueResponseConverter>,
-            &event_handler<ReadByTypeResponseConverter>,
-            &event_handler<ReadResponseConverter>,
-            &event_handler<ReadBlobResponseConverter>,
-            &event_handler<ReadMultipleResponseConverter>,
-            &event_handler<ReadBygroupTypeResponseConverter>,
-            &event_handler<WriteResponseConverter>,
-            &event_handler<PrepareWriteResponseConverter>,
-            &event_handler<ExecuteWriteResponseConverter>,
-            &event_handler<HandleValueIndicationConverter>,
-            &event_handler<HandleValueNotificationConverter>
-        };
-
-        // event->hdr.param: connection handle
-        // event->header.event: opcode from the request
-        // event->header.status: success or error code ...
-        // event->pValue: starting after opcode for response; starting after opcode + handle for server initiated responses.
-        // event->handle: handle for server initiated responses
-
-        // traverse all handlers and execute them with the event in input.
-        // exit if an handler has handled the event.
-        for(size_t i = 0; i < (sizeof(handlers)/sizeof(handlers[0])); ++i) {
-            if (handlers[i](event)) {
-                return;
-            }
-        }
-
-        // pass events not handled to the server side
-        ble::vendor::cordio::GattServer::getInstance().att_cb(event);
-    }
+    static void att_client_handler(const attEvt_t* event);
 
 private:
     /**
diff --git a/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioGattServer.cpp b/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioGattServer.cpp
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_MCU_NRF51822/source/nRF5xGattServer.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_MCU_NRF51822/source/nRF5xGattServer.h
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF51/source/nRF5xGattServer.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF51/source/nRF5xGattServer.h
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF52/source/btle/btle.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF52/source/btle/btle.cpp
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF52/source/nRF5xGattServer.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF52/source/nRF5xGattServer.h

Original file line number	Diff line number	Diff line change
`@@ -1280,7 +1280,7 @@ ble_error_t GenericGattClient::reset(void) {`
`1280`	`1280`	`}`
`1281`	`1281`
`1282`	`1282`	`void GenericGattClient::set_signing_event_handler(`
`1283`		`- EventHandler *signing_event_handler`
	`1283`	`+ pal::SigningEventMonitor::EventHandler *signing_event_handler`
`1284`	`1284`	`) {`
`1285`	`1285`	`_signing_event_handler = signing_event_handler;`
`1286`	`1286`	`}`