From af90f17758584a6e3857c8b30b903d2aa3a077c3 Mon Sep 17 00:00:00 2001 From: Vinayak Kariappa Chettimada Date: Mon, 4 May 2020 17:59:12 +0530 Subject: [PATCH] Bluetooth: controller: split: Fix conditional compile of ticker ids Fix conditional compile of ticker ids for auxiliary sets and periodic sets. Signed-off-by: Vinayak Kariappa Chettimada --- subsys/bluetooth/controller/ll_sw/lll.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/subsys/bluetooth/controller/ll_sw/lll.h b/subsys/bluetooth/controller/ll_sw/lll.h index 484c4a8e14e..6d36ac00ddc 100644 --- a/subsys/bluetooth/controller/ll_sw/lll.h +++ b/subsys/bluetooth/controller/ll_sw/lll.h @@ -46,19 +46,20 @@ enum { #if defined(CONFIG_BT_CTLR_ADV_EXT) || defined(CONFIG_BT_HCI_MESH_EXT) TICKER_ID_ADV_LAST = ((TICKER_ID_ADV_BASE) + (CONFIG_BT_CTLR_ADV_SET) - 1), +#if defined(CONFIG_BT_CTLR_ADV_EXT) #if (CONFIG_BT_CTLR_ADV_AUX_SET > 0) TICKER_ID_ADV_AUX_BASE, TICKER_ID_ADV_AUX_LAST = ((TICKER_ID_ADV_AUX_BASE) + (CONFIG_BT_CTLR_ADV_AUX_SET) - 1), -#endif /* CONFIG_BT_CTLR_ADV_AUX_SET > 0 */ -#endif /* !CONFIG_BT_CTLR_ADV_EXT || !CONFIG_BT_HCI_MESH_EXT */ -#endif /* CONFIG_BT_BROADCASTER */ - #if defined(CONFIG_BT_CTLR_ADV_PERIODIC) TICKER_ID_ADV_SYNC_BASE, TICKER_ID_ADV_SYNC_LAST = ((TICKER_ID_ADV_SYNC_BASE) + (CONFIG_BT_CTLR_ADV_SYNC_SET) - 1), #endif /* CONFIG_BT_CTLR_ADV_PERIODIC */ +#endif /* CONFIG_BT_CTLR_ADV_AUX_SET > 0 */ +#endif /* CONFIG_BT_CTLR_ADV_EXT */ +#endif /* !CONFIG_BT_CTLR_ADV_EXT || !CONFIG_BT_HCI_MESH_EXT */ +#endif /* CONFIG_BT_BROADCASTER */ #if defined(CONFIG_BT_OBSERVER) TICKER_ID_SCAN_STOP,