espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-10-03 05:37:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

controller: fix build of ISO on nRF52 with connection disabled

Browse Source 
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
This commit is contained in:
Krzysztof Kopyściński
2023-11-29 14:21:51 +01:00
committed by Krzysztof Kopyściński
parent 1d9e968ead
commit 9fb79eb855
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/controller/src/ble_ll_hci.c
+2 -1
View File
@@ -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: case BLE_HCI_OCF_CB_SET_EVENT_MASK2:
rc = ble_ll_hci_cb_set_event_mask2(cmdbuf, len); rc = ble_ll_hci_cb_set_event_mask2(cmdbuf, len);
break; 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: case BLE_HCI_OCF_CB_RD_AUTH_PYLD_TMO:
rc = ble_ll_conn_hci_rd_auth_pyld_tmo(cmdbuf, len, rspbuf, rsplen); rc = ble_ll_conn_hci_rd_auth_pyld_tmo(cmdbuf, len, rspbuf, rsplen);
break; break;
nimble/controller/syscfg.yml
+1 -1
View File
@@ -242,7 +242,7 @@ syscfg.defs:
description: > description: >
This option enables/disables encryption support in the controller. This option enables/disables encryption support in the controller.
This option saves both both code and RAM. 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: BLE_LL_CFG_FEAT_CONN_PARAM_REQ:
description: > description: >
nimble/drivers/nrf5x/src/ble_phy.c
+1 -1
View File
@@ -1527,7 +1527,7 @@ ble_phy_isr(void)
os_trace_isr_exit(); os_trace_isr_exit();
} }
#if PHY_USE_HEADERMASK_WORKAROUND #if PHY_USE_HEADERMASK_WORKAROUND && MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
static void static void
ble_phy_ccm_isr(void) ble_phy_ccm_isr(void)
{ {