Diff: ble/Gap.h

Revision:

920:d18cff0c4b09

Parent:

919:c5b9fac295f5

Child:

921:ea542e6519bb

diff -r c5b9fac295f5 -r d18cff0c4b09 ble/Gap.h
--- a/ble/Gap.h	Thu Nov 26 12:52:04 2015 +0000
+++ b/ble/Gap.h	Thu Nov 26 12:52:04 2015 +0000
@@ -140,9 +140,8 @@
         return (durationInMillis * 1000) / UNIT_1_25_MS;
     }
 
-    typedef FunctionPointerWithContext<TimeoutSource_t> TimeoutEventCallback_t;
-    typedef CallChainOfFunctionPointersWithContext<TimeoutSource_t> TimeoutEventCallbackChain_t;
 
+    typedef void (*TimeoutEventCallback_t)(TimeoutSource_t source);
     typedef void (*ConnectionEventCallback_t)(const ConnectionCallbackParams_t *params);
     typedef void (*DisconnectionEventCallback_t)(const DisconnectionCallbackParams_t *params);
     typedef FunctionPointerWithContext<bool> RadioNotificationEventCallback_t;
@@ -894,13 +893,7 @@
      * Set up a callback for timeout events. Refer to TimeoutSource_t for
      * possible event types.
      */
-    void onTimeout(TimeoutEventCallback_t callback) {
-        timeoutCallbackChain.add(callback);
-    }
-
-    TimeoutEventCallbackChain_t& onTimeout() {
-        return timeoutCallbackChain;
-    }
+    void onTimeout(TimeoutEventCallback_t callback) {timeoutCallback = callback;}
 
     /**
      * Append to a chain of callbacks to be invoked upon GAP connection.
@@ -963,7 +956,7 @@
         _scanResponse(),
         state(),
         scanningActive(false),
-        timeoutCallbackChain(),
+        timeoutCallback(NULL),
         radioNotificationCallback(),
         onAdvertisementReport(),
         connectionCallChain(),
@@ -1009,8 +1002,8 @@
     }
 
     void processTimeoutEvent(TimeoutSource_t source) {
-        if (timeoutCallbackChain) {
-            timeoutCallbackChain(source);
+        if (timeoutCallback) {
+            timeoutCallback(source);
         }
     }
 
@@ -1024,7 +1017,7 @@
     bool                             scanningActive;
 
 protected:
-    TimeoutEventCallbackChain_t           timeoutCallbackChain;
+    TimeoutEventCallback_t           timeoutCallback;
     RadioNotificationEventCallback_t radioNotificationCallback;
     AdvertisementReportCallback_t    onAdvertisementReport;
     CallChainOfFunctionPointersWithContext<const ConnectionCallbackParams_t*>    connectionCallChain;