Bluetooth: controller: guard NODE_RX_TYPE_USER with range value
Instead of guarding the NODE_RX_TYPE_USER cases with CONFIG_BT_CTLR_USER_EXT we guard them with CONFIG_BT_CTLR_USER_EVT_RANGE > 0 as that is the actual value that enables/disables the NODE_RX_TYPE_USER values. Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
parent
58eb76e06d
commit
d911f99bfc
2 changed files with 8 additions and 8 deletions
|
@ -4660,11 +4660,11 @@ static void encode_control(struct node_rx_pdu *node_rx,
|
|||
return;
|
||||
#endif /* CONFIG_BT_HCI_MESH_EXT */
|
||||
|
||||
#if defined(CONFIG_BT_CTLR_USER_EXT)
|
||||
#if CONFIG_BT_CTLR_USER_EVT_RANGE > 0
|
||||
case NODE_RX_TYPE_USER_START ... NODE_RX_TYPE_USER_END - 1:
|
||||
hci_user_ext_encode_control(node_rx, pdu_data, buf);
|
||||
return;
|
||||
#endif /* CONFIG_BT_CTLR_USER_EXT */
|
||||
#endif /* CONFIG_BT_CTLR_USER_EVT_RANGE > 0 */
|
||||
|
||||
default:
|
||||
LL_ASSERT(0);
|
||||
|
@ -5052,10 +5052,10 @@ uint8_t hci_get_class(struct node_rx_pdu *node_rx)
|
|||
return HCI_CLASS_EVT_CONNECTION;
|
||||
#endif /* CONFIG_BT_CONN */
|
||||
|
||||
#if defined(CONFIG_BT_CTLR_USER_EXT)
|
||||
#if CONFIG_BT_CTLR_USER_EVT_RANGE > 0
|
||||
case NODE_RX_TYPE_USER_START ... NODE_RX_TYPE_USER_END - 1:
|
||||
return hci_user_ext_get_class(node_rx);
|
||||
#endif /* CONFIG_BT_CTLR_USER_EXT */
|
||||
#endif /* CONFIG_BT_CTLR_USER_EVT_RANGE > 0 */
|
||||
|
||||
default:
|
||||
return HCI_CLASS_NONE;
|
||||
|
|
|
@ -828,10 +828,10 @@ void ll_rx_dequeue(void)
|
|||
case NODE_RX_TYPE_MESH_REPORT:
|
||||
#endif /* CONFIG_BT_HCI_MESH_EXT */
|
||||
|
||||
#if defined(CONFIG_BT_CTLR_USER_EXT)
|
||||
#if CONFIG_BT_CTLR_USER_EVT_RANGE > 0
|
||||
case NODE_RX_TYPE_USER_START ... NODE_RX_TYPE_USER_END - 1:
|
||||
__fallthrough;
|
||||
#endif /* CONFIG_BT_CTLR_USER_EXT */
|
||||
#endif /* CONFIG_BT_CTLR_USER_EVT_RANGE > 0 */
|
||||
|
||||
/* Ensure that at least one 'case' statement is present for this
|
||||
* code block.
|
||||
|
@ -1006,9 +1006,9 @@ void ll_rx_mem_release(void **node_rx)
|
|||
case NODE_RX_TYPE_MESH_REPORT:
|
||||
#endif /* CONFIG_BT_HCI_MESH_EXT */
|
||||
|
||||
#if defined(CONFIG_BT_CTLR_USER_EXT)
|
||||
#if CONFIG_BT_CTLR_USER_EVT_RANGE > 0
|
||||
case NODE_RX_TYPE_USER_START ... NODE_RX_TYPE_USER_END - 1:
|
||||
#endif /* CONFIG_BT_CTLR_USER_EXT */
|
||||
#endif /* CONFIG_BT_CTLR_USER_EVT_RANGE > 0 */
|
||||
|
||||
/* Ensure that at least one 'case' statement is present for this
|
||||
* code block.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue