diff --git a/Source/Core/Core/Src/HW/AudioInterface.cpp b/Source/Core/Core/Src/HW/AudioInterface.cpp index 1f1e13e2da..8a67635efa 100644 --- a/Source/Core/Core/Src/HW/AudioInterface.cpp +++ b/Source/Core/Core/Src/HW/AudioInterface.cpp @@ -124,7 +124,7 @@ void Read32(u32& _rReturnValue, const u32 _Address) switch (_Address & 0xFFFF) { case AI_CONTROL_REGISTER: //0x6C00 - WARN_LOG(AUDIO_INTERFACE, "AudioInterface(R) 0x%08x", _Address); + DEBUG_LOG(AUDIO_INTERFACE, "AudioInterface(R) 0x%08x", _Address); _rReturnValue = g_AudioRegister.m_Control.hex; return; @@ -132,7 +132,7 @@ void Read32(u32& _rReturnValue, const u32 _Address) // Sample Rate (AIGetDSPSampleRate) // 32bit state (highest bit PlayState) // AIGetStreamPlayState case AI_VOLUME_REGISTER: //0x6C04 - WARN_LOG(AUDIO_INTERFACE, "AudioInterface(R) 0x%08x", _Address); + DEBUG_LOG(AUDIO_INTERFACE, "AudioInterface(R) 0x%08x", _Address); _rReturnValue = g_AudioRegister.m_Volume.hex; return; @@ -145,7 +145,7 @@ void Read32(u32& _rReturnValue, const u32 _Address) case AI_INTERRUPT_TIMING: // When sample counter reaches the value of this register, the interrupt AIINT should // fire. - WARN_LOG(AUDIO_INTERFACE, "AudioInterface(R) 0x%08x", _Address); + DEBUG_LOG(AUDIO_INTERFACE, "AudioInterface(R) 0x%08x", _Address); _rReturnValue = g_AudioRegister.m_InterruptTiming; return; @@ -200,7 +200,7 @@ void Write32(const u32 _Value, const u32 _Address) // Sample Count Reset if (tmpAICtrl.SCRESET) { - WARN_LOG(AUDIO_INTERFACE, "Reset SampleCounter"); + INFO_LOG(AUDIO_INTERFACE, "Reset SampleCounter"); g_AudioRegister.m_SampleCounter = 0; g_AudioRegister.m_Control.SCRESET = 0; @@ -217,7 +217,7 @@ void Write32(const u32 _Value, const u32 _Address) case AI_VOLUME_REGISTER: g_AudioRegister.m_Volume.hex = _Value; - WARN_LOG(AUDIO_INTERFACE, "Set m_Volume: left(%i) right(%i)", g_AudioRegister.m_Volume.leftVolume, g_AudioRegister.m_Volume.rightVolume); + INFO_LOG(AUDIO_INTERFACE, "Set m_Volume: left(%i) right(%i)", g_AudioRegister.m_Volume.leftVolume, g_AudioRegister.m_Volume.rightVolume); break; case AI_SAMPLE_COUNTER: diff --git a/Source/Core/Core/Src/HW/CommandProcessor.cpp b/Source/Core/Core/Src/HW/CommandProcessor.cpp index b53c6d48af..2ee79e4dad 100644 --- a/Source/Core/Core/Src/HW/CommandProcessor.cpp +++ b/Source/Core/Core/Src/HW/CommandProcessor.cpp @@ -344,7 +344,7 @@ bool AllowIdleSkipping() void Write16(const u16 _Value, const u32 _Address) { - WARN_LOG(COMMANDPROCESSOR, "(w): 0x%04x @ 0x%08x",_Value,_Address); + INFO_LOG(COMMANDPROCESSOR, "(write16): 0x%04x @ 0x%08x",_Value,_Address); //Spin until queue is empty - it WILL become empty because this is the only thread //that submits data diff --git a/Source/Core/Core/Src/HW/DSP.cpp b/Source/Core/Core/Src/HW/DSP.cpp index e9faf1f650..32e2418e79 100644 --- a/Source/Core/Core/Src/HW/DSP.cpp +++ b/Source/Core/Core/Src/HW/DSP.cpp @@ -572,13 +572,13 @@ void Update_ARAM_DMA() return; g_arDMA.CntValid[0] = g_arDMA.CntValid[1] = false; - WARN_LOG(DSPINTERFACE, "ARAM DMA triggered"); + INFO_LOG(DSPINTERFACE, "ARAM DMA triggered"); //TODO: speedup if (g_arDMA.Cnt.dir) { //read from ARAM - WARN_LOG(DSPINTERFACE, "ARAM DMA read %08x bytes from %08x to Mem: %08x",g_arDMA.Cnt.count, g_arDMA.ARAddr, g_arDMA.MMAddr); + INFO_LOG(DSPINTERFACE, "ARAM DMA read %08x bytes from %08x to Mem: %08x",g_arDMA.Cnt.count, g_arDMA.ARAddr, g_arDMA.MMAddr); u32 iMemAddress = g_arDMA.MMAddr; u32 iARAMAddress = g_arDMA.ARAddr; diff --git a/Source/Core/Core/Src/PowerPC/PowerPC.cpp b/Source/Core/Core/Src/PowerPC/PowerPC.cpp index cf17b8147a..ad22688e9d 100644 --- a/Source/Core/Core/Src/PowerPC/PowerPC.cpp +++ b/Source/Core/Core/Src/PowerPC/PowerPC.cpp @@ -220,7 +220,7 @@ void CheckExceptions() SRR1 = MSR & 0x0780FF77; NPC = 0x80000800; - WARN_LOG(GEKKO, "EXCEPTION_FPU_UNAVAILABLE"); + INFO_LOG(GEKKO, "EXCEPTION_FPU_UNAVAILABLE"); ppcState.Exceptions &= ~EXCEPTION_FPU_UNAVAILABLE; SRR1 |= 0x02; //recoverable } @@ -230,7 +230,7 @@ void CheckExceptions() SRR1 = MSR & 0x0780FF77; NPC = 0x80000C00; - WARN_LOG(GEKKO, "EXCEPTION_SYSCALL (PC=%08x)", PC); + INFO_LOG(GEKKO, "EXCEPTION_SYSCALL (PC=%08x)", PC); ppcState.Exceptions &= ~EXCEPTION_SYSCALL; SRR1 |= 0x02; //recoverable } @@ -240,7 +240,7 @@ void CheckExceptions() SRR1 = MSR & 0x0780FF77; NPC = 0x80000300; - WARN_LOG(GEKKO, "EXCEPTION_DSI"); + INFO_LOG(GEKKO, "EXCEPTION_DSI"); ppcState.Exceptions &= ~EXCEPTION_DSI; //SRR1 |= 0x02; //make recoverable ? } @@ -278,7 +278,7 @@ void CheckExceptions() NPC = 0x80000500; SRR1 = (MSR & 0x0780FF77); - WARN_LOG(GEKKO, "EXCEPTION_EXTERNAL_INT"); + INFO_LOG(GEKKO, "EXCEPTION_EXTERNAL_INT"); SRR1 |= 0x02; //set it to recoverable _dbg_assert_msg_(GEKKO, (SRR1 & 0x02) != 0, "GEKKO", "EXTERNAL_INT unrecoverable???"); // unrecoverable exception !?! @@ -291,7 +291,7 @@ void CheckExceptions() ppcState.Exceptions &= ~EXCEPTION_DECREMENTER; - WARN_LOG(GEKKO, "EXCEPTION_DECREMENTER"); + INFO_LOG(GEKKO, "EXCEPTION_DECREMENTER"); SRR1 |= 0x02; //make recoverable } else diff --git a/Source/Core/DolphinWX/Src/AboutDolphin.cpp b/Source/Core/DolphinWX/Src/AboutDolphin.cpp index 0782acee4a..51a9a5f0c5 100644 --- a/Source/Core/DolphinWX/Src/AboutDolphin.cpp +++ b/Source/Core/DolphinWX/Src/AboutDolphin.cpp @@ -46,16 +46,15 @@ void AboutDolphin::CreateGUIControls() DolphinLogo = new wxBitmap(iDolphinLogo); sbDolphinLogo = new wxStaticBitmap(this, ID_LOGO, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0); sbDolphinLogo->SetBitmap(*DolphinLogo); - std::string Text = std::string("Dolphin SVN revision ") + SVN_REV_STR + "\nCPU: " + cpu_info.Summarize() + "\n\n" // Maybe add OS/arch info too? - "Copyright (c) by F|RES & ector 2003-2008\n" - "Additional code by zerofrog, yaz0r, Schibo, Costis, JPeterson, etc etc...\n\n" - "Greets to Azimer, Caustik, Costis, Desktopman, EFX, Epsilon, Falcon4Ever, Hotquik, Jazzmin, mamedevs, Masken, Martin64, or9, " - " tmbinc, vEX, Zezu, Zilmar, and everyone we forget.\n\n" + std::string Text = std::string("Dolphin SVN revision ") + SVN_REV_STR +"\n" "Copyright (c) 2003-2009\n" + "Dolphin is a Gamecube/Wii emulator, which was originally written by F|RES and ector.\n" + "Today Dolphin is an open source project with many contributors.\n\n" "Special thanks to Bushing, Costis, CrowTRobo, Marcan, Segher, Titanik, or9 and Hotquik for their reverse engineering and docs/demos.\n\n" "Big thanks to Gilles Mouchard whose Microlib PPC emulator gave our development a kickstart.\n\n" "Thanks to Frank Wille for his PowerPC disassembler, which or9 and we modified to include Gekko specifics.\n\n" "Thanks to Shinji Chiba for his GC ADPCM decoder.\n\n" - "We are not affiliated with Nintendo in any way. Gamecube and Wii are trademarks of Nintendo.\n" + "We are not affiliated with Nintendo in any way.\n" + "Gamecube and Wii are trademarks of Nintendo.\n" "The emulator is for educational purposes only and should not be used to play games you do not legally own.\n\n"; Message = new wxStaticText(this, ID_MESSAGE, wxString::FromAscii(Text.c_str()),