From d5314b8387bbd8b29ed9efbd57e2bf045e78b25f Mon Sep 17 00:00:00 2001 From: Vinayak Kariappa Chettimada Date: Thu, 7 Nov 2019 11:39:45 +0530 Subject: [PATCH] Bluetooth: controller: split: Add missing BT_DEBUG_ENABLED define Add missing BT_DEBUG_ENABLED definitions. Signed-off-by: Vinayak Kariappa Chettimada --- subsys/bluetooth/controller/ll_sw/lll_chan.c | 3 ++- subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c | 4 ++-- subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c | 3 ++- subsys/bluetooth/controller/ll_sw/nordic/lll/lll_clock.c | 3 ++- subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c | 3 ++- subsys/bluetooth/controller/ll_sw/nordic/lll/lll_master.c | 3 ++- subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c | 3 ++- subsys/bluetooth/controller/ll_sw/nordic/lll/lll_slave.c | 3 ++- subsys/bluetooth/controller/ll_sw/nordic/lll/lll_test.c | 4 +++- subsys/bluetooth/controller/ll_sw/ull.c | 3 ++- subsys/bluetooth/controller/ll_sw/ull_adv.c | 3 ++- subsys/bluetooth/controller/ll_sw/ull_conn.c | 3 ++- subsys/bluetooth/controller/ll_sw/ull_filter.c | 4 ++-- subsys/bluetooth/controller/ll_sw/ull_master.c | 3 ++- subsys/bluetooth/controller/ll_sw/ull_scan.c | 3 ++- subsys/bluetooth/controller/ll_sw/ull_slave.c | 3 ++- 16 files changed, 33 insertions(+), 18 deletions(-) diff --git a/subsys/bluetooth/controller/ll_sw/lll_chan.c b/subsys/bluetooth/controller/ll_sw/lll_chan.c index 7257e14cdd6..c8c803e9f6d 100644 --- a/subsys/bluetooth/controller/ll_sw/lll_chan.c +++ b/subsys/bluetooth/controller/ll_sw/lll_chan.c @@ -9,7 +9,8 @@ #include "hal/ccm.h" #include "hal/radio.h" -#define LOG_MODULE_NAME bt_ctlr_llsw_nordic_lll_chan +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) +#define LOG_MODULE_NAME bt_ctlr_lll_chan #include "common/log.h" #include #include "hal/debug.h" diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c index 1d8eb5321d6..b0cc31d6283 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c +++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c @@ -28,9 +28,9 @@ #include "lll_vendor.h" #include "lll_internal.h" -#define LOG_MODULE_NAME bt_ctlr_llsw_nordic_lll +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) +#define LOG_MODULE_NAME bt_ctlr_lll #include "common/log.h" - #include "hal/debug.h" #if defined(CONFIG_BT_CTLR_ZLI) diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c index cedb1d021f6..bfec9531470 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c +++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c @@ -36,7 +36,8 @@ #include "lll_adv_internal.h" #include "lll_prof_internal.h" -#define LOG_MODULE_NAME bt_ctlr_llsw_nordic_lll_adv +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) +#define LOG_MODULE_NAME bt_ctlr_lll_adv #include "common/log.h" #include #include "hal/debug.h" diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_clock.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_clock.c index 8452fee71f5..36824a31a51 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_clock.c +++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_clock.c @@ -10,7 +10,8 @@ #include #include -#define LOG_MODULE_NAME bt_ctlr_llsw_nordic_lll_clock +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) +#define LOG_MODULE_NAME bt_ctlr_lll_clock #include "common/log.h" #include "hal/debug.h" diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c index eca90b56d5b..b5e446df275 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c +++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c @@ -28,7 +28,8 @@ #include "lll_tim_internal.h" #include "lll_prof_internal.h" -#define LOG_MODULE_NAME bt_ctlr_llsw_nordic_lll_conn +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) +#define LOG_MODULE_NAME bt_ctlr_lll_conn #include "common/log.h" #include #include "hal/debug.h" diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_master.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_master.c index 61856b9772d..2829bf92da5 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_master.c +++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_master.c @@ -27,7 +27,8 @@ #include "lll_internal.h" #include "lll_tim_internal.h" -#define LOG_MODULE_NAME bt_ctlr_llsw_nordic_lll_master +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) +#define LOG_MODULE_NAME bt_ctlr_lll_master #include "common/log.h" #include #include "hal/debug.h" diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c index 89bce218114..a77097e0c95 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c +++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c @@ -32,7 +32,8 @@ #include "lll_tim_internal.h" #include "lll_prof_internal.h" -#define LOG_MODULE_NAME bt_ctlr_llsw_nordic_lll_scan +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) +#define LOG_MODULE_NAME bt_ctlr_lll_scan #include "common/log.h" #include #include "hal/debug.h" diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_slave.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_slave.c index 461395257bb..d0e56e6b3b0 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_slave.c +++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_slave.c @@ -27,7 +27,8 @@ #include "lll_internal.h" #include "lll_tim_internal.h" -#define LOG_MODULE_NAME bt_ctlr_llsw_nordic_lll_slave +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) +#define LOG_MODULE_NAME bt_ctlr_lll_slave #include "common/log.h" #include #include "hal/debug.h" diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_test.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_test.c index 4a17e491d9a..f4501c9eb3f 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_test.c +++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_test.c @@ -24,8 +24,10 @@ #include "ll_test.h" -#include "hal/debug.h" +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) +#define LOG_MODULE_NAME bt_ctlr_lll_test #include "common/log.h" +#include "hal/debug.h" #define CNTR_MIN_DELTA 3 diff --git a/subsys/bluetooth/controller/ll_sw/ull.c b/subsys/bluetooth/controller/ll_sw/ull.c index 56968cb3289..13f50e03277 100644 --- a/subsys/bluetooth/controller/ll_sw/ull.c +++ b/subsys/bluetooth/controller/ll_sw/ull.c @@ -50,7 +50,8 @@ #include "ull_vendor.h" #endif /* CONFIG_BT_CTLR_USER_EXT */ -#define LOG_MODULE_NAME bt_ctlr_llsw_ull +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) +#define LOG_MODULE_NAME bt_ctlr_ull #include "common/log.h" #include "hal/debug.h" diff --git a/subsys/bluetooth/controller/ll_sw/ull_adv.c b/subsys/bluetooth/controller/ll_sw/ull_adv.c index f3759b8c3eb..b372ad9bd76 100644 --- a/subsys/bluetooth/controller/ll_sw/ull_adv.c +++ b/subsys/bluetooth/controller/ll_sw/ull_adv.c @@ -42,7 +42,8 @@ #include "ull_conn_internal.h" #include "ull_internal.h" -#define LOG_MODULE_NAME bt_ctlr_llsw_ull_adv +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) +#define LOG_MODULE_NAME bt_ctlr_ull_adv #include "common/log.h" #include #include "hal/debug.h" diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn.c b/subsys/bluetooth/controller/ll_sw/ull_conn.c index 74dd0695409..1b67d4ade41 100644 --- a/subsys/bluetooth/controller/ll_sw/ull_conn.c +++ b/subsys/bluetooth/controller/ll_sw/ull_conn.c @@ -38,7 +38,8 @@ #include "ll_feat.h" #include "ll_settings.h" -#define LOG_MODULE_NAME bt_ctlr_llsw_ull_conn +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) +#define LOG_MODULE_NAME bt_ctlr_ull_conn #include "common/log.h" #include #include "hal/debug.h" diff --git a/subsys/bluetooth/controller/ll_sw/ull_filter.c b/subsys/bluetooth/controller/ll_sw/ull_filter.c index f9e9d017930..4a05e6e19c1 100644 --- a/subsys/bluetooth/controller/ll_sw/ull_filter.c +++ b/subsys/bluetooth/controller/ll_sw/ull_filter.c @@ -35,9 +35,9 @@ #define ADDR_TYPE_ANON 0xFF -#define LOG_MODULE_NAME bt_ctlr_llsw_nordic_lll_filter +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) +#define LOG_MODULE_NAME bt_ctlr_ull_filter #include "common/log.h" - #include "hal/debug.h" /* Hardware whitelist */ diff --git a/subsys/bluetooth/controller/ll_sw/ull_master.c b/subsys/bluetooth/controller/ll_sw/ull_master.c index 6803d6fb4cb..6d6ae383894 100644 --- a/subsys/bluetooth/controller/ll_sw/ull_master.c +++ b/subsys/bluetooth/controller/ll_sw/ull_master.c @@ -40,7 +40,8 @@ #include "ull_conn_internal.h" #include "ull_master_internal.h" -#define LOG_MODULE_NAME bt_ctlr_llsw_ull_master +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) +#define LOG_MODULE_NAME bt_ctlr_ull_master #include "common/log.h" #include #include "hal/debug.h" diff --git a/subsys/bluetooth/controller/ll_sw/ull_scan.c b/subsys/bluetooth/controller/ll_sw/ull_scan.c index a0ec2eb6c78..1b7cbf0961f 100644 --- a/subsys/bluetooth/controller/ll_sw/ull_scan.c +++ b/subsys/bluetooth/controller/ll_sw/ull_scan.c @@ -37,7 +37,8 @@ #include "ull_scan_internal.h" #include "ull_sched_internal.h" -#define LOG_MODULE_NAME bt_ctlr_llsw_ull_scan +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) +#define LOG_MODULE_NAME bt_ctlr_ull_scan #include "common/log.h" #include #include "hal/debug.h" diff --git a/subsys/bluetooth/controller/ll_sw/ull_slave.c b/subsys/bluetooth/controller/ll_sw/ull_slave.c index e79baaf48f8..a1e250bc3cf 100644 --- a/subsys/bluetooth/controller/ll_sw/ull_slave.c +++ b/subsys/bluetooth/controller/ll_sw/ull_slave.c @@ -37,7 +37,8 @@ #include "ull_conn_internal.h" #include "ull_slave_internal.h" -#define LOG_MODULE_NAME bt_ctlr_llsw_ull_slave +#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER) +#define LOG_MODULE_NAME bt_ctlr_ull_slave #include "common/log.h" #include #include "hal/debug.h"