(mynewt-nimble) branch master updated: controller: fix build of ISO on nRF52 with connection disabled

[kopyscinski]

This is an automated email from the ASF dual-hosted git repository.

kopyscinski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git


The following commit(s) were added to refs/heads/master by this push:
     new 9fb79eb8 controller: fix build of ISO on nRF52 with connection disabled
9fb79eb8 is described below

commit 9fb79eb8557054ca2be006f0dbd5e96c663a4341
Author: Krzysztof Kopyściński <krzysztof.kopyscin...@codecoup.pl>
AuthorDate: Mon Nov 20 08:47:42 2023 +0100

    controller: fix build of ISO on nRF52 with connection disabled
    
    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
---
 nimble/controller/src/ble_ll_hci.c | 3 ++-
 nimble/controller/syscfg.yml       | 2 +-
 nimble/drivers/nrf5x/src/ble_phy.c | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/nimble/controller/src/ble_ll_hci.c 
b/nimble/controller/src/ble_ll_hci.c
index 356869ee..6e5f4689 100644
--- a/nimble/controller/src/ble_ll_hci.c
+++ b/nimble/controller/src/ble_ll_hci.c
@@ -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;
diff --git a/nimble/controller/syscfg.yml b/nimble/controller/syscfg.yml
index ae5e9373..22a4c1b5 100644
--- a/nimble/controller/syscfg.yml
+++ b/nimble/controller/syscfg.yml
@@ -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: >
diff --git a/nimble/drivers/nrf5x/src/ble_phy.c 
b/nimble/drivers/nrf5x/src/ble_phy.c
index a4d47cef..ec5507c9 100644
--- a/nimble/drivers/nrf5x/src/ble_phy.c
+++ b/nimble/drivers/nrf5x/src/ble_phy.c
@@ -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)
 {