Merge pull request #763 from mlaz/integrate_nrfx

Integrate nrfx along with all drivers from mynewt_nordic.

X-Original-Commit: d870b9d608109b6b8b0a7d320f42520b828a5a72
This commit is contained in:
Miguel Azevedo
2018-02-14 13:48:11 -02:00
committed by GitHub
+5 -5
View File
@@ -791,12 +791,12 @@ ble_phy_get_cur_rx_phy_mode(void)
(phy == BLE_PHY_MODE_CODED_500KBPS)) {
/*
* XXX CI field value is bits [2:1] in NRF_RADIO->PDUSTAT which is
* available in SDK v14.0 - it's NRF_RADIO->RESERVED7[0] in
* SDK v11.0 so let's use it for now
* available in nrfx for nrf52840 only - it's NRF_RADIO->RESERVED7[0]
* for other nrf52 vairants.
*/
phy = NRF_RADIO->RESERVED7[0] & 0x06 ?
BLE_PHY_MODE_CODED_500KBPS :
BLE_PHY_MODE_CODED_125KBPS;
phy = NRF_RADIO->PDUSTAT & 0x06 ?
BLE_PHY_MODE_CODED_500KBPS :
BLE_PHY_MODE_CODED_125KBPS;
}
#endif