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 <johan.hedberg@intel.com>
diff --git a/drivers/bluetooth/uart.c b/drivers/bluetooth/uart.c
index 0bf0731..4952559 100644
--- a/drivers/bluetooth/uart.c
+++ b/drivers/bluetooth/uart.c
@@ -42,6 +42,7 @@
#include <string.h>
#include <bluetooth/bluetooth.h>
+#include <bluetooth/log.h>
#include <bluetooth/hci.h>
#if !defined(CONFIG_BLUETOOTH_DEBUG_UART)
diff --git a/include/bluetooth/bluetooth.h b/include/bluetooth/bluetooth.h
index 67cb6fb..b104ebd 100644
--- a/include/bluetooth/bluetooth.h
+++ b/include/bluetooth/bluetooth.h
@@ -32,26 +32,10 @@
#ifndef __BT_BLUETOOTH_H
#define __BT_BLUETOOTH_H
-#include <stdio.h>
#include <bluetooth/buf.h>
#include <bluetooth/conn.h>
#include <bluetooth/hci.h>
-/* 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 0000000..33dd08c
--- /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 <stdio.h>
+
+#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 2e92d62..78b414d 100644
--- a/net/bluetooth/att.c
+++ b/net/bluetooth/att.c
@@ -39,6 +39,7 @@
#include <misc/byteorder.h>
#include <misc/util.h>
+#include <bluetooth/log.h>
#include <bluetooth/hci.h>
#include <bluetooth/bluetooth.h>
#include <bluetooth/uuid.h>
diff --git a/net/bluetooth/buf.c b/net/bluetooth/buf.c
index 236aca0..d23a780 100644
--- a/net/bluetooth/buf.c
+++ b/net/bluetooth/buf.c
@@ -37,6 +37,7 @@
#include <string.h>
#include <misc/byteorder.h>
+#include <bluetooth/log.h>
#include <bluetooth/hci.h>
#include <bluetooth/bluetooth.h>
#include <bluetooth/buf.h>
diff --git a/net/bluetooth/conn.c b/net/bluetooth/conn.c
index 0d8856d..41a7251 100644
--- a/net/bluetooth/conn.c
+++ b/net/bluetooth/conn.c
@@ -39,6 +39,7 @@
#include <misc/byteorder.h>
#include <misc/util.h>
+#include <bluetooth/log.h>
#include <bluetooth/hci.h>
#include <bluetooth/bluetooth.h>
diff --git a/net/bluetooth/gatt.c b/net/bluetooth/gatt.c
index df09047..39694e0 100644
--- a/net/bluetooth/gatt.c
+++ b/net/bluetooth/gatt.c
@@ -37,6 +37,7 @@
#include <misc/byteorder.h>
#include <misc/util.h>
+#include <bluetooth/log.h>
#include <bluetooth/hci.h>
#include <bluetooth/bluetooth.h>
#include <bluetooth/buf.h>
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 9a2a891..74d64b1 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -40,6 +40,7 @@
#include <misc/util.h>
#include <misc/byteorder.h>
+#include <bluetooth/log.h>
#include <bluetooth/bluetooth.h>
#include <bluetooth/hci.h>
diff --git a/net/bluetooth/keys.c b/net/bluetooth/keys.c
index 3219906..f33cb51 100644
--- a/net/bluetooth/keys.c
+++ b/net/bluetooth/keys.c
@@ -34,6 +34,7 @@
#include <nanokernel.h>
#include <misc/util.h>
+#include <bluetooth/log.h>
#include <bluetooth/bluetooth.h>
#include <bluetooth/hci.h>
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index a17d2fd..ffa4c14 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -37,6 +37,7 @@
#include <errno.h>
#include <misc/byteorder.h>
+#include <bluetooth/log.h>
#include <bluetooth/hci.h>
#include <bluetooth/bluetooth.h>
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index b6c2ccb..44e5a81 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -40,6 +40,7 @@
#include <string.h>
#include <misc/util.h>
+#include <bluetooth/log.h>
#include <bluetooth/hci.h>
#include <bluetooth/bluetooth.h>
