diff --git a/pcsx2/DebugTools/Debug.h b/pcsx2/DebugTools/Debug.h index 1f969ca50a..64dac10168 100644 --- a/pcsx2/DebugTools/Debug.h +++ b/pcsx2/DebugTools/Debug.h @@ -304,7 +304,6 @@ struct SysConsoleLogPack { ConsoleLogSource ELF; ConsoleLogSource eeRecPerf; - ConsoleLogSource sysoutConsole; ConsoleLogSource pgifLog; ConsoleLogFromVM eeConsole; @@ -374,7 +373,6 @@ extern void __Log( const char* fmt, ... ); #define eeConLog SysConsole.eeConsole.IsActive() && SysConsole.eeConsole.Write #define eeDeci2Log SysConsole.deci2.IsActive() && SysConsole.deci2.Write #define iopConLog SysConsole.iopConsole.IsActive() && SysConsole.iopConsole.Write -#define sysConLog SysConsole.sysoutConsole.IsActive() && SysConsole.sysoutConsole.Write #define pgifConLog SysConsole.pgifLog.IsActive() && SysConsole.pgifLog.Write #define recordingConLog SysConsole.recordingConsole.IsActive() && SysConsole.recordingConsole.Write #define controlLog SysConsole.controlInfo.IsActive() && SysConsole.controlInfo.Write diff --git a/pcsx2/LogSink.cpp b/pcsx2/LogSink.cpp index 03c74b1f7a..4a1ae3553a 100644 --- a/pcsx2/LogSink.cpp +++ b/pcsx2/LogSink.cpp @@ -400,7 +400,6 @@ void LogSink::UpdateLogging(SettingsInterface& si) const bool ee_console_enabled = any_logging_sinks && si.GetBoolValue("Logging", "EnableEEConsole", false); SysConsole.eeConsole.Enabled = ee_console_enabled; - SysConsole.sysoutConsole.Enabled = ee_console_enabled; SysConsole.iopConsole.Enabled = any_logging_sinks && si.GetBoolValue("Logging", "EnableIOPConsole", false); SysTrace.IOP.R3000A.Enabled = true; diff --git a/pcsx2/R5900OpcodeImpl.cpp b/pcsx2/R5900OpcodeImpl.cpp index 46f573410c..8ca8106105 100644 --- a/pcsx2/R5900OpcodeImpl.cpp +++ b/pcsx2/R5900OpcodeImpl.cpp @@ -1110,8 +1110,8 @@ void SYSCALL() } } } - - sysConLog(fmt, + char buf[2048]; + snprintf(buf, sizeof(buf), fmt, regs[0], regs[1], regs[2], @@ -1120,6 +1120,8 @@ void SYSCALL() regs[5], regs[6] ); + + eeConLog(buf); } break; } diff --git a/pcsx2/SourceLog.cpp b/pcsx2/SourceLog.cpp index a7912b4405..f966980561 100644 --- a/pcsx2/SourceLog.cpp +++ b/pcsx2/SourceLog.cpp @@ -101,7 +101,6 @@ static const TraceLogDescriptor SysConsoleLogPack::SysConsoleLogPack() : ELF(&TLD_ELF, Color_Gray) , eeRecPerf(&TLD_eeRecPerf, Color_Gray) - , sysoutConsole(&TLD_sysoutConsole, Color_Gray) , pgifLog(&TLD_Pgif) , eeConsole(&TLD_eeConsole) , iopConsole(&TLD_iopConsole)