From 7c8a75466771c4616306e981475344fdb60ff828 Mon Sep 17 00:00:00 2001
From: Vincent Coubard <vincent.coubard@arm.com>
Date: Wed, 23 Sep 2020 15:05:21 +0100
Subject: [PATCH] BLE: Remove set advertising timeout from SM pal

---
 .../source/cordio/source/PalSecurityManagerImpl.cpp  | 12 ------------
 .../source/cordio/source/PalSecurityManagerImpl.h    |  9 ---------
 .../source/generic/SecurityManagerImpl.cpp           |  5 ++++-
 .../FEATURE_BLE/source/pal/PalSecurityManager.h      |  8 --------
 4 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/connectivity/FEATURE_BLE/source/cordio/source/PalSecurityManagerImpl.cpp b/connectivity/FEATURE_BLE/source/cordio/source/PalSecurityManagerImpl.cpp
index 993bb4d482..42c8b668fe 100644
--- a/connectivity/FEATURE_BLE/source/cordio/source/PalSecurityManagerImpl.cpp
+++ b/connectivity/FEATURE_BLE/source/cordio/source/PalSecurityManagerImpl.cpp
@@ -207,18 +207,6 @@ ble_error_t PalSecurityManager::encrypt_data(
     return BLE_ERROR_NOT_IMPLEMENTED;
 }
 
-////////////////////////////////////////////////////////////////////////////
-// Privacy
-//
-
-
-ble_error_t PalSecurityManager::set_private_address_timeout(
-    uint16_t timeout_in_seconds
-)
-{
-    DmPrivSetResolvablePrivateAddrTimeout(timeout_in_seconds);
-    return BLE_ERROR_NONE;
-}
 
 ////////////////////////////////////////////////////////////////////////////
 // Keys
diff --git a/connectivity/FEATURE_BLE/source/cordio/source/PalSecurityManagerImpl.h b/connectivity/FEATURE_BLE/source/cordio/source/PalSecurityManagerImpl.h
index e38e37431e..7f0100610c 100644
--- a/connectivity/FEATURE_BLE/source/cordio/source/PalSecurityManagerImpl.h
+++ b/connectivity/FEATURE_BLE/source/cordio/source/PalSecurityManagerImpl.h
@@ -174,15 +174,6 @@ public:
         encryption_block_t &data
     ) final;
 
-    ////////////////////////////////////////////////////////////////////////////
-    // Privacy
-    //
-
-    /**
-     * @see ::ble::PalSecurityManager::set_private_address_timeout
-     */
-    ble_error_t set_private_address_timeout(uint16_t timeout_in_seconds) final;
-
     ////////////////////////////////////////////////////////////////////////////
     // Keys
     //
diff --git a/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.cpp b/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.cpp
index 3f3427e8d5..787862fc5e 100644
--- a/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.cpp
+++ b/connectivity/FEATURE_BLE/source/generic/SecurityManagerImpl.cpp
@@ -743,7 +743,10 @@ ble_error_t SecurityManager::getSigningKey(connection_handle_t connection, bool
 ble_error_t SecurityManager::setPrivateAddressTimeout(uint16_t timeout_in_seconds)
 {
     if (!_db) return BLE_ERROR_INITIALIZATION_INCOMPLETE;
-    return _pal.set_private_address_timeout(timeout_in_seconds);
+    _private_address_controller.set_timeout(
+        resolvable_address_timeout_t(timeout_in_seconds)
+    );
+    return BLE_ERROR_NONE;
 }
 
 ////////////////////////////////////////////////////////////////////////////
diff --git a/connectivity/FEATURE_BLE/source/pal/PalSecurityManager.h b/connectivity/FEATURE_BLE/source/pal/PalSecurityManager.h
index 99caec6d8e..6f01fd7a20 100644
--- a/connectivity/FEATURE_BLE/source/pal/PalSecurityManager.h
+++ b/connectivity/FEATURE_BLE/source/pal/PalSecurityManager.h
@@ -753,14 +753,6 @@ public:
         encryption_block_t &data
     ) = 0;
 
-    ////////////////////////////////////////////////////////////////////////////
-    // Privacy
-    //
-
-    virtual ble_error_t set_private_address_timeout(
-        uint16_t timeout_in_seconds
-    ) = 0;
-
     ////////////////////////////////////////////////////////////////////////////
     // Keys
     //