ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix rebase mistakes.

pull/9790/head
Vincent Coubard 2019-02-27 22:15:06 +00:00
parent cd2501bb64
commit ba9aa6b641
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features/FEATURE_BLE/ble/generic/GenericGap.h
View File

@ -131,7 +131,7 @@ public:
, pal::GenericAccessService &generic_access_service , pal::GenericAccessService &generic_access_service
#endif #endif
#if BLE_FEATURE_SECURITY #if BLE_FEATURE_SECURITY
PalSecurityManager &pal_sm , PalSecurityManager &pal_sm
#endif #endif
); );

22
features/FEATURE_BLE/ble/pal/PalSecurityManager.h
View File

@ -527,10 +527,12 @@ public:
* @param[in] connection connection handle * @param[in] connection connection handle
* @param[in] irk identity resolution key * @param[in] irk identity resolution key
*/ */
virtual void on_keys_distributed_irk( void on_keys_distributed_irk(
connection_handle_t connection, connection_handle_t connection,
const irk_t &irk const irk_t &irk
) = 0; ) {
impl()->on_keys_distributed_irk_(connection, irk);
}
#endif // BLE_FEATURE_PRIVACY #endif // BLE_FEATURE_PRIVACY
/** /**
@ -540,11 +542,17 @@ public:
* @param[in] peer_identity_address_type public or private address indication * @param[in] peer_identity_address_type public or private address indication
* @param[in] peer_identity_address peer address * @param[in] peer_identity_address peer address
*/ */
virtual void on_keys_distributed_bdaddr( void on_keys_distributed_bdaddr(
connection_handle_t connection, connection_handle_t connection,
advertising_peer_address_type_t peer_identity_address_type, advertising_peer_address_type_t peer_identity_address_type,
const address_t &peer_identity_address const address_t &peer_identity_address
) = 0; ) {
impl()->on_keys_distributed_bdaddr_(
connection,
peer_identity_address_type,
peer_identity_address
);
}
#if BLE_FEATURE_SIGNING #if BLE_FEATURE_SIGNING
/** /**
@ -553,10 +561,12 @@ public:
* @param[in] connection connection handle * @param[in] connection connection handle
* @param[in] csrk signing key * @param[in] csrk signing key
*/ */
virtual void on_keys_distributed_csrk( void on_keys_distributed_csrk(
connection_handle_t connection, connection_handle_t connection,
const csrk_t &csrk const csrk_t &csrk
) = 0; ) {
impl()->on_keys_distributed_csrk(connection, csrk);
}
#endif // BLE_FEATURE_SIGNING #endif // BLE_FEATURE_SIGNING
/** /**

3
features/FEATURE_BLE/source/LegacyGap.tpp
View File

@ -600,7 +600,6 @@ void LegacyGap<Impl>::onDisconnection(DisconnectionEventCallback_t callback)
{ {
disconnectionCallChain.add(callback); disconnectionCallChain.add(callback);
} }
#endif // BLE_FEATURE_CONNECTION
template<class Impl> template<class Impl>
typename LegacyGap<Impl>::DisconnectionEventCallbackChain_t& LegacyGap<Impl>::onDisconnection() typename LegacyGap<Impl>::DisconnectionEventCallbackChain_t& LegacyGap<Impl>::onDisconnection()
@ -1056,7 +1055,7 @@ ble_error_t LegacyGap<Impl>::reset_(void)
#if BLE_ROLE_OBSERVER #if BLE_ROLE_OBSERVER
onAdvertisementReport = NULL; onAdvertisementReport = NULL;
#endif #endif
_eventHandler = NULL; this->_eventHandler = NULL;
return BLE_ERROR_NONE; return BLE_ERROR_NONE;
} }

5
features/FEATURE_BLE/source/gap/Gap.tpp
View File

@ -25,6 +25,7 @@ bool Gap<Impl>::isFeatureSupported(controller_supported_features_t feature)
return impl()->isFeatureSupported_(feature); return impl()->isFeatureSupported_(feature);
} }
#if BLE_ROLE_BROADCASTER
template<class Impl> template<class Impl>
uint8_t Gap<Impl>::getMaxAdvertisingSetNumber() uint8_t Gap<Impl>::getMaxAdvertisingSetNumber()
{ {
@ -479,7 +480,6 @@ bool Gap<Impl>::isFeatureSupported_(controller_supported_features_t feature)
return false; return false;
} }
#if BLE_ROLE_BROADCASTER
template<class Impl> template<class Impl>
uint8_t Gap<Impl>::getMaxAdvertisingSetNumber_() uint8_t Gap<Impl>::getMaxAdvertisingSetNumber_()
{ {
@ -694,7 +694,6 @@ uint8_t Gap<Impl>::getMaxPeriodicAdvertiserListSize_()
return 0; return 0;
} }
#if BLE_ROLE_CENTRAL
template<class Impl> template<class Impl>
ble_error_t Gap<Impl>::connect_( ble_error_t Gap<Impl>::connect_(
peer_address_type_t peerAddressType, peer_address_type_t peerAddressType,
@ -710,9 +709,7 @@ ble_error_t Gap<Impl>::cancelConnect_()
{ {
return BLE_ERROR_NOT_IMPLEMENTED; return BLE_ERROR_NOT_IMPLEMENTED;
} }
#endif // BLE_ROLE_CENTRAL
#if BLE_FEATURE_CONNECTABLE
template<class Impl> template<class Impl>
ble_error_t Gap<Impl>::updateConnectionParameters_( ble_error_t Gap<Impl>::updateConnectionParameters_(
connection_handle_t connectionHandle, connection_handle_t connectionHandle,