From 1e6851e6e94f8b4e11942bdcb4be64e98ce04d88 Mon Sep 17 00:00:00 2001 From: Vincent Coubard Date: Wed, 17 Jan 2018 12:30:26 +0000 Subject: [PATCH] BLE: Fix signature of get_secure_connections_support in implementations. --- .../targets/TARGET_CORDIO/CordioPalSecurityManager.h | 2 +- .../targets/TARGET_CORDIO/source/CordioPalSecurityManager.cpp | 2 +- .../TARGET_NRF5/source/nRF5xPalSecurityManager.cpp | 4 ++-- .../TARGET_NRF5/source/nRF5xPalSecurityManager.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/features/FEATURE_BLE/targets/TARGET_CORDIO/CordioPalSecurityManager.h b/features/FEATURE_BLE/targets/TARGET_CORDIO/CordioPalSecurityManager.h index 6d17cafad3..4810353e41 100644 --- a/features/FEATURE_BLE/targets/TARGET_CORDIO/CordioPalSecurityManager.h +++ b/features/FEATURE_BLE/targets/TARGET_CORDIO/CordioPalSecurityManager.h @@ -98,7 +98,7 @@ public: * @see ::ble::pal::SecurityManager::get_secure_connections_support */ virtual ble_error_t get_secure_connections_support( - bool &enabled, bool &secure_connections_only + bool &enabled ); //////////////////////////////////////////////////////////////////////////// diff --git a/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioPalSecurityManager.cpp b/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioPalSecurityManager.cpp index d03737bb1b..3185103731 100644 --- a/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioPalSecurityManager.cpp +++ b/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioPalSecurityManager.cpp @@ -95,7 +95,7 @@ ble_error_t CordioSecurityManager::set_secure_connections_support( } ble_error_t CordioSecurityManager::get_secure_connections_support( - bool &enabled, bool &secure_connections_only + bool &enabled ) { return BLE_ERROR_NOT_IMPLEMENTED; } diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xPalSecurityManager.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xPalSecurityManager.cpp index 121ad6ecd2..65e14472c7 100644 --- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xPalSecurityManager.cpp +++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xPalSecurityManager.cpp @@ -92,7 +92,7 @@ ble_error_t nRF5xSecurityManager::set_secure_connections_support( } ble_error_t nRF5xSecurityManager::get_secure_connections_support( - bool &enabled, bool &secure_connections_only + bool &enabled ) { return BLE_ERROR_NOT_IMPLEMENTED; } @@ -264,7 +264,7 @@ nRF5xSecurityManager& nRF5xSecurityManager::get_security_manager() bool nRF5xSecurityManager::sm_handler() { - + return false; } } // nordic diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xPalSecurityManager.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xPalSecurityManager.h index 61dcb6efeb..d534d0b44f 100644 --- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xPalSecurityManager.h +++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xPalSecurityManager.h @@ -96,7 +96,7 @@ public: * @see ::ble::pal::SecurityManager::get_secure_connections_support */ virtual ble_error_t get_secure_connections_support( - bool &enabled, bool &secure_connections_only + bool &enabled ); ////////////////////////////////////////////////////////////////////////////