BLE: GattServer PIMPL

Author: pan-

connectivity/FEATURE_BLE/include/ble/GattServer.h

@@ -95,6 +95,10 @@ namespace ble {
  * 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 {
@@ -415,7 +419,10 @@ class GattServer {
      * function.
      */
     template <typename T>
-    void onDataSent(T *objPtr, void (T::*memberPtr)(unsigned count));
+    void onDataSent(T *objPtr, void (T::*memberPtr)(unsigned count))
+    {
+        onDataSent({objPtr, memberPtr});
+    }
 
     /**
      * Access the callchain of data sent event handlers.
@@ -448,7 +455,10 @@ class GattServer {
     void onDataWritten(
         T *objPtr,
         void (T::*memberPtr)(const GattWriteCallbackParams *context)
-    );
+    )
+    {
+        onDataWritten({objPtr, memberPtr});
+    }
 
     /**
      * Access the callchain of data written event handlers.
@@ -495,7 +505,10 @@ class GattServer {
     ble_error_t onDataRead(
         T *objPtr,
         void (T::*memberPtr)(const GattReadCallbackParams *context)
-    );
+    )
+    {
+        onDataRead({objPtr, memberPtr});
+    }
 
     /**
      * Access the callchain of data read event handlers.
@@ -537,7 +550,10 @@ class GattServer {
      * function.
      */
     template <typename T>
-    void onShutdown(T *objPtr, void (T::*memberPtr)(const GattServer *));
+    void onShutdown(T *objPtr, void (T::*memberPtr)(const GattServer *))
+    {
+        onShutdown({objPtr, memberPtr});
+    }
 
     /**
      * Access the callchain of shutdown event handlers.
@@ -578,72 +594,8 @@ class GattServer {
      */
     void onConfirmationReceived(EventCallback_t callback);
 
-    /* Entry points for the underlying stack to report events back to the user. */
-protected:
-    /**
-     * Helper function that notifies all registered handlers of an occurrence
-     * of a data written event.
-     *
-     * @attention Vendor implementation must invoke this function after one of
-     * the GattServer attributes has been written.
-     *
-     * @param[in] params The data written parameters passed to the registered
-     * handlers.
-     */
-    void handleDataWrittenEvent(const GattWriteCallbackParams *params);
-
-    /**
-     * Helper function that notifies all registered handlers of an occurrence
-     * of a data read event.
-     *
-     * @attention Vendor implementation must invoke this function after one of
-     * the GattServer attributes has been read.
-     *
-     * @param[in] params The data read parameters passed to the registered
-     * handlers.
-     */
-    void handleDataReadEvent(const GattReadCallbackParams *params);
-
-    /**
-     * Helper function that notifies the registered handler of an occurrence
-     * of updates enabled, updates disabled or confirmation received events.
-     *
-     * @attention Vendor implementation must invoke this function when a client
-     * subscribes to characteristic updates, unsubscribes from characteristic
-     * updates or a notification confirmation has been received.
-     *
-     * @param[in] type The type of event that occurred.
-     * @param[in] attributeHandle The handle of the attribute concerned by the
-     * event.
-     */
-    void handleEvent(
-        GattServerEvents::gattEvent_e type,
-        GattAttribute::Handle_t attributeHandle
-    );
-
-    /**
-     * Helper function that notifies all registered handlers of an occurrence
-     * of a data sent event.
-     *
-     * @attention Vendor implementation must invoke this function after the
-     * emission of a notification or an indication.
-     *
-     * @param[in] count Number of packets sent.
-     */
-    void handleDataSentEvent(unsigned count);
-
-    /**
-     * Get preferred connection paramters.
-     *
-     */
-    Gap::PreferredConnectionParams_t getPreferredConnectionParams();
-
-    /**
-     * Set preferred connection parameters.
-     *
-     * @param[in] params Preferred connection parameter values to set.
-     */
-    void setPreferredConnectionParams(const Gap::PreferredConnectionParams_t& params);
+private:
+    impl::GattServer *impl;
 };
 
 /**
@@ -655,13 +607,16 @@ 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"
+//#include "ble/internal/GattServerImpl.h"
 
 /** @deprecated Use the namespaced ble::GattServer instead of the global GattServer. */
-using ble::GattServer;
+using ble::interface::GattServer;
 
 #endif /* ifndef MBED_GATT_SERVER_H__ */