BLE: use up-to-date structs for disconnections

Author: LDong-Arm

features/FEATURE_BLE/ble/generic/GenericSecurityManager.h

@@ -431,7 +431,7 @@ class GenericSecurityManager :
      */
     void on_connected_(
         connection_handle_t connection,
-        ::Gap::Role_t role,
+        connection_role_t role,
         peer_address_type_t peer_address_type,
         const BLEProtocol::AddressBytes_t peer_address,
         BLEProtocol::AddressType_t local_address_type,
@@ -448,7 +448,7 @@ class GenericSecurityManager :
      */
     void on_disconnected_(
         connection_handle_t connection,
-        ::Gap::DisconnectionReason_t reason
+        disconnection_reason_t reason
     );
 
     /**

features/FEATURE_BLE/ble/pal/ConnectionEventMonitor.h

@@ -51,7 +51,7 @@ class ConnectionEventMonitorEventHandler {
      */
     void on_connected(
         connection_handle_t connection,
-        ::Gap::Role_t role,
+        connection_role_t role,
         ble::peer_address_type_t peer_address_type,
         const BLEProtocol::AddressBytes_t peer_address,
         BLEProtocol::AddressType_t local_address_type,
@@ -77,7 +77,7 @@ class ConnectionEventMonitorEventHandler {
      */
     void on_disconnected(
         connection_handle_t connection,
-        ::Gap::DisconnectionReason_t reason
+        ble::disconnection_reason_t reason
     ) {
         self()->on_disconnected_(connection, reason);
     }

features/FEATURE_BLE/ble/pal/GapTypes.h

@@ -228,7 +228,9 @@ struct hci_error_code_t : SafeEnum<hci_error_code_t, uint8_t> {
 };
 
 
-typedef ble::local_disconnection_reason_t disconnection_reason_t;
+typedef ble::local_disconnection_reason_t local_disconnection_reason_t;
+
+typedef ble::disconnection_reason_t disconnection_reason_t;
 
 typedef ble::advertising_filter_policy_t advertising_filter_policy_t;
 

features/FEATURE_BLE/ble/pal/PalGap.h

@@ -1881,7 +1881,7 @@ struct Gap {
      */
     ble_error_t disconnect(
         connection_handle_t connection,
-        disconnection_reason_t disconnection_reason
+        local_disconnection_reason_t disconnection_reason
     ) {
         return impl()->disconnect_(connection, disconnection_reason);
     }

features/FEATURE_BLE/source/generic/GenericSecurityManager.tpp

@@ -1104,7 +1104,7 @@ void GenericSecurityManager<TPalSecurityManager, SigningMonitor>::set_mitm_perfo
 template<template<class> class TPalSecurityManager, template<class> class SigningMonitor>
 void GenericSecurityManager<TPalSecurityManager, SigningMonitor>::on_connected_(
     connection_handle_t connection,
-    ::Gap::Role_t role,
+    connection_role_t role,
     peer_address_type_t peer_address_type,
     const BLEProtocol::AddressBytes_t peer_address,
     BLEProtocol::AddressType_t local_address_type,
@@ -1120,7 +1120,7 @@ void GenericSecurityManager<TPalSecurityManager, SigningMonitor>::on_connected_(
 
     // setup the control block
     cb->local_address = local_address;
-    cb->is_master = (role == ::Gap::CENTRAL);
+    cb->is_master = (role == connection_role_t::CENTRAL);
 
     // get the associated db handle and the distribution flags if any
     cb->db_entry = _db->open_entry(peer_address_type, peer_address);
@@ -1150,7 +1150,7 @@ void GenericSecurityManager<TPalSecurityManager, SigningMonitor>::on_connected_(
 template<template<class> class TPalSecurityManager, template<class> class SigningMonitor>
 void GenericSecurityManager<TPalSecurityManager, SigningMonitor>::on_disconnected_(
     connection_handle_t connection,
-    ::Gap::DisconnectionReason_t reason
+    disconnection_reason_t reason
 ) {
 #if BLE_FEATURE_SECURITY
     MBED_ASSERT(_db);

features/FEATURE_BLE/targets/TARGET_CORDIO/CordioPalGap.h

@@ -126,7 +126,7 @@ class Gap : public ::ble::pal::Gap<Gap<EH>, EH> {
 
     ble_error_t disconnect_(
         connection_handle_t connection,
-        disconnection_reason_t disconnection_reason
+        local_disconnection_reason_t disconnection_reason
     );
 
     bool is_privacy_supported_();

features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioPalGap.tpp

@@ -394,7 +394,7 @@ ble_error_t Gap<EventHandler>::reject_connection_parameter_request_(
 template<class EventHandler>
 ble_error_t Gap<EventHandler>::disconnect_(
     connection_handle_t connection,
-    disconnection_reason_t disconnection_reason
+    local_disconnection_reason_t disconnection_reason
 )
 {
     DmConnClose(