From e99b687525c71c78b5c227bdd747f31cd8965f32 Mon Sep 17 00:00:00 2001
From: "XTra.KrazzY" <XTra.KrazzY@gmail.com>
Date: Sat, 6 Jun 2009 23:24:41 +0000
Subject: [PATCH] Wii IPC: Code housekeeping

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3345 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 .../Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp  | 6 +++---
 Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp   | 7 -------
 Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h     | 9 +++++++++
 3 files changed, 12 insertions(+), 10 deletions(-)

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 87caa4273b..af094b0842 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
@@ -19,6 +19,7 @@
 #include "FileUtil.h"
 #include "StringUtil.h"
 
+#include "WII_IPC_HLE_Device_fs.h"
 #include "WII_IPC_HLE_Device_FileIO.h"
 
 
@@ -94,7 +95,7 @@ CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode)
 	// Reading requires the file to exist
 	if(_Mode == 0x01 && !File::Exists(m_Filename.c_str())) {
 		ERROR_LOG(WII_IPC_FILEIO, " FileIO failed open for reading: %s - File doesn't exist", m_Filename.c_str());
-		ReturnValue = -106;
+		ReturnValue = FS_FILE_NOT_EXIST;
 	} else {
 		switch(_Mode)
 		{
@@ -113,7 +114,7 @@ CWII_IPC_HLE_Device_FileIO::Open(u32 _CommandAddress, u32 _Mode)
     else if(ReturnValue == 0)
     {
         ERROR_LOG(WII_IPC_FILEIO, " FileIO failed open: %s(%s) - I/O Error", m_Filename.c_str(), Modes[_Mode]);
-        ReturnValue = -101;
+        ReturnValue = FS_INVALID_ARGUMENT;
     }
 
     Memory::Write_U32(ReturnValue, _CommandAddress+4);
@@ -141,7 +142,6 @@ CWII_IPC_HLE_Device_FileIO::Seek(u32 _CommandAddress)
 	if (m_FileLength > 0 && SeekPosition > m_FileLength && Mode == 0)
 	{
 		NewSeekPosition = SeekPosition % m_FileLength;
-		INFO_LOG(WII_IPC_FILEIO, "***********************************:");
 	}
 
 	INFO_LOG(WII_IPC_FILEIO, "FileIO: New Seek Pos: %s, Mode: %i (Device=%s)", ThS(NewSeekPosition).c_str(), Mode, GetDeviceName().c_str());	
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 e984f7467f..810d4c7cec 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
@@ -27,13 +27,6 @@
 
 extern std::string HLE_IPC_BuildFilename(const char* _pFilename, int _size);
 
-#define FS_RESULT_OK			(0)
-#define FS_DIRFILE_NOT_FOUND      	(-6)
-#define FS_INVALID_ARGUMENT		(-101)
-#define FS_FILE_EXIST			(-105)
-#define FS_FILE_NOT_EXIST		(-106)
-#define FS_RESULT_FATAL			(-128)
-
 #define MAX_NAME				(12)
 
 
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h
index 549ea55c33..a10a6d0040 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h
+++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.h
@@ -19,6 +19,15 @@
 
 #include "WII_IPC_HLE_Device.h"
 
+enum {
+	FS_RESULT_OK			= 0,
+	FS_DIRFILE_NOT_FOUND    = -6,
+	FS_INVALID_ARGUMENT		= -101,
+	FS_FILE_EXIST			= -105,
+	FS_FILE_NOT_EXIST		= -106,
+	FS_RESULT_FATAL			= -128,
+};
+
 class CWII_IPC_HLE_Device_fs : public IWII_IPC_HLE_Device
 {
 public: