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

compilation errors fixed

pull/8738/head
paul-szczepanek-arm 2018-11-08 15:02:18 +00:00 committed by Vincent Coubard
parent a5e1bdb97e
commit 87482b5530
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features/FEATURE_BLE/ble/GapAdvertisingData.h
View File

@ -720,7 +720,7 @@ public:
uint16_t getAppearance(void) const uint16_t getAppearance(void) const
{ {
uint16_t appearance = GENERIC_TAG; uint16_t appearance = GENERIC_TAG;
uint8_t *field = findField(AdvertisingData::APPEARANCE); const uint8_t *field = findField(AdvertisingData::APPEARANCE);
if (field) { if (field) {
memcpy((uint8_t*)appearance, field, 2); memcpy((uint8_t*)appearance, field, 2);
} }

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

@ -488,7 +488,7 @@ private:
uint8_t byte = bit_number / 8; uint8_t byte = bit_number / 8;
uint8_t bit = bit_number - byte; uint8_t bit = bit_number - byte;
bytes += byte; bytes += byte;
*bytes |= (0x01 >> bit); *bytes = *bytes | (0x01 >> bit);
return true; return true;
} }
@ -498,8 +498,8 @@ private:
} }
uint8_t byte = bit_number / 8; uint8_t byte = bit_number / 8;
uint8_t bit = bit_number - byte; uint8_t bit = bit_number - byte;
bytes += byte bytes += byte;
*bytes &= (0x00 >> bit); *bytes = *bytes & (0x00 >> bit);
return true; return true;
} }
}; };

16
features/FEATURE_BLE/source/generic/GenericGap.cpp
View File

@ -1628,10 +1628,10 @@ ble_error_t GenericGap::setAdvertisingParams(AdvHandle_t handle, const GapAdvert
case ADV_NON_CONNECTABLE_UNDIRECTED: case ADV_NON_CONNECTABLE_UNDIRECTED:
case EXT_ADV_NON_CONNECTABLE_DIRECTED: case EXT_ADV_NON_CONNECTABLE_DIRECTED:
case EXT_ADV_SCANNABLE_DIRECTED: case EXT_ADV_SCANNABLE_DIRECTED:
use_type = AddressUseType_t::PERIPHERAL_NON_CONNECTABLE use_type = PERIPHERAL_NON_CONNECTABLE;
break; break;
default: default:
use_type = AddressUseType_t::PERIPHERAL_CONNECTABLE; use_type = PERIPHERAL_CONNECTABLE;
} }
return _pal_gap.set_extended_advertising_parameters( return _pal_gap.set_extended_advertising_parameters(
@ -1642,14 +1642,14 @@ ble_error_t GenericGap::setAdvertisingParams(AdvHandle_t handle, const GapAdvert
pal::advertising_channel_map_t::ALL_ADVERTISING_CHANNELS, pal::advertising_channel_map_t::ALL_ADVERTISING_CHANNELS,
(pal::own_address_type_t)get_own_address_type(use_type), (pal::own_address_type_t)get_own_address_type(use_type),
pal::advertising_peer_address_type_t::PUBLIC_ADDRESS, pal::advertising_peer_address_type_t::PUBLIC_ADDRESS,
params->getPeerAddress(), ble::address_t(),
(pal::advertising_filter_policy_t)_advertising_filter_policy, (pal::advertising_filter_policy_t)_advertising_filter_policy,
(pal::advertising_power_t)params->getTxPower(), 0,
params->getPrimaryPhy(), ble::phy_set_t::PHY_SET_1M,
params->getSecondaryMaxSkip(), 0,
params->getSecondaryPhy(), ble::phy_set_t::PHY_SET_1M,
0xFF, 0xFF,
params->getScanRequestNotification() true
); );
} }