From 73e3d8d20ca136b61b5647ed9807c6811ba02d3a Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Sat, 9 Apr 2016 21:09:19 -0500
Subject: [PATCH] bluetooth/btCoreData: x86_64 build fixes

---
 src/add-ons/kernel/bluetooth/Jamfile          |  2 +-
 .../bluetooth/btCoreData/BTCoreData.cpp       | 69 ++++++++++---------
 .../kernel/bluetooth/btCoreData/Jamfile       |  1 +
 3 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/src/add-ons/kernel/bluetooth/Jamfile b/src/add-ons/kernel/bluetooth/Jamfile
index b5b4bc97df..28f891d70d 100644
--- a/src/add-ons/kernel/bluetooth/Jamfile
+++ b/src/add-ons/kernel/bluetooth/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src add-ons kernel bluetooth ; 
+SubDir HAIKU_TOP src add-ons kernel bluetooth ;
 
 SubInclude HAIKU_TOP src add-ons kernel bluetooth btCoreData ;
 SubInclude HAIKU_TOP src add-ons kernel bluetooth hci ;
diff --git a/src/add-ons/kernel/bluetooth/btCoreData/BTCoreData.cpp b/src/add-ons/kernel/bluetooth/btCoreData/BTCoreData.cpp
index 1a3605fb62..accbda194a 100644
--- a/src/add-ons/kernel/bluetooth/btCoreData/BTCoreData.cpp
+++ b/src/add-ons/kernel/bluetooth/btCoreData/BTCoreData.cpp
@@ -43,44 +43,47 @@ DumpHciConnections(int argc, char** argv)
 
 	while (iterator.HasNext()) {
 		conn = iterator.Next();
-		kprintf("LocalDevice=%lx Destination=%s handle=%#x type=%d"
-			"outqueue=%ld expected=%ld\n", conn->Hid,
-			bdaddrUtils::ToString(conn->destination), conn->handle,	conn->type,
-			conn->OutGoingFrames.Count() , conn->ExpectedResponses.Count());
+		/*
+		kprintf("LocalDevice=0x%" B_PRIx32 " Destination=%s handle=%#x type=%d"
+			"outqueue=%" B_PRId32 " expected=%" B_PRId32 "\n", conn->Hid,
+			bdaddrUtils::ToString(conn->destination).String(), conn->handle,
+			conn->type, conn->OutGoingFrames.Count(),
+			conn->ExpectedResponses.Count());
+		*/
 
-			// each channel
-			kprintf("\tChannels\n");
-			DoublyLinkedList<L2capChannel>::Iterator channelIterator
-				= conn->ChannelList.GetIterator();
+		// each channel
+		kprintf("\tChannels\n");
+		DoublyLinkedList<L2capChannel>::Iterator channelIterator
+			= conn->ChannelList.GetIterator();
 
-			while (channelIterator.HasNext()) {
-				chan = channelIterator.Next();
-				kprintf("\t\tscid=%x dcid=%x state=%x cfg=%x\n", chan->scid,
-					chan->dcid, chan->state, chan->cfgState);
-			}
+		while (channelIterator.HasNext()) {
+			chan = channelIterator.Next();
+			kprintf("\t\tscid=%x dcid=%x state=%x cfg=%x\n", chan->scid,
+				chan->dcid, chan->state, chan->cfgState);
+		}
 
-			// Each outgoing
-			kprintf("\n\tOutGoingFrames\n");
-			DoublyLinkedList<L2capFrame>::Iterator frameIterator
-				= conn->OutGoingFrames.GetIterator();
-			while (frameIterator.HasNext()) {
-				frame = frameIterator.Next();
-				kprintf("\t\tscid=%x code=%x ident=%x type=%x, buffer=%p\n",
-					frame->channel->scid, frame->code, frame->ident,
-					frame->type, frame->buffer);
-			}
+		// Each outgoing
+		kprintf("\n\tOutGoingFrames\n");
+		DoublyLinkedList<L2capFrame>::Iterator frameIterator
+			= conn->OutGoingFrames.GetIterator();
+		while (frameIterator.HasNext()) {
+			frame = frameIterator.Next();
+			kprintf("\t\tscid=%x code=%x ident=%x type=%x, buffer=%p\n",
+				frame->channel->scid, frame->code, frame->ident,
+				frame->type, frame->buffer);
+		}
 
-			// Each expected
-			kprintf("\n\tExpectedFrames\n");
-			DoublyLinkedList<L2capFrame>::Iterator frameExpectedIterator
-				= conn->ExpectedResponses.GetIterator();
+		// Each expected
+		kprintf("\n\tExpectedFrames\n");
+		DoublyLinkedList<L2capFrame>::Iterator frameExpectedIterator
+			= conn->ExpectedResponses.GetIterator();
 
-			while (frameExpectedIterator.HasNext()) {
-				frame = frameExpectedIterator.Next();
-				kprintf("\t\tscid=%x code=%x ident=%x type=%x, buffer=%p\n",
-					frame->channel->scid, frame->code, frame->ident,
-					frame->type, frame->buffer);
-			}
+		while (frameExpectedIterator.HasNext()) {
+			frame = frameExpectedIterator.Next();
+			kprintf("\t\tscid=%x code=%x ident=%x type=%x, buffer=%p\n",
+				frame->channel->scid, frame->code, frame->ident,
+				frame->type, frame->buffer);
+		}
 	}
 
 	return 0;
diff --git a/src/add-ons/kernel/bluetooth/btCoreData/Jamfile b/src/add-ons/kernel/bluetooth/btCoreData/Jamfile
index a0f577eb33..7134dee174 100644
--- a/src/add-ons/kernel/bluetooth/btCoreData/Jamfile
+++ b/src/add-ons/kernel/bluetooth/btCoreData/Jamfile
@@ -9,6 +9,7 @@ if $(DEBUG) = 0 {
 	SubDirCcFlags [ FDefines DEBUG_MAX_LEVEL_FLOW=0 DEBUG_MAX_LEVEL_INFO=0  ] ;
 }
 
+
 KernelAddon btCoreData :
 	ConnectionInterface.cpp
 	ChannelInterface.cpp