Skip to content

Commit e5d9193

Browse files
committed
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.
1 parent b845a9d commit e5d9193

File tree

2 files changed

+1
-22
lines changed

2 files changed

+1
-22
lines changed

features/FEATURE_BLE/ble/BLEProtocol.h

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -87,25 +87,7 @@ namespace BLEProtocol {
8787
* on RANDOM instead. Use Gap::getRandomAddressType to retrieve the
8888
* type of the random address.
8989
*/
90-
RANDOM_PRIVATE_NON_RESOLVABLE,
91-
92-
/**
93-
* Random address.
94-
*
95-
* Use Gap::getRandomAddressType to retrieve the type of the random
96-
* address.
97-
*/
98-
RANDOM,
99-
100-
/**
101-
* A Public address used as a device identity address.
102-
*/
103-
PUBLIC_IDENTITY,
104-
105-
/**
106-
* A Random static address used as a device identity address.
107-
*/
108-
RANDOM_STATIC_IDENTITY
90+
RANDOM_PRIVATE_NON_RESOLVABLE
10991
};
11092
};
11193

features/FEATURE_BLE/ble/Gap.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,9 +294,6 @@ class Gap {
294294
*/
295295
enum DeprecatedAddressType_t {
296296
ADDR_TYPE_PUBLIC = BLEProtocol::AddressType::PUBLIC,
297-
ADDR_TYPE_RANDOM = BLEProtocol::AddressType::RANDOM,
298-
ADDR_TYPE_PUBLIC_IDENTITY = BLEProtocol::AddressType::PUBLIC_IDENTITY,
299-
ADDR_TYPE_RANDOM_STATIC_IDENTITY = BLEProtocol::AddressType::RANDOM_STATIC_IDENTITY,
300297
ADDR_TYPE_RANDOM_STATIC = BLEProtocol::AddressType::RANDOM_STATIC,
301298
ADDR_TYPE_RANDOM_PRIVATE_RESOLVABLE = BLEProtocol::AddressType::RANDOM_PRIVATE_RESOLVABLE,
302299
ADDR_TYPE_RANDOM_PRIVATE_NON_RESOLVABLE = BLEProtocol::AddressType::RANDOM_PRIVATE_NON_RESOLVABLE

0 commit comments

Comments
 (0)