From e096ccca8d479a0a48339d69bc298be34cc1cf67 Mon Sep 17 00:00:00 2001 From: Erik Brockhoff Date: Wed, 18 Jan 2023 15:35:44 +0100 Subject: [PATCH] Bluetooth: controller: fix UNKNOWN_RSP vs. role re CIS TERMINATE support Proper handling re. non-supported CIS TERMINATE This fixes EBQ test LL/PAC/CEN/BV-01-C on the general level. 'Replaces' #ee2a43b5dcf884730130345c402d87b2bce9dba1 Signed-off-by: Erik Brockhoff --- subsys/bluetooth/controller/ll_sw/ull_llcp_remote.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/subsys/bluetooth/controller/ll_sw/ull_llcp_remote.c b/subsys/bluetooth/controller/ll_sw/ull_llcp_remote.c index f7d06280920..57f6d8ac286 100644 --- a/subsys/bluetooth/controller/ll_sw/ull_llcp_remote.c +++ b/subsys/bluetooth/controller/ll_sw/ull_llcp_remote.c @@ -839,11 +839,19 @@ static const struct proc_role new_proc_lut[] = { #endif /* CONFIG_BT_CTLR_DF_CONN_CTE_RSP */ [PDU_DATA_LLCTRL_TYPE_CTE_RSP] = { PROC_UNKNOWN, ACCEPT_ROLE_NONE }, #if defined(CONFIG_BT_CTLR_CENTRAL_ISO) || defined(CONFIG_BT_CTLR_PERIPHERAL_ISO) +#if !defined(CONFIG_BT_CTLR_PERIPHERAL_ISO) + [PDU_DATA_LLCTRL_TYPE_CIS_TERMINATE_IND] = { PROC_CIS_TERMINATE, ACCEPT_ROLE_CENTRAL }, +#else +#if !defined(CONFIG_BT_CTLR_CENTRAL_ISO) + [PDU_DATA_LLCTRL_TYPE_CIS_TERMINATE_IND] = { PROC_CIS_TERMINATE, ACCEPT_ROLE_PERIPHERAL }, +#else [PDU_DATA_LLCTRL_TYPE_CIS_TERMINATE_IND] = { PROC_CIS_TERMINATE, ACCEPT_ROLE_BOTH }, -#endif /* CONFIG_BT_CTLR_CENTRAL_ISO || CONFIG_BT_CTLR_PERIPHERAL_ISO */ +#endif /* !defined(CONFIG_BT_CTLR_CENTRAL_ISO) */ +#endif /* !defined(CONFIG_BT_CTLR_PERIPHERAL_ISO) */ +#endif /* defined(CONFIG_BT_CTLR_CENTRAL_ISO) || defined(CONFIG_BT_CTLR_PERIPHERAL_ISO) */ #if defined(CONFIG_BT_CTLR_PERIPHERAL_ISO) [PDU_DATA_LLCTRL_TYPE_CIS_REQ] = { PROC_CIS_CREATE, ACCEPT_ROLE_PERIPHERAL }, -#endif /* CONFIG_BT_CTLR_CENTRAL_ISO */ +#endif /* defined(CONFIG_BT_CTLR_PERIPHERAL_ISO) */ #if defined(CONFIG_BT_CTLR_SCA_UPDATE) [PDU_DATA_LLCTRL_TYPE_CLOCK_ACCURACY_REQ] = { PROC_SCA_UPDATE, ACCEPT_ROLE_BOTH }, #endif /* CONFIG_BT_CTLR_SCA_UPDATE */