From e5d91932fdcf2f5185e1285049d17fa49040f998 Mon Sep 17 00:00:00 2001 From: Vincent Coubard Date: Thu, 17 May 2018 10:26:04 +0100 Subject: [PATCH] BLE: Revert address type changes. The changes made to BLEProtocol::AddressType was not entirelly backward compatible as BLEProtocol::AddressType split random addresses in three category while the type RANDOM is a superset of these types. --- features/FEATURE_BLE/ble/BLEProtocol.h | 20 +------------------- features/FEATURE_BLE/ble/Gap.h | 3 --- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/features/FEATURE_BLE/ble/BLEProtocol.h b/features/FEATURE_BLE/ble/BLEProtocol.h index 63a61bc1eb..cce3e24c49 100644 --- a/features/FEATURE_BLE/ble/BLEProtocol.h +++ b/features/FEATURE_BLE/ble/BLEProtocol.h @@ -87,25 +87,7 @@ namespace BLEProtocol { * on RANDOM instead. Use Gap::getRandomAddressType to retrieve the * type of the random address. */ - RANDOM_PRIVATE_NON_RESOLVABLE, - - /** - * Random address. - * - * Use Gap::getRandomAddressType to retrieve the type of the random - * address. - */ - RANDOM, - - /** - * A Public address used as a device identity address. - */ - PUBLIC_IDENTITY, - - /** - * A Random static address used as a device identity address. - */ - RANDOM_STATIC_IDENTITY + RANDOM_PRIVATE_NON_RESOLVABLE }; }; diff --git a/features/FEATURE_BLE/ble/Gap.h b/features/FEATURE_BLE/ble/Gap.h index 052931b801..9818a40141 100644 --- a/features/FEATURE_BLE/ble/Gap.h +++ b/features/FEATURE_BLE/ble/Gap.h @@ -294,9 +294,6 @@ public: */ enum DeprecatedAddressType_t { ADDR_TYPE_PUBLIC = BLEProtocol::AddressType::PUBLIC, - ADDR_TYPE_RANDOM = BLEProtocol::AddressType::RANDOM, - ADDR_TYPE_PUBLIC_IDENTITY = BLEProtocol::AddressType::PUBLIC_IDENTITY, - ADDR_TYPE_RANDOM_STATIC_IDENTITY = BLEProtocol::AddressType::RANDOM_STATIC_IDENTITY, ADDR_TYPE_RANDOM_STATIC = BLEProtocol::AddressType::RANDOM_STATIC, ADDR_TYPE_RANDOM_PRIVATE_RESOLVABLE = BLEProtocol::AddressType::RANDOM_PRIVATE_RESOLVABLE, ADDR_TYPE_RANDOM_PRIVATE_NON_RESOLVABLE = BLEProtocol::AddressType::RANDOM_PRIVATE_NON_RESOLVABLE