Diff: ble/GattClient.h

Revision:

986:5292837107a3

Parent:

976:043b3bd94ee0

Child:

990:53ac0ac3aa39

--- a/ble/GattClient.h	Thu Nov 26 12:52:37 2015 +0000
+++ b/ble/GattClient.h	Thu Nov 26 14:51:21 2015 +0000
@@ -23,23 +23,18 @@
 
 #include "GattCallbackParamTypes.h"
 
-#include "CallChainOfFunctionPointersWithContext.h"
-
 class GattClient {
 public:
-    typedef FunctionPointerWithContext<const GattReadCallbackParams*> ReadCallback_t;
-    typedef CallChainOfFunctionPointersWithContext<const GattReadCallbackParams*> ReadCallbackChain_t;
+    typedef void (*ReadCallback_t)(const GattReadCallbackParams *params);
 
     enum WriteOp_t {
         GATT_OP_WRITE_REQ = 0x01,  /**< Write request. */
         GATT_OP_WRITE_CMD = 0x02,  /**< Write command. */
     };
 
-    typedef FunctionPointerWithContext<const GattWriteCallbackParams*> WriteCallback_t;
-    typedef CallChainOfFunctionPointersWithContext<const GattWriteCallbackParams*> WriteCallbackChain_t;
+    typedef void (*WriteCallback_t)(const GattWriteCallbackParams *params);
 
-    typedef FunctionPointerWithContext<const GattHVXCallbackParams*> HVXCallback_t;
-    typedef CallChainOfFunctionPointersWithContext<const GattHVXCallbackParams*> HVXCallbackChain_t;
+    typedef void (*HVXCallback_t)(const GattHVXCallbackParams *params);
 
     /*
      * The following functions are meant to be overridden in the platform-specific sub-class.
@@ -246,42 +241,18 @@
     /* Event callback handlers. */
 public:
     /**
-     * Set up a callback for read response events. 
-     * It is possible to remove registered callbacks using 
-     * onDataRead().detach(callbackToRemove)
+     * Set up a callback for read response events.
      */
     void onDataRead(ReadCallback_t callback) {
-        onDataReadCallbackChain.add(callback);
-    }
-
-    /**
-     * @brief provide access to the callchain of read callbacks
-     * It is possible to register callbacks using onDataRead().add(callback);
-     * It is possible to unregister callbacks using onDataRead().detach(callback) 
-     * @return The read callbacks chain
-     */
-    ReadCallbackChain_t& onDataRead() {
-        return onDataReadCallbackChain;
+        onDataReadCallback = callback;
     }
 
     /**
      * Set up a callback for write response events.
-     * It is possible to remove registered callbacks using 
-     * onDataWritten().detach(callbackToRemove).
      * @Note: Write commands (issued using writeWoResponse) don't generate a response.
      */
     void onDataWritten(WriteCallback_t callback) {
-        onDataWriteCallbackChain.add(callback);
-    }
-
-    /**
-     * @brief provide access to the callchain of data written callbacks
-     * It is possible to register callbacks using onDataWritten().add(callback);
-     * It is possible to unregister callbacks using onDataWritten().detach(callback) 
-     * @return The data written callbacks chain
-     */
-    WriteCallbackChain_t& onDataWritten() { 
-        return onDataWriteCallbackChain;
+        onDataWriteCallback = callback;
     }
 
     /**
@@ -308,21 +279,9 @@
      * Set up a callback for when the GATT client receives an update event
      * corresponding to a change in the value of a characteristic on the remote
      * GATT server.
-     * It is possible to remove registered callbacks using onHVX().detach(callbackToRemove).
      */
     void onHVX(HVXCallback_t callback) {
-        onHVXCallbackChain.add(callback);
-    }
-
-
-    /**
-     * @brief provide access to the callchain of HVX callbacks
-     * It is possible to register callbacks using onHVX().add(callback);
-     * It is possible to unregister callbacks using onHVX().detach(callback) 
-     * @return The HVX callbacks chain
-     */
-    HVXCallbackChain_t& onHVX() { 
-        return onHVXCallbackChain;
+        onHVXCallback = callback;
     }
 
 protected:
@@ -333,23 +292,27 @@
     /* Entry points for the underlying stack to report events back to the user. */
 public:
     void processReadResponse(const GattReadCallbackParams *params) {
-        onDataReadCallbackChain(params);
+        if (onDataReadCallback) {
+            onDataReadCallback(params);
+        }
     }
 
     void processWriteResponse(const GattWriteCallbackParams *params) {
-        onDataWriteCallbackChain(params);
+        if (onDataWriteCallback) {
+            onDataWriteCallback(params);
+        }
     }
 
     void processHVXEvent(const GattHVXCallbackParams *params) {
-        if (onHVXCallbackChain) {
-            onHVXCallbackChain(params);
+        if (onHVXCallback) {
+            onHVXCallback(params);
         }
     }
 
 protected:
-    ReadCallbackChain_t  onDataReadCallbackChain;
-    WriteCallbackChain_t onDataWriteCallbackChain;
-    HVXCallbackChain_t   onHVXCallbackChain;
+    ReadCallback_t  onDataReadCallback;
+    WriteCallback_t onDataWriteCallback;
+    HVXCallback_t   onHVXCallback;
 
 private:
     /* Disallow copy and assignment. */