From bf1d0110498956633dbc7ff93fc500e3d192bd41 Mon Sep 17 00:00:00 2001
From: arcum42 <arcum42@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Thu, 22 Apr 2010 00:48:06 +0000
Subject: [PATCH] The usual batch of Linux fixes.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2885 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 pcsx2/CDVD/CDVD.cpp             | 4 ++--
 pcsx2/HwWrite.cpp               | 3 ++-
 pcsx2/Interpreter.cpp           | 2 +-
 pcsx2/R5900.cpp                 | 2 +-
 pcsx2/x86/ix86-32/iR5900-32.cpp | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pcsx2/CDVD/CDVD.cpp b/pcsx2/CDVD/CDVD.cpp
index 581369f6ae..487adddfba 100644
--- a/pcsx2/CDVD/CDVD.cpp
+++ b/pcsx2/CDVD/CDVD.cpp
@@ -334,12 +334,12 @@ static __forceinline void _reloadElfInfo(wxString elfpath)
 	if (fname.Matches(L"????_???.??*"))
 		DiscID = fname(0,4) + L"-" + fname(5,3) + fname(9,2);
 
-	Console.WriteLn("Disc ID = %s", DiscID.ToUTF8());
+	Console.WriteLn("Disc ID = %s", DiscID.ToUTF8().data());
 
 	elfptr = loadElf(elfpath);
 
 	ElfCRC = elfptr->getCRC();
-	Console.WriteLn("ELF (%s) CRC = %8.8X", elfpath.ToUTF8(), ElfCRC);
+	Console.WriteLn("ELF (%s) CRC = %8.8X", elfpath.ToUTF8().data(), ElfCRC);
 
 	ElfEntry = elfptr->header.e_entry;
 	Console.WriteLn("Entry point = 0x%08x", ElfEntry);
diff --git a/pcsx2/HwWrite.cpp b/pcsx2/HwWrite.cpp
index c6503bdc14..bc1752de78 100644
--- a/pcsx2/HwWrite.cpp
+++ b/pcsx2/HwWrite.cpp
@@ -190,6 +190,7 @@ static void DmaExec( void (*func)(), u32 mem, u32 value )
 				cpuClearInt( ChannelNumber(mem) );
 			}
 			//Sanity Check for possible future bug fix0rs ;p
+			//Spams on Persona 4 opening.
 			if(reg->chcr.TAG != chcr.TAG) DevCon.Warning(L"32bit CHCR Tag on %s changed to %x from %x QWC = %x Channel Active", ChcrName(mem), chcr.TAG, reg->chcr.TAG, reg->qwc);
 			//Here we update the LOWER CHCR, if a chain is stopped half way through, it can be manipulated in to a different mode
 			//But we need to preserve the existing tag for now
@@ -1232,4 +1233,4 @@ void __fastcall hwWrite128_generic(u32 mem, const mem128_t *srcval)
 			UnknownHW_LOG("Unknown Hardware write 128 at %x with value %x_%x (status=%x)", mem, srcval[1], srcval[0], cpuRegs.CP0.n.Status.val);
 		break;
 	}
-}
\ No newline at end of file
+}
diff --git a/pcsx2/Interpreter.cpp b/pcsx2/Interpreter.cpp
index b5a6160c35..7e4a518dd4 100644
--- a/pcsx2/Interpreter.cpp
+++ b/pcsx2/Interpreter.cpp
@@ -20,7 +20,7 @@
 #include "R5900OpcodeTables.h"
 #include "System/SysThreads.h"
 
-#include "ElfHeader.h"
+#include "Elfheader.h"
 
 #include <float.h>
 
diff --git a/pcsx2/R5900.cpp b/pcsx2/R5900.cpp
index 81f0619587..5d01d3ffe3 100644
--- a/pcsx2/R5900.cpp
+++ b/pcsx2/R5900.cpp
@@ -27,7 +27,7 @@
 
 #include "Hardware.h"
 
-#include "ElfHeader.h"
+#include "Elfheader.h"
 #include "CDVD/CDVD.h"
 #include "Patch.h"
 
diff --git a/pcsx2/x86/ix86-32/iR5900-32.cpp b/pcsx2/x86/ix86-32/iR5900-32.cpp
index 31ee1b0f3b..7a311bfb59 100644
--- a/pcsx2/x86/ix86-32/iR5900-32.cpp
+++ b/pcsx2/x86/ix86-32/iR5900-32.cpp
@@ -29,7 +29,7 @@
 #include "GS.h"
 
 #include "CDVD/CDVD.h"
-#include "ElfHeader.h"
+#include "Elfheader.h"
 
 #if !PCSX2_SEH
 #	include <csetjmp>