From 4ce0ed9c0cf7401473debd10026c2eeb1b27a55f Mon Sep 17 00:00:00 2001
From: Vincent Coubard <vincent.coubard@arm.com>
Date: Mon, 19 Feb 2018 17:46:41 +0000
Subject: [PATCH] BLE: Remove dependency of GenericSecurityManager towards gap.

---
 features/FEATURE_BLE/ble/generic/GenericSecurityManager.h | 8 ++++----
 .../FEATURE_BLE/source/generic/GenericSecurityManager.cpp | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/features/FEATURE_BLE/ble/generic/GenericSecurityManager.h b/features/FEATURE_BLE/ble/generic/GenericSecurityManager.h
index 48deb30cb9..4de2c787eb 100644
--- a/features/FEATURE_BLE/ble/generic/GenericSecurityManager.h
+++ b/features/FEATURE_BLE/ble/generic/GenericSecurityManager.h
@@ -21,7 +21,7 @@
 #include "ble/BLETypes.h"
 #include "ble/pal/SecurityDb.h"
 #include "platform/Callback.h"
-#include "ble/Gap.h"
+#include "ble/pal/ConnectionEventMonitor.h"
 #include "ble/generic/GenericGap.h"
 #include "ble/pal/PalSecurityManager.h"
 
@@ -237,10 +237,10 @@ public:
     GenericSecurityManager(
         pal::SecurityManager &palImpl,
         pal::SecurityDb &dbImpl,
-        GenericGap &gapImpl
+        pal::ConnectionEventMonitor &connMonitorImpl
     ) : _pal(palImpl),
         _db(dbImpl),
-        _gap(gapImpl),
+        _connection_monitor(connMonitorImpl),
         _default_authentication(0),
         _default_key_distribution(KeyDistribution::KEY_DISTRIBUTION_ALL),
         _pairing_authorisation_required(false),
@@ -433,7 +433,7 @@ private:
 private:
     pal::SecurityManager &_pal;
     pal::SecurityDb &_db;
-    GenericGap &_gap;
+    pal::ConnectionEventMonitor &_connection_monitor;
 
     AuthenticationMask _default_authentication;
     KeyDistribution _default_key_distribution;
diff --git a/features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp b/features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp
index b8f1c10edc..6d38ddc793 100644
--- a/features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp
+++ b/features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp
@@ -55,7 +55,7 @@ ble_error_t GenericSecurityManager::init(
         init_signing();
     }
 
-    _gap.set_connection_event_handler(this);
+    _connection_monitor.set_connection_event_handler(this);
 
     _pal.generate_public_key();