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

fixed non-matching types

pull/6188/head
paul-szczepanek-arm 2018-01-19 10:44:48 +00:00
parent c3b434b3a2
commit 8b36d5ed65
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp
View File

@ -38,6 +38,7 @@ using ble::pal::AuthenticationMask;
using ble::pal::KeyDistribution; using ble::pal::KeyDistribution;
using ble::pairing_failure_t; using ble::pairing_failure_t;
using ble::pal::PasskeyAsci; using ble::pal::PasskeyAsci;
using ble::pal::passkey_num_t;
typedef SecurityManager::SecurityIOCapabilities_t SecurityIOCapabilities_t; typedef SecurityManager::SecurityIOCapabilities_t SecurityIOCapabilities_t;
/* separate structs to allow db implementation to minimise memory usage */ /* separate structs to allow db implementation to minimise memory usage */
@ -503,9 +504,9 @@ public:
// //
void on_passkey_display(connection_handle_t connection, void on_passkey_display(connection_handle_t connection,
const SecurityManager::Passkey_t passkey) { const passkey_num_t passkey) {
if (_app_event_handler) { if (_app_event_handler) {
_app_event_handler->passkeyDisplay(connection, passkey); _app_event_handler->passkeyDisplay(connection, PasskeyAsci(passkey).asci);
} }
} }
@ -547,7 +548,7 @@ public:
void on_keys_distributed(connection_handle_t connection, void on_keys_distributed(connection_handle_t connection,
advertising_peer_address_type_t peer_address_type, advertising_peer_address_type_t peer_address_type,
address_t &peer_identity_address, const address_t &peer_identity_address,
const ediv_t ediv, const ediv_t ediv,
const rand_t rand, const rand_t rand,
const ltk_t ltk, const ltk_t ltk,