From 588e68bccfae641e91b7c9d9f2023815ee70b484 Mon Sep 17 00:00:00 2001
From: paul-szczepanek-arm
 <33840200+paul-szczepanek-arm@users.noreply.github.com>
Date: Tue, 19 Jun 2018 14:36:18 +0100
Subject: [PATCH 1/3] add setScanParams overload

---
 features/FEATURE_BLE/ble/Gap.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/features/FEATURE_BLE/ble/Gap.h b/features/FEATURE_BLE/ble/Gap.h
index aa7d2f6d74..b539b33520 100644
--- a/features/FEATURE_BLE/ble/Gap.h
+++ b/features/FEATURE_BLE/ble/Gap.h
@@ -2102,6 +2102,21 @@ public:
         return rc;
     }
 
+    /**
+     * Set the parameters used during a scan procedure.
+     *
+     * @param[in] scanningParams Parameter struct containing the interval, period,
+     * timeout and active scanning toggle.
+     *
+     * @return BLE_ERROR_NONE if the scan parameters were correctly set.
+     *
+     * @note All restrictions from setScanParams(uint16_t, uint16_t, uint16_t, bool) apply.
+     */
+    ble_error_t setScanParams(GapScanningParams scanningParams) {
+        _scanningParams = scanningParams;
+        return BLE_ERROR_NONE;
+    }
+
     /**
      * Set the interval parameter used during scanning procedures.
      *

From 4b1ce49ee17b50f401bf74ea1becbb6f47f219a9 Mon Sep 17 00:00:00 2001
From: paul-szczepanek-arm
 <33840200+paul-szczepanek-arm@users.noreply.github.com>
Date: Tue, 19 Jun 2018 15:18:11 +0100
Subject: [PATCH 2/3] use sets to apply limits

---
 features/FEATURE_BLE/ble/Gap.h | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/features/FEATURE_BLE/ble/Gap.h b/features/FEATURE_BLE/ble/Gap.h
index b539b33520..2aa845d6a7 100644
--- a/features/FEATURE_BLE/ble/Gap.h
+++ b/features/FEATURE_BLE/ble/Gap.h
@@ -2112,9 +2112,16 @@ public:
      *
      * @note All restrictions from setScanParams(uint16_t, uint16_t, uint16_t, bool) apply.
      */
-    ble_error_t setScanParams(GapScanningParams scanningParams) {
-        _scanningParams = scanningParams;
-        return BLE_ERROR_NONE;
+    ble_error_t setScanParams(const GapScanningParams& scanningParams) {
+        ble_error_t rc;
+        if (((rc = _scanningParams.setInterval(scanningParams.getInterval())) == BLE_ERROR_NONE) &&
+            ((rc = _scanningParams.setWindow(scanningParams.getWindow()))     == BLE_ERROR_NONE) &&
+            ((rc = _scanningParams.setTimeout(scanningParams.getTimeout()))   == BLE_ERROR_NONE)) {
+            _scanningParams.setActiveScanning(scanningParams.getActiveScanning());
+            return BLE_ERROR_NONE;
+        }
+
+        return rc;
     }
 
     /**

From 399191fc9c47a026ea2e8604eb4bbd1587cca027 Mon Sep 17 00:00:00 2001
From: paul-szczepanek-arm
 <33840200+paul-szczepanek-arm@users.noreply.github.com>
Date: Wed, 20 Jun 2018 08:24:26 +0100
Subject: [PATCH 3/3] reuse existing call

---
 features/FEATURE_BLE/ble/Gap.h | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/features/FEATURE_BLE/ble/Gap.h b/features/FEATURE_BLE/ble/Gap.h
index 2aa845d6a7..e3b3518d63 100644
--- a/features/FEATURE_BLE/ble/Gap.h
+++ b/features/FEATURE_BLE/ble/Gap.h
@@ -2113,15 +2113,12 @@ public:
      * @note All restrictions from setScanParams(uint16_t, uint16_t, uint16_t, bool) apply.
      */
     ble_error_t setScanParams(const GapScanningParams& scanningParams) {
-        ble_error_t rc;
-        if (((rc = _scanningParams.setInterval(scanningParams.getInterval())) == BLE_ERROR_NONE) &&
-            ((rc = _scanningParams.setWindow(scanningParams.getWindow()))     == BLE_ERROR_NONE) &&
-            ((rc = _scanningParams.setTimeout(scanningParams.getTimeout()))   == BLE_ERROR_NONE)) {
-            _scanningParams.setActiveScanning(scanningParams.getActiveScanning());
-            return BLE_ERROR_NONE;
-        }
-
-        return rc;
+        return setScanParams(
+            scanningParams.getInterval(),
+            scanningParams.getWindow(),
+            scanningParams.getTimeout(),
+            scanningParams.getActiveScanning()
+        );
     }
 
     /**