From dc123aeebf23b2c4d61c0f58ecc1a3a565ff6706 Mon Sep 17 00:00:00 2001
From: John Peterson <jpeterson57@gmail.com>
Date: Fri, 14 Nov 2008 19:12:11 +0000
Subject: [PATCH] Four files had been misplaced in the Core project. I moved
 them back to their folder.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1177 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Core/Core.vcproj                  | 32 +++++++++----------
 .../Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp |  5 ++-
 .../Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp     |  5 +--
 .../Src/UCodes/UCode_AX_Voice.h               |  4 +++
 4 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/Source/Core/Core/Core.vcproj b/Source/Core/Core/Core.vcproj
index b6efc3f5ee..4208a7fbf8 100644
--- a/Source/Core/Core/Core.vcproj
+++ b/Source/Core/Core/Core.vcproj
@@ -1107,10 +1107,18 @@
 				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_FileIO.h"
 				>
 			</File>
+			<File
+				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_fs.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_fs.h"
 				>
 			</File>
+			<File
+				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_net.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_net.h"
 				>
@@ -1143,6 +1151,14 @@
 				RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_WiiMote.h"
 				>
 			</File>
+			<File
+				RelativePath=".\Src\IPC_HLE\WiiMote_HID_Attr.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\IPC_HLE\WiiMote_HID_Attr.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Boot"
@@ -1348,22 +1364,6 @@
 			RelativePath=".\Src\VolumeHandler.h"
 			>
 		</File>
-		<File
-			RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_fs.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\Src\IPC_HLE\WII_IPC_HLE_Device_net.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\Src\IPC_HLE\WiiMote_HID_Attr.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\Src\IPC_HLE\WiiMote_HID_Attr.h"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
index 8df0fefda9..f046fb07c6 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
@@ -68,6 +68,8 @@ CWII_IPC_HLE_Device_FileIO::Close(u32 _CommandAddress)
 bool 
 CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode)  
 { 
+	LOG(WII_IPC_FILEIO, "FileIO::Open=======================================================");
+
 	u32 ReturnValue = 0;
 
 	const char Modes[][128] =
@@ -108,7 +110,8 @@ CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode)
     }
 
     Memory::Write_U32(ReturnValue, _CommandAddress+4);
-    return true; 
+	LOG(WII_IPC_FILEIO, "===================================================================");
+    return true;
 }
 
 bool 
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
index a43324d3f5..b5274d971b 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
@@ -354,6 +354,7 @@ s32 CWII_IPC_HLE_Device_fs::ExecuteCommand(u32 _Parameter, u32 _BufferIn, u32 _B
 
 	case CREATE_FILE:
 		{
+			LOGV(WII_IPC_FILEIO, 0, "==============================================================");
 			_dbg_assert_(WII_IPC_FILEIO, _BufferOutSize == 0);
 
 			u32 Addr = _BufferIn;
@@ -367,7 +368,7 @@ s32 CWII_IPC_HLE_Device_fs::ExecuteCommand(u32 _Parameter, u32 _BufferIn, u32 _B
 			u8 OtherPerm = Memory::Read_U8(Addr); Addr++;
 			u8 Attributes = Memory::Read_U8(Addr); Addr++;
 
-			LOG(WII_IPC_FILEIO, "FS: CreateFile %s", Filename.c_str());
+			LOGV(WII_IPC_FILEIO, 0, "FS: CreateFile %s", Filename.c_str());
 			LOG(WII_IPC_FILEIO, "    OwnerID: 0x08%x", OwnerID);
 			LOG(WII_IPC_FILEIO, "    GroupID: 0x04%x", GroupID);
 			LOG(WII_IPC_FILEIO, "    OwnerPerm: 0x02%x", OwnerPerm);
@@ -400,7 +401,7 @@ s32 CWII_IPC_HLE_Device_fs::ExecuteCommand(u32 _Parameter, u32 _BufferIn, u32 _B
 		PanicAlert("CWII_IPC_HLE_Device_fs::IOCtl: ni  0x%x", _Parameter);
 		break;
 	}
-
+	LOGV(WII_IPC_FILEIO, 0, "==============================================================");
 	return FS_RESULT_FATAL;
 }
 
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h
index 73f6558d2f..f7cbb9f6a8 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h
@@ -293,6 +293,10 @@ inline void MixAddVoice(ParamBlockType &pb, int *templbuffer, int *temprbuffer,
 }
 
 
+
+// ================================================
+// Voice hacks
+// --------------
 template<class ParamBlockType>
 inline void DoVoiceHacks(ParamBlockType &pb)
 {