From 63a93e8b5ae3777bb14261c8a2048cdb37ce6e1e Mon Sep 17 00:00:00 2001 From: Alexander Svensen Date: Thu, 16 May 2019 16:09:04 +0200 Subject: [PATCH] Bluetooth: controller: split: Refactor if_defines to is_enabled in lll.c This commit refactors if defines to use the macro is_enabled, for readability Signed-off-by: Alexander Svensen --- .../controller/ll_sw/nordic/lll/lll.c | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c index f7c25f673f6..eddb5bc2cfc 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c +++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c @@ -221,7 +221,7 @@ void lll_disable(void *param) int lll_prepare_done(void *param) { #if defined(CONFIG_BT_CTLR_LOW_LAT) && \ - (CONFIG_BT_CTLR_LLL_PRIO == CONFIG_BT_CTLR_ULL_LOW_PRIO) + (CONFIG_BT_CTLR_LLL_PRIO == CONFIG_BT_CTLR_ULL_LOW_PRIO) u32_t ret; /* Ticker Job Silence */ @@ -229,8 +229,8 @@ int lll_prepare_done(void *param) TICKER_USER_ID_LLL, ticker_op_job_disable, NULL); - return ((ret == TICKER_STATUS_SUCCESS) || (ret == TICKER_STATUS_BUSY)) ? - 0 : -EFAULT; + return ((ret == TICKER_STATUS_SUCCESS) || + (ret == TICKER_STATUS_BUSY)) ? 0 : -EFAULT; #else return 0; #endif /* CONFIG_BT_CTLR_LOW_LAT */ @@ -258,10 +258,12 @@ int lll_done(void *param) ull = HDR_ULL(((struct lll_hdr *)param)->parent); } -#if defined(CONFIG_BT_CTLR_LOW_LAT) && \ - (CONFIG_BT_CTLR_LLL_PRIO == CONFIG_BT_CTLR_ULL_LOW_PRIO) - mayfly_enable(TICKER_USER_ID_LLL, TICKER_USER_ID_ULL_LOW, 1); -#endif /* CONFIG_BT_CTLR_LOW_LAT */ + if (IS_ENABLED(CONFIG_BT_CTLR_LOW_LAT) && + (CONFIG_BT_CTLR_LLL_PRIO == CONFIG_BT_CTLR_ULL_LOW_PRIO)) { + mayfly_enable(TICKER_USER_ID_LLL, + TICKER_USER_ID_ULL_LOW, + 1); + } DEBUG_RADIO_CLOSE(0); } else { @@ -408,12 +410,10 @@ static int prepare(lll_is_abort_cb_t is_abort_cb, lll_abort_cb_t abort_cb, #endif /* CONFIG_BT_CTLR_LOW_LAT */ int ret; -#if defined(CONFIG_BT_CTLR_LOW_LAT) - /* early abort */ - if (event.curr.param) { + if (IS_ENABLED(CONFIG_BT_CTLR_LOW_LAT) && event.curr.param) { + /* early abort */ event.curr.abort_cb(NULL, event.curr.param); } -#endif /* CONFIG_BT_CTLR_LOW_LAT */ /* Store the next prepare for deferred call */ ret = ull_prepare_enqueue(is_abort_cb, abort_cb, prepare_param,