From d3660be648125fd8cb3578810ff1d95ad482cac2 Mon Sep 17 00:00:00 2001
From: "fires.gc" <fires.gc@gmail.com>
Date: Tue, 21 Oct 2008 16:51:52 +0000
Subject: [PATCH] compile fix

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@928 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp | 8 +++++---
 Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.h   | 9 ++-------
 Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp    | 1 +
 Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h      | 1 -
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
index 8c91b173b5..549e8d023b 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
@@ -305,6 +305,11 @@ u32 CWII_IPC_HLE_Device_usb_oh1_57e_305::Update()
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
+void CWII_IPC_HLE_Device_usb_oh1_57e_305::AddEventToQueue(const SQueuedEvent& _event)
+{
+	m_EventQueue.push(_event);
+}
+
 bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventCommandStatus(u16 _Opcode)
 {        
 	SQueuedEvent Event(sizeof(SHCIEventStatus), 0);
@@ -883,11 +888,8 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::ExecuteHCICommandMessage(const SHCICom
 		//
 	default:
 		{
-#ifdef LOGGING
 			u16 ocf = HCI_OCF(pMsg->Opcode);
 			u16 ogf = HCI_OGF(pMsg->Opcode);
-#endif
-
 			
 			PanicAlert("0x%08x", _rHCICommandMessage.m_PayLoadAddr);
 
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.h
index e0c983414a..44b6a14434 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.h
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.h
@@ -14,6 +14,7 @@
 
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
+
 #ifndef _WII_IPC_HLE_DEVICE_USB_H_
 #define _WII_IPC_HLE_DEVICE_USB_H_
 
@@ -24,8 +25,6 @@
 
 #include "WII_IPC_HLE_WiiMote.h"
 
-class CWII_IPC_HLE_WiiMote;
-
 
 union UACLHeader
 {
@@ -147,6 +146,7 @@ private:
 	SIOCtlVBuffer* m_pHCIBuffer;
 
 	// Events
+	void AddEventToQueue(const SQueuedEvent& _event);
 	bool SendEventCommandStatus(u16 _Opcode);
 	void SendEventCommandComplete(u16 _OpCode, void* _pData, u32 _DataSize);
 	bool SendEventInquiryResponse();
@@ -205,11 +205,6 @@ private:
 	void CommandVendorSpecific_FC4F(u8* _Input, u32 _Size);	
 
 	void SendToDevice(u16 _ConnectionHandle, u8* _pData, u32 _Size);
-
-	void AddEventToQueue(const SQueuedEvent& _event)
-	{
-		m_EventQueue.push(_event);
-	}
 };
 
 #endif
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
index bd49130e5c..3349adf6c2 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
@@ -18,6 +18,7 @@
 #include "Common.h"
 #include "../Plugins/Plugin_Wiimote.h"
 
+#include "WII_IPC_HLE_Device_usb.h"
 #include "WII_IPC_HLE_WiiMote.h"
 #include "l2cap.h"
 #include "WiiMote_HID_Attr.h"
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h
index 7c434c9abe..c79bc04025 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.h
@@ -18,7 +18,6 @@
 #define _WII_IPC_HLE_WII_MOTE_
 
 #include <map>
-#include "WII_IPC_HLE_Device_usb.h"
 
 class CWII_IPC_HLE_Device_usb_oh1_57e_305;