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

Nordic BLE: Use SD API version rather than SDK define.

pull/5739/head
Vincent Coubard 2018-01-08 14:00:23 +00:00
parent e9ba84168b
commit c5bc247217
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5XPalGattClient.cpp
View File

@ -185,7 +185,7 @@ ble_error_t nRF5XGattClient::exchange_mtu(connection_handle_t connection)
ble_error_t nRF5XGattClient::get_mtu_size( ble_error_t nRF5XGattClient::get_mtu_size(
connection_handle_t connection_handle, uint16_t& mtu_size connection_handle_t connection_handle, uint16_t& mtu_size
) { ) {
#ifdef TARGET_SDK13 #if (NRF_SD_BLE_API_VERSION >= 3)
// FIXME: implement when MTU size can be configured; the mtu size must be // FIXME: implement when MTU size can be configured; the mtu size must be
// stored locally when BLE_GATTC_EVT_EXCHANGE_MTU_RSP has been received // stored locally when BLE_GATTC_EVT_EXCHANGE_MTU_RSP has been received
mtu_size = BLE_GATT_MTU_SIZE_DEFAULT; mtu_size = BLE_GATT_MTU_SIZE_DEFAULT;
@ -1095,7 +1095,7 @@ struct nRF5XGattClient::DiscoverDescriptorsProcedure : RegularGattProcedure {
return response.count; return response.count;
} }
#ifndef TARGET_SDK13 #if (NRF_SD_BLE_API_VERSION < 3)
virtual information_data_t operator[](size_t i) const virtual information_data_t operator[](size_t i) const
{ {
information_data_t result = { information_data_t result = {
@ -1113,7 +1113,7 @@ struct nRF5XGattClient::DiscoverDescriptorsProcedure : RegularGattProcedure {
return result; return result;
} }
#else /* TARGET_SDK13 */ #else
virtual information_data_t operator[](size_t i) const virtual information_data_t operator[](size_t i) const
{ {
if (response.format == BLE_GATTC_ATTR_INFO_FORMAT_16BIT) { if (response.format == BLE_GATTC_ATTR_INFO_FORMAT_16BIT) {
@ -1207,7 +1207,7 @@ struct nRF5XGattClient::ReadUsingCharacteristicUUIDProcedure : RegularGattProced
return convert_sd_error(err); return convert_sd_error(err);
} }
#ifdef TARGET_SDK13 #if (NRF_SD_BLE_API_VERSION >= 3)
/** /**
* Adapt ble_gattc_evt_char_val_by_uuid_read_rsp_t into AttReadByTypeResponse. * Adapt ble_gattc_evt_char_val_by_uuid_read_rsp_t into AttReadByTypeResponse.
*/ */