Various changes: Fixed linux build, added some zelda ucode RE, added HLE mail logging features

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3704 8ced0084-cf51-0410-be5f-012b33b47a6e

6 files changed, 10 insertions, 8 deletions

diff --git a/Source/Core/AudioCommon/Src/AOSoundStream.cpp b/Source/Core/AudioCommon/Src/AOSoundStream.cpp
index c3cae83f74..ba2623d156 100644
--- a/Source/Core/AudioCommon/Src/AOSoundStream.cpp
+++ b/Source/Core/AudioCommon/Src/AOSoundStream.cpp
@@ -46,7 +46,7 @@ void AOSound::SoundLoop()
     while (!threadData)
 	{
         soundCriticalSection.Enter();
-		m_mixer->Mix(realtimeBuffer, numBytesToRender >> 2);
+        m_mixer->Mix(realtimeBuffer, numBytesToRender >> 2);
         ao_play(device, (char*)realtimeBuffer, numBytesToRender);
         soundCriticalSection.Leave();
 
@@ -65,7 +65,7 @@ void *soundThread(void *args)
 
 bool AOSound::Start()
 {
-	memset(realtimeBuffer, 0, sizeof(realtimeBuffer));
+    memset(realtimeBuffer, 0, sizeof(realtimeBuffer));
 
     soundSyncEvent.Init();
 	
diff --git a/Source/Core/Common/Src/Log.h b/Source/Core/Common/Src/Log.h
index dd7ce841c3..d5f7f3d725 100644
--- a/Source/Core/Common/Src/Log.h
+++ b/Source/Core/Common/Src/Log.h
@@ -38,6 +38,7 @@ enum LOG_TYPE {
 	DISCIO,
 	DSPHLE,
 	DSPLLE,
+        DSP_MAIL,
 	DSPINTERFACE,
 	DVDINTERFACE,
 	DYNA_REC,
diff --git a/Source/Core/Common/Src/LogManager.cpp b/Source/Core/Common/Src/LogManager.cpp
index da2898c9b2..0159ddc174 100644
--- a/Source/Core/Common/Src/LogManager.cpp
+++ b/Source/Core/Common/Src/LogManager.cpp
@@ -45,6 +45,7 @@ LogManager::LogManager()\
 	m_Log[LogTypes::HLE]				= new LogContainer("HLE",			"HLE");
 	m_Log[LogTypes::DSPHLE]			    = new LogContainer("DSPHLE",		"DSP HLE");
 	m_Log[LogTypes::DSPLLE]			    = new LogContainer("DSPLLE",		"DSP LLE");
+       	m_Log[LogTypes::DSP_MAIL]		    = new LogContainer("DSPMails",		"DSP Mails");
 	m_Log[LogTypes::VIDEO]			    = new LogContainer("Video",			"Video Plugin");
 	m_Log[LogTypes::AUDIO]			    = new LogContainer("Audio",			"Audio Plugin");
 	m_Log[LogTypes::DYNA_REC]			= new LogContainer("JIT",			"Dynamic Recompiler");
diff --git a/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp b/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp
index e25dcf1247..ed83e27a20 100644
--- a/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp
+++ b/Source/Core/Core/Src/Debugger/Debugger_SymbolMap.cpp
@@ -23,7 +23,7 @@
 #include "../PowerPC/PowerPC.h"
 #include "../PowerPC/PPCAnalyst.h"
 #include "../PowerPC/PPCSymbolDB.h"
-#include "Bochs_disasm/PowerPCDisasm.h"
+#include "PowerPCDisasm.h"
 
 namespace Dolphin_Debugger
 {
diff --git a/Source/Core/DSPCore/Src/DSPHWInterface.cpp b/Source/Core/DSPCore/Src/DSPHWInterface.cpp
index e87314bdb0..727fb8d54a 100644
--- a/Source/Core/DSPCore/Src/DSPHWInterface.cpp
+++ b/Source/Core/DSPCore/Src/DSPHWInterface.cpp
@@ -90,9 +90,9 @@ void gdsp_mbox_write_l(u8 mbx, u16 val)
 #ifdef DEBUG_EXP
 	if (mbx == GDSP_MBOX_DSP)
 	{
-		NOTICE_LOG(DSPLLE, "DSP(WM) B:%i M:0x%08x (pc=0x%04x)", mbx, gdsp_mbox_peek(GDSP_MBOX_DSP), g_dsp.pc);
+		NOTICE_LOG(DSP_MAIL, "DSP(WM) B:%i M:0x%08x (pc=0x%04x)", mbx, gdsp_mbox_peek(GDSP_MBOX_DSP), g_dsp.pc);
 	} else {
-		NOTICE_LOG(DSPLLE, "CPU(WM) B:%i M:0x%08x (pc=0x%04x)", mbx, gdsp_mbox_peek(GDSP_MBOX_CPU), g_dsp.pc);
+		NOTICE_LOG(DSP_MAIL, "CPU(WM) B:%i M:0x%08x (pc=0x%04x)", mbx, gdsp_mbox_peek(GDSP_MBOX_CPU), g_dsp.pc);
 	}
 #endif
 }
@@ -119,9 +119,9 @@ u16 gdsp_mbox_read_l(u8 mbx)
 #ifdef DEBUG_EXP
 	if (mbx == GDSP_MBOX_DSP)
 	{
-		NOTICE_LOG(DSPLLE, "DSP(RM) B:%i M:0x%08x (pc=0x%04x)", mbx, gdsp_mbox_peek(GDSP_MBOX_DSP), g_dsp.pc);
+		NOTICE_LOG(DSP_MAIL, "DSP(RM) B:%i M:0x%08x (pc=0x%04x)", mbx, gdsp_mbox_peek(GDSP_MBOX_DSP), g_dsp.pc);
 	} else {
-		NOTICE_LOG(DSPLLE, "CPU(RM) B:%i M:0x%08x (pc=0x%04x)", mbx, gdsp_mbox_peek(GDSP_MBOX_CPU), g_dsp.pc);
+		NOTICE_LOG(DSP_MAIL, "CPU(RM) B:%i M:0x%08x (pc=0x%04x)", mbx, gdsp_mbox_peek(GDSP_MBOX_CPU), g_dsp.pc);
 	}
 #endif	
 
diff --git a/Source/Core/DebuggerWX/Src/BreakPointDlg.cpp b/Source/Core/DebuggerWX/Src/BreakPointDlg.cpp
index bd01a3526d..f51eb1a9fb 100644
--- a/Source/Core/DebuggerWX/Src/BreakPointDlg.cpp
+++ b/Source/Core/DebuggerWX/Src/BreakPointDlg.cpp
@@ -20,7 +20,7 @@
 #include "Host.h"
 #include "Debugger.h"
 #include "StringUtil.h"
-#include "PowerPC.h"
+#include "PowerPC/PowerPC.h"
 
 
 BEGIN_EVENT_TABLE(BreakPointDlg,wxDialog)