BLE: replace legacy address types (BLEProtocol) with new ones

Author: LDong-Arm

features/FEATURE_BLE/ble/gap/AdvertisingParameters.h

@@ -20,7 +20,6 @@
 #include <algorithm>
 
 #include "BLETypes.h"
-#include "BLEProtocol.h"
 #include "blecommon.h"
 #include "SafeEnum.h"
 

features/FEATURE_BLE/ble/gap/Gap.h

@@ -1347,8 +1347,7 @@ class Gap : public StaticInterface<Impl, Gap> {
      * @return BLE_ERROR_NONE if the implementation's whitelist was successfully
      * populated with the addresses in the given whitelist.
      *
-     * @note The whitelist must not contain addresses of type @ref
-     * BLEProtocol::AddressType::RANDOM_PRIVATE_NON_RESOLVABLE. This
+     * @note The whitelist must not contain non-resolvable addresses. This
      * results in a @ref BLE_ERROR_INVALID_PARAM because the remote peer might
      * change its private address at any time, and it is not possible to resolve
      * it.
@@ -1372,8 +1371,8 @@ class Gap : public StaticInterface<Impl, Gap> {
      * @return BLE_ERROR_NONE on success.
      */
     ble_error_t getAddress(
-        BLEProtocol::AddressType_t *typeP,
-        BLEProtocol::AddressBytes_t address
+        own_address_type_t &typeP,
+        address_t &address
     );
 
     /**
@@ -1388,7 +1387,7 @@ class Gap : public StaticInterface<Impl, Gap> {
      * the address in input was not identifiable as a random address.
      */
     static ble_error_t getRandomAddressType(
-        const BLEProtocol::AddressBytes_t address,
+        const ble::address_t address,
         ble::random_address_type_t *addressType
     );
 
@@ -1604,8 +1603,8 @@ class Gap : public StaticInterface<Impl, Gap> {
     ble_error_t setWhitelist_(const whitelist_t &whitelist);
 
     ble_error_t getAddress_(
-        BLEProtocol::AddressType_t *typeP,
-        BLEProtocol::AddressBytes_t address
+        own_address_type_t &typeP,
+        address_t &address
     );
 
     /* Note: Implementation must call the base class reset_ */

features/FEATURE_BLE/ble/generic/GenericGap.h

@@ -19,7 +19,6 @@
 
 #include <algorithm>
 
-#include "ble/BLEProtocol.h"
 #include "ble/Gap.h"
 #include "ble/pal/PalGap.h"
 #include "ble/pal/GapEvents.h"
@@ -75,7 +74,6 @@ class GenericGap :
     using Gap::default_peripheral_privacy_configuration;
     using Gap::default_central_privacy_configuration;
 
-    typedef typename BLEProtocol::AddressBytes_t Address_t;
     typedef typename ble::whitelist_t whitelist_t;
     typedef typename Gap::ConnectionParams_t ConnectionParams_t;
 
@@ -291,8 +289,8 @@ class GenericGap :
      * @see Gap::getAddress
      */
     ble_error_t getAddress_(
-        BLEProtocol::AddressType_t *type,
-        BLEProtocol::AddressBytes_t address
+        own_address_type_t &type,
+        address_t &address
     );
 
     /**
@@ -405,12 +403,12 @@ class GenericGap :
     );
 
     ble_error_t getAddress(
-        BLEProtocol::AddressType_t *typeP,
-        BLEProtocol::AddressBytes_t address
+        own_address_type_t &typeP,
+        address_t &address
     );
 
     static ble_error_t getRandomAddressType(
-        const BLEProtocol::AddressBytes_t address,
+        const ble::address_t address,
         ble::random_address_type_t *addressType
     );
 
@@ -580,7 +578,7 @@ class GenericGap :
     PalGap &_pal_gap;
     pal::GenericAccessService &_gap_service;
     PalSecurityManager &_pal_sm;
-    BLEProtocol::AddressType_t _address_type;
+    ble::own_address_type_t _address_type;
     ble::address_t _address;
     pal::initiator_policy_t _initiator_policy_mode;
     pal::scanning_filter_policy_t _scanning_filter_policy;

features/FEATURE_BLE/ble/generic/GenericSecurityManager.h

@@ -433,9 +433,9 @@ class GenericSecurityManager :
         connection_handle_t connection,
         connection_role_t role,
         peer_address_type_t peer_address_type,
-        const BLEProtocol::AddressBytes_t peer_address,
-        BLEProtocol::AddressType_t local_address_type,
-        const BLEProtocol::AddressBytes_t local_address,
+        address_t peer_address,
+        own_address_type_t local_address_type,
+        address_t local_address,
         const ::Gap::ConnectionParams_t *connection_params
     );
 

features/FEATURE_BLE/ble/generic/SecurityDb.h

@@ -597,16 +597,12 @@ class SecurityDb {
                 continue;
             }
 
-            memcpy(
-                whitelist->addresses[whitelist->size].address,
-                identity->identity_address.data(),
-                sizeof(BLEProtocol::AddressBytes_t)
-            );
+            whitelist->addresses[whitelist->size].address = identity->identity_address;
 
             if (identity->identity_address_is_public) {
-                whitelist->addresses[whitelist->size].type = BLEProtocol::AddressType::PUBLIC;
+                whitelist->addresses[whitelist->size].type = peer_address_type_t::PUBLIC_IDENTITY;
             } else {
-                whitelist->addresses[whitelist->size].type = BLEProtocol::AddressType::RANDOM_STATIC;
+                whitelist->addresses[whitelist->size].type = peer_address_type_t::RANDOM_STATIC_IDENTITY;
             }
 
             whitelist->size++;

features/FEATURE_BLE/ble/pal/ConnectionEventMonitor.h

@@ -17,7 +17,6 @@
 #ifndef MBED_BLE_CONNECTION_EVENT_MONITOR
 #define MBED_BLE_CONNECTION_EVENT_MONITOR
 
-#include "ble/BLEProtocol.h"
 #include "ble/Gap.h"
 #include "ble/BLETypes.h"
 
@@ -53,9 +52,9 @@ class ConnectionEventMonitorEventHandler {
         connection_handle_t connection,
         connection_role_t role,
         ble::peer_address_type_t peer_address_type,
-        const BLEProtocol::AddressBytes_t peer_address,
-        BLEProtocol::AddressType_t local_address_type,
-        const BLEProtocol::AddressBytes_t local_address,
+        address_t peer_address,
+        own_address_type_t local_address_type,
+        const address_t local_address,
         const ::Gap::ConnectionParams_t *connection_params
     ) {
         self()->on_connected_(

features/FEATURE_BLE/ble/pal/PalSecurityManager.h

@@ -21,7 +21,6 @@
 #include "platform/Callback.h"
 #include "platform/NonCopyable.h"
 #include "ble/BLETypes.h"
-#include "ble/BLEProtocol.h"
 #include "ble/SecurityManager.h"
 #include "ble/pal/GapTypes.h"
 

features/FEATURE_BLE/source/gap/Gap.tpp

@@ -872,8 +872,8 @@ ble_error_t Gap<Impl>::getCentralPrivacyConfiguration_(
 
 template<class Impl>
 ble_error_t Gap<Impl>::getAddress(
-    BLEProtocol::AddressType_t *typeP,
-    BLEProtocol::AddressBytes_t address
+    own_address_type_t &typeP,
+    address_t &address
 ) {
     return impl()->getAddress_(typeP, address);
 }