michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: #if defined(...) vs #if IS_ENABLED(..)

Browse source 
Use `#if defined(...)` instead of `#if IS_ENABLED(..)` when
conditional compilation of definitions in source code.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2021-02-24 13:57:41 +05:30 • committed by Carles Cufí
commit 298b3ca467
14 changed files with 57 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

12
subsys/bluetooth/controller/hci/hci.c
View file

@ -2432,8 +2432,8 @@ static void le_read_tx_power(struct net_buf *buf, struct net_buf **evt)
ll_tx_pwr_get(&rp->min_tx_power, &rp->max_tx_power);
}
#if IS_ENABLED(CONFIG_BT_CTLR_DF)
#if IS_ENABLED(CONFIG_BT_CTLR_DF_ADV_CTE_TX)
#if defined(CONFIG_BT_CTLR_DF)
#if defined(CONFIG_BT_CTLR_DF_ADV_CTE_TX)
static void le_df_set_cl_cte_tx_params(struct net_buf *buf,
struct net_buf **evt)
{
@ -2481,7 +2481,7 @@ static void le_df_set_cl_cte_enable(struct net_buf *buf, struct net_buf **evt)
}
#endif /* CONFIG_BT_CTLR_DF_ADV_CTE_TX */
#if IS_ENABLED(CONFIG_BT_CTLR_DF_CONN_CTE_RSP)
#if defined(CONFIG_BT_CTLR_DF_CONN_CTE_RSP)
static void le_df_set_conn_cte_tx_params(struct net_buf *buf,
struct net_buf **evt)
{
@ -3594,8 +3594,8 @@ static int controller_cmd_handle(uint16_t ocf, struct net_buf *cmd,
le_read_tx_power(cmd, evt);
break;
#if IS_ENABLED(CONFIG_BT_CTLR_DF)
#if IS_ENABLED(CONFIG_BT_CTLR_DF_ADV_CTE_TX)
#if defined(CONFIG_BT_CTLR_DF)
#if defined(CONFIG_BT_CTLR_DF_ADV_CTE_TX)
case BT_OCF(BT_HCI_OP_LE_SET_CL_CTE_TX_PARAMS):
le_df_set_cl_cte_tx_params(cmd, evt);
break;
@ -3606,7 +3606,7 @@ static int controller_cmd_handle(uint16_t ocf, struct net_buf *cmd,
case BT_OCF(BT_HCI_OP_LE_READ_ANT_INFO):
le_df_read_ant_inf(cmd, evt);
break;
#if IS_ENABLED(CONFIG_BT_CTLR_DF_CONN_CTE_RSP)
#if defined(CONFIG_BT_CTLR_DF_CONN_CTE_RSP)
case BT_OCF(BT_HCI_OP_LE_SET_CONN_CTE_TX_PARAMS):
le_df_set_conn_cte_tx_params(cmd, evt);
break;