From 939544b75de3c7831fbb33572f2196f3a6b4fb66 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Tue, 16 Jun 2015 17:25:37 +0300 Subject: [PATCH] Bluetooth: Move logging helpers to a dedicated header file To make it clearer that these helpers are intended only for Bluetooth-subsystem internal code, move them to a separate file. Change-Id: Iea64780f5c61c1c96e12c9df378676bc49498fe4 Signed-off-by: Johan Hedberg --- drivers/bluetooth/uart.c | 1 + include/bluetooth/bluetooth.h | 16 ----------- include/bluetooth/log.h | 52 +++++++++++++++++++++++++++++++++++ net/bluetooth/att.c | 1 + net/bluetooth/buf.c | 1 + net/bluetooth/conn.c | 1 + net/bluetooth/gatt.c | 1 + net/bluetooth/hci_core.c | 1 + net/bluetooth/keys.c | 1 + net/bluetooth/l2cap.c | 1 + net/bluetooth/smp.c | 1 + 11 files changed, 61 insertions(+), 16 deletions(-) create mode 100644 include/bluetooth/log.h diff --git a/drivers/bluetooth/uart.c b/drivers/bluetooth/uart.c index 0bf07312a41..4952559c940 100644 --- a/drivers/bluetooth/uart.c +++ b/drivers/bluetooth/uart.c @@ -42,6 +42,7 @@ #include #include +#include #include #if !defined(CONFIG_BLUETOOTH_DEBUG_UART) diff --git a/include/bluetooth/bluetooth.h b/include/bluetooth/bluetooth.h index 67cb6fbe3f0..b104ebd1760 100644 --- a/include/bluetooth/bluetooth.h +++ b/include/bluetooth/bluetooth.h @@ -32,26 +32,10 @@ #ifndef __BT_BLUETOOTH_H #define __BT_BLUETOOTH_H -#include #include #include #include -/* Bluetooth subsystem logging helpers */ - -#if defined(CONFIG_BLUETOOTH_DEBUG) -#define BT_DBG(fmt, ...) printf("bt: %s (%p): " fmt, __func__, \ - context_self_get(), ##__VA_ARGS__) -#define BT_ERR(fmt, ...) printf("bt: %s: " fmt, __func__, ##__VA_ARGS__) -#define BT_WARN(fmt, ...) printf("bt: %s: " fmt, __func__, ##__VA_ARGS__) -#define BT_INFO(fmt, ...) printf("bt: " fmt, ##__VA_ARGS__) -#else -#define BT_DBG(fmt, ...) -#define BT_ERR(fmt, ...) -#define BT_WARN(fmt, ...) -#define BT_INFO(fmt, ...) -#endif /* CONFIG_BLUETOOTH_DEBUG */ - /* HCI control APIs */ /* Reset the state of the controller (i.e. perform full HCI init */ diff --git a/include/bluetooth/log.h b/include/bluetooth/log.h new file mode 100644 index 00000000000..33dd08cfa1f --- /dev/null +++ b/include/bluetooth/log.h @@ -0,0 +1,52 @@ +/*! @file + * @brief Bluetooth subsystem logging helpers. + */ + +/* + * Copyright (c) 2015 Intel Corporation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1) Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2) Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * 3) Neither the name of Intel Corporation nor the names of its contributors + * may be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ +#ifndef __BT_LOG_H +#define __BT_LOG_H + +#include + +#if defined(CONFIG_BLUETOOTH_DEBUG) +#define BT_DBG(fmt, ...) printf("bt: %s (%p): " fmt, __func__, \ + context_self_get(), ##__VA_ARGS__) +#define BT_ERR(fmt, ...) printf("bt: %s: " fmt, __func__, ##__VA_ARGS__) +#define BT_WARN(fmt, ...) printf("bt: %s: " fmt, __func__, ##__VA_ARGS__) +#define BT_INFO(fmt, ...) printf("bt: " fmt, ##__VA_ARGS__) +#else +#define BT_DBG(fmt, ...) +#define BT_ERR(fmt, ...) +#define BT_WARN(fmt, ...) +#define BT_INFO(fmt, ...) +#endif /* CONFIG_BLUETOOTH_DEBUG */ + +#endif /* __BT_LOG_H */ diff --git a/net/bluetooth/att.c b/net/bluetooth/att.c index 2e92d621ea4..78b414d9236 100644 --- a/net/bluetooth/att.c +++ b/net/bluetooth/att.c @@ -39,6 +39,7 @@ #include #include +#include #include #include #include diff --git a/net/bluetooth/buf.c b/net/bluetooth/buf.c index 236aca093d3..d23a7801731 100644 --- a/net/bluetooth/buf.c +++ b/net/bluetooth/buf.c @@ -37,6 +37,7 @@ #include #include +#include #include #include #include diff --git a/net/bluetooth/conn.c b/net/bluetooth/conn.c index 0d8856d1e08..41a72515096 100644 --- a/net/bluetooth/conn.c +++ b/net/bluetooth/conn.c @@ -39,6 +39,7 @@ #include #include +#include #include #include diff --git a/net/bluetooth/gatt.c b/net/bluetooth/gatt.c index df09047efc4..39694e02a93 100644 --- a/net/bluetooth/gatt.c +++ b/net/bluetooth/gatt.c @@ -37,6 +37,7 @@ #include #include +#include #include #include #include diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 9a2a89196ae..74d64b1372d 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -40,6 +40,7 @@ #include #include +#include #include #include diff --git a/net/bluetooth/keys.c b/net/bluetooth/keys.c index 3219906f7ef..f33cb510533 100644 --- a/net/bluetooth/keys.c +++ b/net/bluetooth/keys.c @@ -34,6 +34,7 @@ #include #include +#include #include #include diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index a17d2fd1030..ffa4c14a72c 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c @@ -37,6 +37,7 @@ #include #include +#include #include #include diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index b6c2ccbdc4b..44e5a81d066 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -40,6 +40,7 @@ #include #include +#include #include #include