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

Merge pull request #5426 from pan-/fix_hvx_handling 

BLE: Fix initialization of GattHVXCallbackParams in Nordic port.
pull/5160/merge
Martin Kojtal 2017-11-09 16:30:24 +00:00 committed by GitHub
parent 242c8700a6 b0094ac0d3
commit dbda1b159c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle_discovery.cpp
View File

@ -87,12 +87,13 @@ void bleGattcEventHandler(const ble_evt_t *p_ble_evt)
break; break;
case BLE_GATTC_EVT_HVX: { case BLE_GATTC_EVT_HVX: {
GattHVXCallbackParams params; GattHVXCallbackParams params = {
/* params.connHandle = */ p_ble_evt->evt.gattc_evt.conn_handle; /* connHandle = */ p_ble_evt->evt.gattc_evt.conn_handle,
/* params.handle = */ p_ble_evt->evt.gattc_evt.params.hvx.handle; /* handle = */ p_ble_evt->evt.gattc_evt.params.hvx.handle,
/* params.type = */ static_cast<HVXType_t>(p_ble_evt->evt.gattc_evt.params.hvx.type); /* type = */ static_cast<HVXType_t>(p_ble_evt->evt.gattc_evt.params.hvx.type),
/* params.len = */ p_ble_evt->evt.gattc_evt.params.hvx.len; /* len = */ p_ble_evt->evt.gattc_evt.params.hvx.len,
/* params.data = */ p_ble_evt->evt.gattc_evt.params.hvx.data; /* data = */ p_ble_evt->evt.gattc_evt.params.hvx.data
};
gattClient.processHVXEvent(&params); gattClient.processHVXEvent(&params);
} }

13
features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle_discovery.cpp
View File

@ -87,12 +87,13 @@ void bleGattcEventHandler(const ble_evt_t *p_ble_evt)
break; break;
case BLE_GATTC_EVT_HVX: { case BLE_GATTC_EVT_HVX: {
GattHVXCallbackParams params; GattHVXCallbackParams params = {
/* params.connHandle = */ p_ble_evt->evt.gattc_evt.conn_handle; /* connHandle = */ p_ble_evt->evt.gattc_evt.conn_handle,
/* params.handle = */ p_ble_evt->evt.gattc_evt.params.hvx.handle; /* handle = */ p_ble_evt->evt.gattc_evt.params.hvx.handle,
/* params.type = */ static_cast<HVXType_t>(p_ble_evt->evt.gattc_evt.params.hvx.type); /* type = */ static_cast<HVXType_t>(p_ble_evt->evt.gattc_evt.params.hvx.type),
/* params.len = */ p_ble_evt->evt.gattc_evt.params.hvx.len; /* len = */ p_ble_evt->evt.gattc_evt.params.hvx.len,
/* params.data = */ p_ble_evt->evt.gattc_evt.params.hvx.data; /* data = */ p_ble_evt->evt.gattc_evt.params.hvx.data
};
gattClient.processHVXEvent(&params); gattClient.processHVXEvent(&params);
} }