From 05e1165520f748a223162a9996caa2535125f633 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Sun, 10 Apr 2016 01:01:07 -0500
Subject: [PATCH] h2generic: Stop using btDebug + style fixes

---
 .../drivers/bluetooth/h2/h2generic/h2debug.h  | 24 +++++++++++++++++++
 .../bluetooth/h2/h2generic/h2generic.cpp      |  9 ++++---
 .../bluetooth/h2/h2generic/h2generic.h        |  2 ++
 .../bluetooth/h2/h2generic/h2transactions.cpp | 14 +++++------
 .../bluetooth/h2/h2generic/h2transactions.h   |  3 ++-
 .../bluetooth/h2/h2generic/h2upper.cpp        |  8 +++----
 .../drivers/bluetooth/h2/h2generic/h2upper.h  |  2 ++
 .../drivers/bluetooth/h2/h2generic/h2util.cpp | 10 ++++----
 .../bluetooth/h2/h2generic/snet_buffer.cpp    |  3 ++-
 9 files changed, 52 insertions(+), 23 deletions(-)
 create mode 100644 src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2debug.h

diff --git a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2debug.h b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2debug.h
new file mode 100644
index 0000000000..1799cf42da
--- /dev/null
+++ b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2debug.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2015-2016 Haiku, Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ */
+#ifndef _H2DEBUG_H
+#define _H2DEBUG_H
+
+
+#include <KernelExport.h>
+
+
+#define DEBUG
+#ifdef DEBUG
+#   define TRACE(x...) dprintf("h2generic: " x)
+#else
+#   define TRACE(x...) ;
+#endif
+
+#define ERROR(x...) dprintf("h2generic: " x)
+#define CALLED(x...) TRACE("h2generic: CALLED %s\n", __PRETTY_FUNCTION__)
+
+
+#endif /* _H2DEBUG_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 95359f0f12..9dad09978c 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,7 @@
  *
  */
 
+
 #include "h2generic.h"
 
 #include <kernel.h>
@@ -16,16 +17,14 @@
 #include <ByteOrder.h>
 #include <Drivers.h>
 
-#include "snet_buffer.h"
-
-#include <btDebug.h>
 #include <btModules.h>
 
+#include "snet_buffer.h"
+#include "h2cfg.h"
+#include "h2debug.h"
 #include "h2transactions.h"
 #include "h2util.h"
 
-#include "h2cfg.h"
-
 
 int32 api_version = B_CUR_DRIVER_API_VERSION;
 
diff --git a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.h b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.h
index 695f672629..78142c08a5 100644
--- a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.h
+++ b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2generic.h
@@ -7,6 +7,7 @@
 #ifndef _H2GENERIC_H_
 #define _H2GENERIC_H_
 
+
 #include <net_buffer.h>
 #include <net_device.h>
 
@@ -26,6 +27,7 @@
 
 #include "snet_buffer.h"
 
+
 // USB definitions for the generic device move to h2cfg
 #define UDCLASS_WIRELESS	0xe0
 #define UDSUBCLASS_RF		0x01
diff --git a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2transactions.cpp b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2transactions.cpp
index f2a8be6183..99ea5f4ced 100644
--- a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2transactions.cpp
+++ b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2transactions.cpp
@@ -4,25 +4,25 @@
  * All rights reserved. Distributed under the terms of the MIT License.
  */
 
-#include "h2generic.h"
+
 #include "h2transactions.h"
-#include "h2upper.h"
-#include "h2util.h"
 
 #include <bluetooth/HCI/btHCI.h>
 #include <bluetooth/HCI/btHCI_event.h>
 #include <bluetooth/HCI/btHCI_acl.h>
 
 #include <ByteOrder.h>
-
 #include <kernel.h>
 #include <string.h>
 
