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.

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

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

Merged
merged 1 commit into from
Nov 29, 2023

Conversation

KKopyscinski
Copy link
Contributor

No description provided.

@@ -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_CFG_FEAT_LL_ENHANCED_CONN_UPDATE) && \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is not related to le ping so whatever it fixes, the problem is somewhere else

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

right, I think I misread ifs. I think it should be only for connection. So

#if (MYNEWT_VAL(BLE_LL_ROLE_PERIPHERAL) || MYNEWT_VAL(BLE_LL_ROLE_CENTRAL)) \
     && MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)

instead

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
@KKopyscinski
Copy link
Contributor Author

@andrzej-kaczmarek Waiting for review

@KKopyscinski KKopyscinski merged commit 9fb79eb into apache:master Nov 29, 2023
31 checks passed
@KKopyscinski KKopyscinski deleted the iso_compile_fix branch February 13, 2024 07:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants