Skip to content

Commit

Permalink
controller: fix build of ISO on nRF52 with connection disabled
Browse files Browse the repository at this point in the history
This fixes build of ISO when only Brodacster is enabled.

`ble_phy_ccm_isr` is used ony when BLE_LL_CFG_FEAT_LE_ENCRYPTION
(in ble_phy_init)

BLE_LL_CFG_FEAT_LE_ENCRYPTION should be enabled when ISO is used, even
connection-less

ble_ll_conn_hci_rd_auth_pyld_tmo and ble_ll_conn_hci_wr_auth_pyld_tmo
are built only with BLE_LL_CFG_FEAT_LL_ENHANCED_CONN_UPDATE enabled
  • Loading branch information
KKopyscinski committed Nov 29, 2023
1 parent 1d9e968 commit 9fb79eb
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion nimble/controller/src/ble_ll_hci.c
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
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
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

0 comments on commit 9fb79eb

Please sign in to comment.