Merge pull request #183 from rymanluk/build_fixes

nimble: Build error fixes after PR 164 and PR 182
This commit is contained in:
Łukasz Rymanowski
2018-09-05 18:49:30 +02:00
committed by GitHub
2 changed files with 19 additions and 13 deletions
+6
View File
@@ -59,6 +59,12 @@ bool ble_ll_hci_adv_mode_ext(void)
{
return hci_adv_mode == ADV_MODE_EXT;
}
#else
bool
ble_ll_hci_adv_mode_ext(void)
{
return false;
}
#endif
/**
+13 -13
View File
@@ -247,6 +247,19 @@ struct nrf_ccm_data
struct nrf_ccm_data g_nrf_ccm_data;
#endif
#ifdef NRF52
static void
ble_phy_apply_errata_102_106_107(void)
{
/* [102] RADIO: PAYLOAD/END events delayed or not triggered after ADDRESS
* [106] RADIO: Higher CRC error rates for some access addresses
* [107] RADIO: Immediate address match for access addresses containing MSBs 0x00
*/
*(volatile uint32_t *)0x40001774 = ((*(volatile uint32_t *)0x40001774) &
0xfffffffe) | 0x01000000;
}
#endif
#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
/* Packet start offset (in usecs). This is the preamble plus access address.
@@ -312,19 +325,6 @@ ble_phy_apply_nrf52840_errata(uint8_t new_phy_mode)
}
#endif
#ifdef NRF52
static void
ble_phy_apply_errata_102_106_107(void)
{
/* [102] RADIO: PAYLOAD/END events delayed or not triggered after ADDRESS
* [106] RADIO: Higher CRC error rates for some access addresses
* [107] RADIO: Immediate address match for access addresses containing MSBs 0x00
*/
*(volatile uint32_t *)0x40001774 = ((*(volatile uint32_t *)0x40001774) &
0xfffffffe) | 0x01000000;
}
#endif
void
ble_phy_mode_set(uint8_t new_phy_mode, uint8_t txtorx_phy_mode)
{