From 5a87cfa13d51be0340d7c3e54ca8fb9741701a59 Mon Sep 17 00:00:00 2001 From: Donatien Garnier Date: Tue, 27 Nov 2018 01:33:36 +0000 Subject: [PATCH] Fix a few more rebasing issues --- .../TARGET_NORDIC_SOFTDEVICE/TARGET_NRF52/source/nRF5xGap.cpp | 2 +- .../TARGET_NRF52/source/nRF5xPalSecurityManager.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF52/source/nRF5xGap.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF52/source/nRF5xGap.cpp index 5c343eafa5..ae12ee7c27 100644 --- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF52/source/nRF5xGap.cpp +++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF52/source/nRF5xGap.cpp @@ -108,7 +108,7 @@ peer_address_type_t convert_nordic_address(bool identity, uint8_t address) { } peer_address_type_t convert_identity_address(advertising_peer_address_type_t address) { - if (address == advertising_peer_address_type_t::PUBLIC) { + if (address == advertising_peer_address_type_t::PUBLIC_ADDRESS) { return peer_address_type_t::PUBLIC_IDENTITY; } else { return peer_address_type_t::RANDOM_STATIC_IDENTITY; diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF52/source/nRF5xPalSecurityManager.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF52/source/nRF5xPalSecurityManager.cpp index a1d6b1e7e9..5eb1310bb4 100644 --- a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF52/source/nRF5xPalSecurityManager.cpp +++ b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF52/source/nRF5xPalSecurityManager.cpp @@ -1022,10 +1022,10 @@ bool nRF5xSecurityManager::sm_handler(const ble_evt_t *evt) ); advertising_peer_address_type_t - address_type(advertising_peer_address_type_t::PUBLIC); + address_type(advertising_peer_address_type_t::PUBLIC_ADDRESS); if (pairing_cb->peer_id_key.id_addr_info.addr_type) { - address_type = advertising_peer_address_type_t::RANDOM; + address_type = advertising_peer_address_type_t::RANDOM_ADDRESS; } handler->on_keys_distributed_bdaddr(