-//#define DUMP_BUFFERS
-#define BT_DEBUG_THIS_MODULE
-#include <btDebug.h>
+#include "h2debug.h"
+#include "h2generic.h"
+#include "h2upper.h"
+#include "h2util.h"
 
 
+//#define DUMP_BUFFERS
+
 /* Forward declaration */
 
 #ifndef HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2transactions.h b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2transactions.h
index 15b3b17d93..5bfb1e7898 100644
--- a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2transactions.h
+++ b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2transactions.h
@@ -2,12 +2,13 @@
  * Copyright 2007 Oliver Ruiz Dorantes, oliver.ruiz.dorantes_at_gmail.com
  * All rights reserved. Distributed under the terms of the MIT License.
  */
-
 #ifndef _H2TRANSACTION_H_
 #define _H2TRANSACTION_H_
 
+
 #include "h2generic.h"
 
+
 status_t submit_rx_event(bt_usb_dev* bdev);
 status_t submit_rx_acl(bt_usb_dev* bdev);
 status_t submit_rx_sco(bt_usb_dev* bdev);
diff --git a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2upper.cpp b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2upper.cpp
index f1cdc83ac4..0019ac970c 100644
--- a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2upper.cpp
+++ b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2upper.cpp
@@ -4,20 +4,20 @@
  * All rights reserved. Distributed under the terms of the MIT License.
  */
 
+
+#include "h2upper.h"
+
 #include <string.h>
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/HCI/btHCI_transport.h>
 #include <kernel.h>
 
+#include "h2debug.h"
 #include "h2generic.h"
-#include "h2upper.h"
 #include "h2transactions.h"
 #include "snet_buffer.h"
 
-#define BT_DEBUG_THIS_MODULE
-#include <btDebug.h>
-
 
 // TODO: split for commands and comunication (ACL & SCO)
 void
diff --git a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2upper.h b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2upper.h
index fb400557c8..4e4e009b01 100644
--- a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2upper.h
+++ b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2upper.h
@@ -5,10 +5,12 @@
 #ifndef _H2UPPER_H_
 #define _H2UPPER_H_
 
+
 #include <util/list.h>
 
 #include "h2generic.h"
 
+
 status_t post_packet_up(bt_usb_dev* bdev, bt_packet_t type, void* buf);
 status_t send_packet(hci_id hid, bt_packet_t type, net_buffer* nbuf);
 status_t send_command(hci_id hid, snet_buffer* snbuf);
diff --git a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2util.cpp b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2util.cpp
index 866ce77723..182b1666c8 100644
--- a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2util.cpp
+++ b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/h2util.cpp
@@ -4,19 +4,19 @@
  * All rights reserved. Distributed under the terms of the MIT License.
  */
 
-#include <malloc.h>
 
-#include "h2upper.h"
 #include "h2util.h"
-#include "h2transactions.h"
+
+#include <malloc.h>
 
 #include <bluetooth/HCI/btHCI_acl.h>
 #include <bluetooth/HCI/btHCI_command.h>
 #include <bluetooth/HCI/btHCI_event.h>
 #include <bluetooth/HCI/btHCI_sco.h>
 
-#define BT_DEBUG_THIS_MODULE
-#include <btDebug.h>
+#include "h2debug.h"
+#include "h2upper.h"
+#include "h2transactions.h"
 
 
 void*
diff --git a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/snet_buffer.cpp b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/snet_buffer.cpp
index 4ff42fd9be..26d6eb979f 100644
--- a/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/snet_buffer.cpp
+++ b/src/add-ons/kernel/drivers/bluetooth/h2/h2generic/snet_buffer.cpp
@@ -5,12 +5,14 @@
  *
  */
 
+
 #include "snet_buffer.h"
 
 #include <malloc.h>
 #include <string.h>
 #include <KernelExport.h>
 
+
 struct snet_buffer {
 	struct list_link	link;
 
@@ -22,7 +24,6 @@ struct snet_buffer {
 	uint16				pullingSize;
 
 	void*				cookie;
-	
 };