Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

controller: fix ISO compilation errors when build for Broadcast only, and for nRF52 #1653

Merged
merged 1 commit into from
Nov 29, 2023
Merged

controller: fix ISO compilation errors when build for Broadcast only, and for nRF52 #1653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion nimble/controller/src/ble_ll_hci.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1503,7 +1503,8 @@ ble_ll_hci_ctlr_bb_cmd_proc(const uint8_t *cmdbuf, uint8_t len, uint16_t ocf,
case BLE_HCI_OCF_CB_SET_EVENT_MASK2:
rc = ble_ll_hci_cb_set_event_mask2(cmdbuf, len);
break;
#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
#if (MYNEWT_VAL(BLE_LL_ROLE_PERIPHERAL) || MYNEWT_VAL(BLE_LL_ROLE_CENTRAL)) \
&& MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
case BLE_HCI_OCF_CB_RD_AUTH_PYLD_TMO:
rc = ble_ll_conn_hci_rd_auth_pyld_tmo(cmdbuf, len, rspbuf, rsplen);
break;
Expand Down
2 changes: 1 addition & 1 deletion nimble/controller/syscfg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ syscfg.defs:
description: >
This option enables/disables encryption support in the controller.
This option saves both both code and RAM.
value: 'MYNEWT_VAL_BLE_LL_ROLE_CENTRAL || MYNEWT_VAL_BLE_LL_ROLE_PERIPHERAL'
value: 'MYNEWT_VAL_BLE_LL_ROLE_CENTRAL || MYNEWT_VAL_BLE_LL_ROLE_PERIPHERAL || MYNEWT_VAL_BLE_LL_ISO'

BLE_LL_CFG_FEAT_CONN_PARAM_REQ:
description: >
Expand Down
2 changes: 1 addition & 1 deletion nimble/drivers/nrf5x/src/ble_phy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1527,7 +1527,7 @@ ble_phy_isr(void)
os_trace_isr_exit();
}

#if PHY_USE_HEADERMASK_WORKAROUND
#if PHY_USE_HEADERMASK_WORKAROUND && MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
static void
ble_phy_ccm_isr(void)
{
Expand Down
Loading