From e1e291b063dcf7b8614fbe22e8d3a0c101cd2714 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Sat, 9 Apr 2016 23:47:05 -0500
Subject: [PATCH] bluetooth: Drop vanity trace colors

---
 .../kernel/bluetooth/btCoreData/ChannelInterface.cpp     | 4 +---
 .../kernel/bluetooth/btCoreData/ConnectionInterface.cpp  | 4 +---
 .../kernel/bluetooth/btCoreData/FrameInterface.cpp       | 9 ++++++---
 src/add-ons/kernel/bluetooth/hci/acl.cpp                 | 3 ---
 src/add-ons/kernel/bluetooth/hci/bluetooth.cpp           | 3 ---
 .../kernel/drivers/bluetooth/h2/h2generic/h2generic.cpp  | 7 ++-----
 6 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/add-ons/kernel/bluetooth/btCoreData/ChannelInterface.cpp b/src/add-ons/kernel/bluetooth/btCoreData/ChannelInterface.cpp
index 7ed7f256313..3a18aed3bd0 100644
--- a/src/add-ons/kernel/bluetooth/btCoreData/ChannelInterface.cpp
+++ b/src/add-ons/kernel/bluetooth/btCoreData/ChannelInterface.cpp
@@ -7,14 +7,12 @@
 #include <l2cap.h>
 #include <bluetooth/HCI/btHCI_command.h>
 
-#define BT_DEBUG_THIS_MODULE
-#define SUBMODULE_NAME "Channel"
-#define SUBMODULE_COLOR 31
 #include <btDebug.h>
 
 #include "ChannelInterface.h"
 #include "FrameInterface.h"
 
+
 L2capChannel*
 ChannelBySourceID(HciConnection *conn, uint16 scid)
 {
diff --git a/src/add-ons/kernel/bluetooth/btCoreData/ConnectionInterface.cpp b/src/add-ons/kernel/bluetooth/btCoreData/ConnectionInterface.cpp
index ae154aafe5b..e25b537a00c 100644
--- a/src/add-ons/kernel/bluetooth/btCoreData/ConnectionInterface.cpp
+++ b/src/add-ons/kernel/bluetooth/btCoreData/ConnectionInterface.cpp
@@ -10,15 +10,13 @@
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/bdaddrUtils.h>
 
-#define BT_DEBUG_THIS_MODULE
-#define SUBMODULE_NAME "Connection"
-#define SUBMODULE_COLOR 31
 #include <btDebug.h>
 
 #include <l2cap.h>
 
 #include "ConnectionInterface.h"
 
+
 void PurgeChannels(HciConnection* conn);
 
 
diff --git a/src/add-ons/kernel/bluetooth/btCoreData/FrameInterface.cpp b/src/add-ons/kernel/bluetooth/btCoreData/FrameInterface.cpp
index b59a87b29fa..343952cf167 100644
--- a/src/add-ons/kernel/bluetooth/btCoreData/FrameInterface.cpp
+++ b/src/add-ons/kernel/bluetooth/btCoreData/FrameInterface.cpp
@@ -1,12 +1,15 @@
+/*
+ * Copyright 2008 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
+ * All rights reserved. Distributed under the terms of the MIT License.
+ */
+
 #include "FrameInterface.h"
 
-#define BT_DEBUG_THIS_MODULE
-#define SUBMODULE_NAME "Frame"
-#define SUBMODULE_COLOR 31
 #include <btDebug.h>
 
 #include <lock.h>
 
+
 L2capFrame*
 SignalByIdent(HciConnection* conn, uint8 ident)
 {
diff --git a/src/add-ons/kernel/bluetooth/hci/acl.cpp b/src/add-ons/kernel/bluetooth/hci/acl.cpp
index df659e48cd1..230ba65db59 100644
--- a/src/add-ons/kernel/bluetooth/hci/acl.cpp
+++ b/src/add-ons/kernel/bluetooth/hci/acl.cpp
@@ -14,9 +14,6 @@
 #include <bluetooth/HCI/btHCI_event.h>
 #include <bluetooth/bdaddrUtils.h>
 
-//#define BT_DEBUG_THIS_MODULE
-#define SUBMODULE_NAME "ACL"
-#define SUBMODULE_COLOR 34
 #include <btDebug.h>
 #include <btCoreData.h>
 #include <btModules.h>
diff --git a/src/add-ons/kernel/bluetooth/hci/bluetooth.cpp b/src/add-ons/kernel/bluetooth/hci/bluetooth.cpp
index 0f305b8d668..6929bb3d5d2 100644
--- a/src/add-ons/kernel/bluetooth/hci/bluetooth.cpp
+++ b/src/add-ons/kernel/bluetooth/hci/bluetooth.cpp
@@ -22,9 +22,6 @@
 #include <net_stack.h>
 #include <NetBufferUtilities.h>
 
-#define BT_DEBUG_THIS_MODULE
-#define SUBMODULE_NAME "hci"
-#define SUBMODULE_COLOR 34
 #include <btDebug.h>
 #include <btCoreData.h>
 #include <btModules.h>
diff --git a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.cpp b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.cpp
index f00d5ec6e1c..95359f0f12e 100644
--- a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.cpp
+++ b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.cpp
@@ -5,6 +5,8 @@
  *
  */
 
+#include "h2generic.h"
+
 #include <kernel.h>
 #include <malloc.h>
 #include <stdio.h>
@@ -14,16 +16,11 @@
 #include <ByteOrder.h>
 #include <Drivers.h>
 
-
 #include "snet_buffer.h"
 
-#define BT_DEBUG_THIS_MODULE
-#define SUBMODULE_NAME BLUETOOTH_DEVICE_DEVFS_NAME
-#define SUBMODULE_COLOR 35
 #include <btDebug.h>
 #include <btModules.h>
 
-#include "h2generic.h"
 #include "h2transactions.h"
 #include "h2util.h"