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

NRF52: C++11 fixes

pull/10427/head
Kevin Bracey 2019-05-23 13:50:43 +03:00
parent a4738fa9a8
commit 5f8b966ff6
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_NORDIC_SOFTDEVICE/TARGET_NRF52/source/nRF5xGap.cpp
View File

@ -746,8 +746,8 @@ ble_error_t nRF5xGap::setPhy_(
#else #else
// TODO handle coded symbol once supported by the softdevice. // TODO handle coded symbol once supported by the softdevice.
ble_gap_phys_t gap_phys = { ble_gap_phys_t gap_phys = {
txPhys? txPhys->value() : 0, txPhys? txPhys->value() : uint8_t(0),
rxPhys? rxPhys->value() : 0 rxPhys? rxPhys->value() : uint8_t(0)
}; };
uint32_t err = sd_ble_gap_phy_update(connection, &gap_phys); uint32_t err = sd_ble_gap_phy_update(connection, &gap_phys);
@ -1662,8 +1662,8 @@ void nRF5xGap::on_phy_update_request(
const ble_gap_evt_phy_update_request_t& evt const ble_gap_evt_phy_update_request_t& evt
) { ) {
ble_gap_phys_t phys = { ble_gap_phys_t phys = {
_preferred_tx_phys & evt.peer_preferred_phys.tx_phys, static_cast<uint8_t>(_preferred_tx_phys & evt.peer_preferred_phys.tx_phys),
_preferred_rx_phys & evt.peer_preferred_phys.rx_phys static_cast<uint8_t>(_preferred_rx_phys & evt.peer_preferred_phys.rx_phys)
}; };
if (!phys.tx_phys) { if (!phys.tx_phys) {