From 88fef183a365bcf7c0fb264b8fcb6019f840383e Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Sat, 13 May 2017 21:30:37 +0300 Subject: [PATCH] config.yml: Log section optimized --- Utilities/Config.cpp | 59 ++++++++++- Utilities/Config.h | 44 +++++--- Utilities/GDBDebugServer.cpp | 2 +- Utilities/Log.cpp | 94 ++++++++++++++-- Utilities/Log.h | 25 +++-- rpcs3/Emu/Cell/Modules/cellAdec.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellAtrac.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellAtracMulti.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellAudio.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellBgdl.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellCamera.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellCelp8Enc.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellCelpEnc.cpp | 2 +- .../Emu/Cell/Modules/cellCrossController.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellDaisy.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellDmux.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellFiber.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellFont.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellFontFT.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellFs.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellGame.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellGameExec.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellGcmSys.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellGem.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellGifDec.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellHttp.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellHttpUtil.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellImeJp.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellJpgDec.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellJpgEnc.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellKey2char.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellL10n.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellLibprof.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellMic.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellMusic.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellMusicExport.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellNetCtl.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellOskDialog.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellOvis.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellPamf.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellPhotoDecode.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellPhotoExport.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellPhotoImport.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellPngDec.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellPngEnc.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellPrint.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellRec.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellRemotePlay.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellResc.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellRtc.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellRtcAlarm.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellRudp.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellSail.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellSailRec.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellSaveData.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellScreenshot.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellSearch.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellSheap.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellSpudll.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellSpurs.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellSpursJq.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellSsl.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellSubdisplay.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellSync.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellSync2.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellSysconf.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellSysmodule.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellSysutil.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellSysutilAp.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellSysutilAvc.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellSysutilAvc2.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellSysutilMisc.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellSysutilNpEula.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellUsbd.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellUsbpspcm.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellUserInfo.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellVdec.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellVideoExport.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellVideoUpload.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellVoice.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellVpost.cpp | 2 +- rpcs3/Emu/Cell/Modules/cell_FreeType2.cpp | 2 +- rpcs3/Emu/Cell/Modules/libmedi.cpp | 2 +- rpcs3/Emu/Cell/Modules/libmixer.cpp | 2 +- rpcs3/Emu/Cell/Modules/libsnd3.cpp | 2 +- rpcs3/Emu/Cell/Modules/libsynth2.cpp | 2 +- rpcs3/Emu/Cell/Modules/sceNp.cpp | 2 +- rpcs3/Emu/Cell/Modules/sceNp2.cpp | 2 +- rpcs3/Emu/Cell/Modules/sceNpClans.cpp | 2 +- rpcs3/Emu/Cell/Modules/sceNpCommerce2.cpp | 2 +- rpcs3/Emu/Cell/Modules/sceNpSns.cpp | 2 +- rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp | 2 +- rpcs3/Emu/Cell/Modules/sceNpTus.cpp | 2 +- rpcs3/Emu/Cell/Modules/sceNpUtil.cpp | 2 +- rpcs3/Emu/Cell/Modules/sysPrxForUser.cpp | 2 +- rpcs3/Emu/Cell/Modules/sys_io.cpp | 2 +- rpcs3/Emu/Cell/Modules/sys_libc.cpp | 2 +- rpcs3/Emu/Cell/Modules/sys_lv2dbg.cpp | 2 +- rpcs3/Emu/Cell/Modules/sys_net.cpp | 2 +- rpcs3/Emu/Cell/PPUModule.cpp | 100 ------------------ rpcs3/Emu/Cell/lv2/lv2.cpp | 37 ++----- rpcs3/Emu/Cell/lv2/sys_cond.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_dbg.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_event.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_event_flag.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_fs.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_interrupt.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_lwcond.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_memory.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_mmapper.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_mutex.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_process.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_prx.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_rsx.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_rwlock.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_semaphore.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_spu.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_ss.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_time.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_timer.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_trace.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_tty.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_vm.cpp | 2 +- rpcs3/Emu/PSP2/ARMv7Module.cpp | 61 ----------- rpcs3/Emu/PSP2/Modules/sceAppMgr.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceAppUtil.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceAudio.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceAudioIn.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceAudiodec.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceAudioenc.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceCamera.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceCodecEngine.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceCommonDialog.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceCtrl.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceDbg.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceDeci4p.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceDeflt.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceDisplay.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceFiber.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceFios.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceFpu.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceGxm.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceHttp.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceIme.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceJpeg.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceJpegEnc.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceLibKernel.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceLibXml.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceLibc.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceLibm.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceLibstdcxx.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceLiveArea.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceLocation.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceMd5.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceMotion.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceMt19937.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceNet.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceNetCtl.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceNgs.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceNpBasic.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceNpCommon.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceNpManager.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceNpMatching.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceNpScore.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceNpUtility.cpp | 2 +- rpcs3/Emu/PSP2/Modules/scePerf.cpp | 2 +- rpcs3/Emu/PSP2/Modules/scePgf.cpp | 2 +- rpcs3/Emu/PSP2/Modules/scePhotoExport.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceRazorCapture.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceRtc.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceSas.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceScreenShot.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceSfmt.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceSha.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceSqlite.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceSsl.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceSulpha.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceSysmodule.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceSystemGesture.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceTouch.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceUlt.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceVideodec.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceVoice.cpp | 2 +- rpcs3/Emu/PSP2/Modules/sceVoiceQoS.cpp | 2 +- rpcs3/Gui/ConLogFrame.cpp | 2 +- rpcs3/Loader/PSF.cpp | 2 +- rpcs3/sys_gamepad.cpp | 2 +- 191 files changed, 377 insertions(+), 411 deletions(-) diff --git a/Utilities/Config.cpp b/Utilities/Config.cpp index 99f0951655..4bcbecc72a 100644 --- a/Utilities/Config.cpp +++ b/Utilities/Config.cpp @@ -5,7 +5,7 @@ namespace cfg { - logs::channel cfg("CFG", logs::level::notice); + logs::channel cfg("CFG"); entry_base::entry_base(type _type) : m_type(_type) @@ -161,7 +161,8 @@ void cfg::encode(YAML::Emitter& out, const cfg::entry_base& rhs) for (const auto& np : static_cast(rhs).get_nodes()) { out << YAML::Key << np.first; - out << YAML::Value; encode(out, *np.second); + out << YAML::Value; + encode(out, *np.second); } out << YAML::EndMap; @@ -178,6 +179,19 @@ void cfg::encode(YAML::Emitter& out, const cfg::entry_base& rhs) out << YAML::EndSeq; return; } + case type::log: + { + out << YAML::BeginMap; + for (const auto& np : static_cast(rhs).get_map()) + { + if (np.second == logs::level::notice) continue; + out << YAML::Key << np.first; + out << YAML::Value << fmt::format("%s", np.second); + } + + out << YAML::EndMap; + return; + } } out << rhs.to_string(); @@ -199,8 +213,7 @@ void cfg::decode(const YAML::Node& data, cfg::entry_base& rhs) if (!pair.first.IsScalar()) continue; // Find the key among existing nodes - const auto name = pair.first.Scalar(); - const auto found = static_cast(rhs).get_nodes().find(name); + const auto found = static_cast(rhs).get_nodes().find(pair.first.Scalar()); if (found != static_cast(rhs).get_nodes().cend()) { @@ -225,6 +238,29 @@ void cfg::decode(const YAML::Node& data, cfg::entry_base& rhs) break; } + case type::log: + { + if (data.IsScalar() || data.IsSequence()) + { + return; // ??? + } + + std::map values; + + for (const auto& pair : data) + { + if (!pair.first.IsScalar() || !pair.second.IsScalar()) continue; + + u64 value; + if (cfg::try_to_enum_value(&value, &fmt_class_string::format, pair.second.Scalar())) + { + values.emplace(pair.first.Scalar(), static_cast(static_cast(value))); + } + } + + static_cast(rhs).set_map(std::move(values)); + break; + } default: { std::string value; @@ -277,6 +313,21 @@ void cfg::set_entry::from_default() m_set = {}; } +void cfg::log_entry::set_map(std::map&& map) +{ + logs::reset(); + + for (auto&& pair : (m_map = std::move(map))) + { + logs::set_level(pair.first, pair.second); + } +} + +void cfg::log_entry::from_default() +{ + set_map({}); +} + cfg::root_node& cfg::get_root() { // Magic static diff --git a/Utilities/Config.h b/Utilities/Config.h index 8119963e71..37ad09db19 100644 --- a/Utilities/Config.h +++ b/Utilities/Config.h @@ -3,6 +3,7 @@ #include "Utilities/types.h" #include "Utilities/Atomic.h" #include "Utilities/StrFmt.h" +#include "Utilities/Log.h" #include #include @@ -35,6 +36,7 @@ namespace cfg integer, // cfg::int_entry type string, // cfg::string_entry type set, // cfg::set_entry type + log, }; // Config tree entry abstract base class @@ -485,18 +487,39 @@ namespace cfg } }; + class log_entry final : public entry_base + { + std::map m_map; + + public: + log_entry(node& owner, const std::string& name) + : entry_base(type::log, owner, name) + { + } + + std::map get_map() const + { + return m_map; + } + + void set_map(std::map&& map); + + void from_default() override; + }; + // Root type with some predefined nodes. Don't change it, this is not mandatory for adding nodes. struct root_node : node { - node core { *this, "Core" }; - node vfs { *this, "VFS" }; - node log { *this, "Log" }; - node video { *this, "Video" }; - node audio { *this, "Audio" }; - node io { *this, "Input/Output" }; - node sys { *this, "System" }; - node net { *this, "Net" }; - node misc { *this, "Miscellaneous" }; + node core {*this, "Core"}; + node vfs {*this, "VFS"}; + node video {*this, "Video"}; + node audio {*this, "Audio"}; + node io {*this, "Input/Output"}; + node sys {*this, "System"}; + node net {*this, "Net"}; + node misc {*this, "Miscellaneous"}; + + log_entry log{*this, "Log"}; }; // Get global configuration root instance @@ -505,6 +528,3 @@ namespace cfg // Global configuration root instance (cached reference) static root_node& root = get_root(); } - -// Registered log channel -#define LOG_CHANNEL(name) extern logs::channel name; namespace logs { static cfg::enum_entry name(cfg::root.log, #name, ::name.enabled); } diff --git a/Utilities/GDBDebugServer.cpp b/Utilities/GDBDebugServer.cpp index b5ed6495c2..ba67fc729f 100644 --- a/Utilities/GDBDebugServer.cpp +++ b/Utilities/GDBDebugServer.cpp @@ -20,7 +20,7 @@ extern void ppu_set_breakpoint(u32 addr); extern void ppu_remove_breakpoint(u32 addr); -logs::channel gdbDebugServer("gdbDebugServer", logs::level::notice); +logs::channel gdbDebugServer("gdbDebugServer"); int sock_init(void) { diff --git a/Utilities/Log.cpp b/Utilities/Log.cpp index 74c218169a..8ba7411e1f 100644 --- a/Utilities/Log.cpp +++ b/Utilities/Log.cpp @@ -1,9 +1,11 @@ #include "Log.h" #include "File.h" #include "StrFmt.h" +#include "sema.h" #include "rpcs3_version.h" #include +#include #ifdef _WIN32 #include @@ -11,8 +13,13 @@ #include #endif +static std::string empty_string() +{ + return {}; +} + // Thread-specific log prefix provider -thread_local std::string(*g_tls_log_prefix)() = nullptr; +thread_local std::string(*g_tls_log_prefix)() = &empty_string; template<> void fmt_class_string::format(std::string& out, u64 arg) @@ -105,14 +112,53 @@ namespace logs return timebase.get(); } - channel GENERAL(nullptr, level::notice); - channel LOADER("LDR", level::notice); - channel MEMORY("MEM", level::notice); - channel RSX("RSX", level::notice); - channel HLE("HLE", level::notice); - channel PPU("PPU", level::notice); - channel SPU("SPU", level::notice); + channel GENERAL(""); + channel LOADER("LDR"); + channel MEMORY("MEM"); + channel RSX("RSX"); + channel HLE("HLE"); + channel PPU("PPU"); + channel SPU("SPU"); channel ARMv7("ARMv7"); + + struct channel_info + { + channel* pointer = nullptr; + level enabled = level::notice; + + void set_level(level value) + { + enabled = value; + + if (pointer) + { + pointer->enabled = value; + } + } + }; + + // Channel registry mutex + semaphore<> g_mutex; + + // Channel registry + std::unordered_map g_channels; + + void reset() + { + semaphore_lock lock(g_mutex); + + for (auto&& pair : g_channels) + { + pair.second.set_level(level::notice); + } + } + + void set_level(const std::string& ch_name, level value) + { + semaphore_lock lock(g_mutex); + + g_channels[ch_name].set_level(value); + } } logs::listener::~listener() @@ -136,8 +182,34 @@ void logs::message::broadcast(const char* fmt, const fmt_type_info* sup, const u // Get timestamp const u64 stamp = get_stamp(); - std::string text; fmt::raw_append(text, fmt, sup, args); - std::string prefix(g_tls_log_prefix ? g_tls_log_prefix() : ""); + // Register channel + if (ch->enabled == level::_uninit) + { + semaphore_lock lock(g_mutex); + + auto& info = g_channels[ch->name]; + + if (info.pointer && info.pointer != ch) + { + fmt::throw_exception("logs::channel repetition: %s", ch->name); + } + else if (!info.pointer) + { + info.pointer = ch; + ch->enabled = info.enabled; + + // Check level again + if (info.enabled < sev) + { + return; + } + } + } + + // Get text + std::string text; + fmt::raw_append(text, fmt, sup, args); + std::string prefix = g_tls_log_prefix(); // Get first (main) listener listener* lis = get_logger(); @@ -203,7 +275,7 @@ void logs::file_listener::log(u64 stamp, const logs::message& msg, const std::st text += "} "; } - if (msg.ch->name) + if ('\0' != *msg.ch->name) { text += msg.ch->name; text += msg.sev == level::todo ? " TODO: " : ": "; diff --git a/Utilities/Log.h b/Utilities/Log.h index d5f60cc175..8215067221 100644 --- a/Utilities/Log.h +++ b/Utilities/Log.h @@ -3,19 +3,22 @@ #include "types.h" #include "Atomic.h" #include "StrFmt.h" +#include namespace logs { enum class level : uint { - always, // highest level (unused, cannot be disabled) + always, // Highest log severity (unused, cannot be disabled) fatal, error, todo, success, warning, notice, - trace, // lowest level (usually disabled) + trace, // Lowest severity (usually disabled) + + _uninit = UINT_MAX, // Special value for delayed initialization }; struct channel; @@ -23,7 +26,7 @@ namespace logs // Message information (temporary data) struct message { - const channel* ch; + channel* ch; level sev; // Send log message to global logger instance @@ -57,16 +60,16 @@ namespace logs // The lowest logging level enabled for this channel (used for early filtering) atomic_t enabled; - // Constant initialization: name and initial log level - constexpr channel(const char* name, level enabled = level::trace) + // Constant initialization: channel name + constexpr channel(const char* name) : name(name) - , enabled(enabled) + , enabled(level::_uninit) { } // Formatting function template - SAFE_BUFFERS FORCE_INLINE void format(level sev, const char* fmt, const Args&... args) const + SAFE_BUFFERS FORCE_INLINE void format(level sev, const char* fmt, const Args&... args) { if (UNLIKELY(sev <= enabled)) { @@ -76,7 +79,7 @@ namespace logs #define GEN_LOG_METHOD(_sev)\ template\ - SAFE_BUFFERS void _sev(const char* fmt, const Args&... args) const\ + SAFE_BUFFERS void _sev(const char* fmt, const Args&... args)\ {\ return format(level::_sev, fmt, args...);\ } @@ -102,6 +105,12 @@ namespace logs extern channel PPU; extern channel SPU; extern channel ARMv7; + + // Log level control: set all channels to level::notice + void reset(); + + // Log level control: register channel if necessary, set channel level + void set_level(const std::string&, level); } // Legacy: diff --git a/rpcs3/Emu/Cell/Modules/cellAdec.cpp b/rpcs3/Emu/Cell/Modules/cellAdec.cpp index 9128a04c6e..301e1c735e 100644 --- a/rpcs3/Emu/Cell/Modules/cellAdec.cpp +++ b/rpcs3/Emu/Cell/Modules/cellAdec.cpp @@ -19,7 +19,7 @@ extern "C" extern std::mutex g_mutex_avcodec_open2; -logs::channel cellAdec("cellAdec", logs::level::notice); +logs::channel cellAdec("cellAdec"); class AudioDecoder : public ppu_thread { diff --git a/rpcs3/Emu/Cell/Modules/cellAtrac.cpp b/rpcs3/Emu/Cell/Modules/cellAtrac.cpp index 0a6fb4360e..f4ed28b31b 100644 --- a/rpcs3/Emu/Cell/Modules/cellAtrac.cpp +++ b/rpcs3/Emu/Cell/Modules/cellAtrac.cpp @@ -4,7 +4,7 @@ #include "cellAtrac.h" -logs::channel cellAtrac("cellAtrac", logs::level::notice); +logs::channel cellAtrac("cellAtrac"); s32 cellAtracSetDataAndGetMemSize(vm::ptr pHandle, vm::ptr pucBufferAddr, u32 uiReadByte, u32 uiBufferByte, vm::ptr puiWorkMemByte) { diff --git a/rpcs3/Emu/Cell/Modules/cellAtracMulti.cpp b/rpcs3/Emu/Cell/Modules/cellAtracMulti.cpp index c7dac5b60b..809a765cc8 100644 --- a/rpcs3/Emu/Cell/Modules/cellAtracMulti.cpp +++ b/rpcs3/Emu/Cell/Modules/cellAtracMulti.cpp @@ -4,7 +4,7 @@ #include "cellAtracMulti.h" -logs::channel cellAtracMulti("cellAtracMulti", logs::level::notice); +logs::channel cellAtracMulti("cellAtracMulti"); s32 cellAtracMultiSetDataAndGetMemSize(vm::ptr pHandle, vm::ptr pucBufferAddr, u32 uiReadByte, u32 uiBufferByte, u32 uiOutputChNum, vm::ptr piTrackArray, vm::ptr puiWorkMemByte) { diff --git a/rpcs3/Emu/Cell/Modules/cellAudio.cpp b/rpcs3/Emu/Cell/Modules/cellAudio.cpp index 6b4a51c453..366531c9d3 100644 --- a/rpcs3/Emu/Cell/Modules/cellAudio.cpp +++ b/rpcs3/Emu/Cell/Modules/cellAudio.cpp @@ -11,7 +11,7 @@ #include -logs::channel cellAudio("cellAudio", logs::level::notice); +logs::channel cellAudio("cellAudio"); cfg::bool_entry g_cfg_audio_dump_to_file(cfg::root.audio, "Dump to file"); cfg::bool_entry g_cfg_audio_convert_to_u16(cfg::root.audio, "Convert to 16 bit"); diff --git a/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp b/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp index 3900364608..41e07ed71f 100644 --- a/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp +++ b/rpcs3/Emu/Cell/Modules/cellAvconfExt.cpp @@ -7,7 +7,7 @@ #include "cellVideoOut.h" #include "cellSysutil.h" -logs::channel cellAvconfExt("cellAvconfExt", logs::level::notice); +logs::channel cellAvconfExt("cellAvconfExt"); vm::gvar g_gamma; // TODO diff --git a/rpcs3/Emu/Cell/Modules/cellBgdl.cpp b/rpcs3/Emu/Cell/Modules/cellBgdl.cpp index 8c2d909c95..00c8aa83bd 100644 --- a/rpcs3/Emu/Cell/Modules/cellBgdl.cpp +++ b/rpcs3/Emu/Cell/Modules/cellBgdl.cpp @@ -4,7 +4,7 @@ #include "cellBgdl.h" -logs::channel cellBGDL("cellBGDL", logs::level::notice); +logs::channel cellBGDL("cellBGDL"); s32 cellBGDLGetInfo(vm::cptr content_id, vm::ptr info, s32 num) { diff --git a/rpcs3/Emu/Cell/Modules/cellCamera.cpp b/rpcs3/Emu/Cell/Modules/cellCamera.cpp index 9c445f1a65..0d87a3dcd0 100644 --- a/rpcs3/Emu/Cell/Modules/cellCamera.cpp +++ b/rpcs3/Emu/Cell/Modules/cellCamera.cpp @@ -6,7 +6,7 @@ #include "cellCamera.h" -logs::channel cellCamera("cellCamera", logs::level::notice); +logs::channel cellCamera("cellCamera"); cfg::map_entry g_cfg_camera(cfg::root.io, "Camera", { diff --git a/rpcs3/Emu/Cell/Modules/cellCelp8Enc.cpp b/rpcs3/Emu/Cell/Modules/cellCelp8Enc.cpp index de1f854639..1183d94310 100644 --- a/rpcs3/Emu/Cell/Modules/cellCelp8Enc.cpp +++ b/rpcs3/Emu/Cell/Modules/cellCelp8Enc.cpp @@ -4,7 +4,7 @@ #include "cellCelp8Enc.h" -logs::channel cellCelp8Enc("cellCelp8Enc", logs::level::notice); +logs::channel cellCelp8Enc("cellCelp8Enc"); s32 cellCelp8EncQueryAttr() diff --git a/rpcs3/Emu/Cell/Modules/cellCelpEnc.cpp b/rpcs3/Emu/Cell/Modules/cellCelpEnc.cpp index 43c4e57ed6..c8029f4e4f 100644 --- a/rpcs3/Emu/Cell/Modules/cellCelpEnc.cpp +++ b/rpcs3/Emu/Cell/Modules/cellCelpEnc.cpp @@ -4,7 +4,7 @@ #include "cellCelpEnc.h" -logs::channel cellCelpEnc("cellCelpEnc", logs::level::notice); +logs::channel cellCelpEnc("cellCelpEnc"); s32 cellCelpEncQueryAttr() diff --git a/rpcs3/Emu/Cell/Modules/cellCrossController.cpp b/rpcs3/Emu/Cell/Modules/cellCrossController.cpp index 1533396e07..f1752311e6 100644 --- a/rpcs3/Emu/Cell/Modules/cellCrossController.cpp +++ b/rpcs3/Emu/Cell/Modules/cellCrossController.cpp @@ -2,7 +2,7 @@ #include "Emu/System.h" #include "Emu/Cell/PPUModule.h" -logs::channel cellCrossController("cellCrossController", logs::level::notice); +logs::channel cellCrossController("cellCrossController"); s32 cellCrossController_37E1F502() // LittleBigPlanet 2 and 3 { diff --git a/rpcs3/Emu/Cell/Modules/cellDaisy.cpp b/rpcs3/Emu/Cell/Modules/cellDaisy.cpp index 2d5fac0e03..53f39dbddf 100644 --- a/rpcs3/Emu/Cell/Modules/cellDaisy.cpp +++ b/rpcs3/Emu/Cell/Modules/cellDaisy.cpp @@ -3,7 +3,7 @@ #include "cellDaisy.h" -logs::channel cellDaisy("cellDaisy", logs::level::notice); +logs::channel cellDaisy("cellDaisy"); using LFQueue2 = struct CellDaisyLFQueue2; using Lock = struct CellDaisyLock; diff --git a/rpcs3/Emu/Cell/Modules/cellDmux.cpp b/rpcs3/Emu/Cell/Modules/cellDmux.cpp index c693075788..ad1366e350 100644 --- a/rpcs3/Emu/Cell/Modules/cellDmux.cpp +++ b/rpcs3/Emu/Cell/Modules/cellDmux.cpp @@ -9,7 +9,7 @@ #include -logs::channel cellDmux("cellDmux", logs::level::notice); +logs::channel cellDmux("cellDmux"); /* Demuxer Thread Classes */ diff --git a/rpcs3/Emu/Cell/Modules/cellFiber.cpp b/rpcs3/Emu/Cell/Modules/cellFiber.cpp index ad8c9f6710..fe7eddba74 100644 --- a/rpcs3/Emu/Cell/Modules/cellFiber.cpp +++ b/rpcs3/Emu/Cell/Modules/cellFiber.cpp @@ -4,7 +4,7 @@ #include "cellFiber.h" -logs::channel cellFiber("cellFiber", logs::level::notice); +logs::channel cellFiber("cellFiber"); template <> void fmt_class_string::format(std::string& out, u64 arg) diff --git a/rpcs3/Emu/Cell/Modules/cellFont.cpp b/rpcs3/Emu/Cell/Modules/cellFont.cpp index 6e26ff875e..313205160c 100644 --- a/rpcs3/Emu/Cell/Modules/cellFont.cpp +++ b/rpcs3/Emu/Cell/Modules/cellFont.cpp @@ -8,7 +8,7 @@ #include "cellFont.h" -logs::channel cellFont("cellFont", logs::level::notice); +logs::channel cellFont("cellFont"); // Functions s32 cellFontInitializeWithRevision(u64 revisionFlags, vm::ptr config) diff --git a/rpcs3/Emu/Cell/Modules/cellFontFT.cpp b/rpcs3/Emu/Cell/Modules/cellFontFT.cpp index cb6aefe86f..a5757fe472 100644 --- a/rpcs3/Emu/Cell/Modules/cellFontFT.cpp +++ b/rpcs3/Emu/Cell/Modules/cellFontFT.cpp @@ -3,7 +3,7 @@ #include "cellFontFT.h" -logs::channel cellFontFT("cellFontFT", logs::level::notice); +logs::channel cellFontFT("cellFontFT"); s32 cellFontInitLibraryFreeTypeWithRevision(u64 revisionFlags, vm::ptr config, vm::pptr lib) { diff --git a/rpcs3/Emu/Cell/Modules/cellFs.cpp b/rpcs3/Emu/Cell/Modules/cellFs.cpp index c89a249ee8..2a35b56c9a 100644 --- a/rpcs3/Emu/Cell/Modules/cellFs.cpp +++ b/rpcs3/Emu/Cell/Modules/cellFs.cpp @@ -13,7 +13,7 @@ namespace vm { using namespace ps3; } -logs::channel cellFs("cellFs", logs::level::notice); +logs::channel cellFs("cellFs"); error_code cellFsGetPath(u32 fd, vm::ptr out_path) { diff --git a/rpcs3/Emu/Cell/Modules/cellGame.cpp b/rpcs3/Emu/Cell/Modules/cellGame.cpp index 859e8d6ade..b62faa46df 100644 --- a/rpcs3/Emu/Cell/Modules/cellGame.cpp +++ b/rpcs3/Emu/Cell/Modules/cellGame.cpp @@ -12,7 +12,7 @@ #include -logs::channel cellGame("cellGame", logs::level::notice); +logs::channel cellGame("cellGame"); template<> void fmt_class_string::format(std::string& out, u64 arg) diff --git a/rpcs3/Emu/Cell/Modules/cellGameExec.cpp b/rpcs3/Emu/Cell/Modules/cellGameExec.cpp index 9be1ce2c82..c1f2a4c6e9 100644 --- a/rpcs3/Emu/Cell/Modules/cellGameExec.cpp +++ b/rpcs3/Emu/Cell/Modules/cellGameExec.cpp @@ -3,7 +3,7 @@ #include "cellGame.h" -logs::channel cellGameExec("cellGameExec", logs::level::notice); +logs::channel cellGameExec("cellGameExec"); s32 cellGameSetExitParam() { diff --git a/rpcs3/Emu/Cell/Modules/cellGcmSys.cpp b/rpcs3/Emu/Cell/Modules/cellGcmSys.cpp index 6b1eb26dd2..0826bf3a09 100644 --- a/rpcs3/Emu/Cell/Modules/cellGcmSys.cpp +++ b/rpcs3/Emu/Cell/Modules/cellGcmSys.cpp @@ -10,7 +10,7 @@ #include -logs::channel cellGcmSys("cellGcmSys", logs::level::notice); +logs::channel cellGcmSys("cellGcmSys"); extern s32 cellGcmCallback(ppu_thread& ppu, vm::ptr context, u32 count); diff --git a/rpcs3/Emu/Cell/Modules/cellGem.cpp b/rpcs3/Emu/Cell/Modules/cellGem.cpp index a33cd86879..25971744d2 100644 --- a/rpcs3/Emu/Cell/Modules/cellGem.cpp +++ b/rpcs3/Emu/Cell/Modules/cellGem.cpp @@ -4,7 +4,7 @@ #include "cellGem.h" -logs::channel cellGem("cellGem", logs::level::notice); +logs::channel cellGem("cellGem"); struct gem_t { diff --git a/rpcs3/Emu/Cell/Modules/cellGifDec.cpp b/rpcs3/Emu/Cell/Modules/cellGifDec.cpp index 095cbaf824..10302f689e 100644 --- a/rpcs3/Emu/Cell/Modules/cellGifDec.cpp +++ b/rpcs3/Emu/Cell/Modules/cellGifDec.cpp @@ -9,7 +9,7 @@ #include "Emu/Cell/lv2/sys_fs.h" #include "cellGifDec.h" -logs::channel cellGifDec("cellGifDec", logs::level::notice); +logs::channel cellGifDec("cellGifDec"); // cellGifDec aliases (only for cellGifDec.cpp) using PPMainHandle = vm::pptr; diff --git a/rpcs3/Emu/Cell/Modules/cellHttp.cpp b/rpcs3/Emu/Cell/Modules/cellHttp.cpp index 7909f67294..bf57c3223e 100644 --- a/rpcs3/Emu/Cell/Modules/cellHttp.cpp +++ b/rpcs3/Emu/Cell/Modules/cellHttp.cpp @@ -3,7 +3,7 @@ #include "cellHttp.h" -logs::channel cellHttp("cellHttp", logs::level::notice); +logs::channel cellHttp("cellHttp"); s32 cellHttpAuthCacheFlush() diff --git a/rpcs3/Emu/Cell/Modules/cellHttpUtil.cpp b/rpcs3/Emu/Cell/Modules/cellHttpUtil.cpp index d9ffae043f..d7481d88fb 100644 --- a/rpcs3/Emu/Cell/Modules/cellHttpUtil.cpp +++ b/rpcs3/Emu/Cell/Modules/cellHttpUtil.cpp @@ -3,7 +3,7 @@ #include "cellHttpUtil.h" -logs::channel cellHttpUtil("cellHttpUtil", logs::level::notice); +logs::channel cellHttpUtil("cellHttpUtil"); s32 cellHttpUtilParseUri(vm::ptr uri, vm::cptr str, vm::ptr pool, u32 size, vm::ptr required) { diff --git a/rpcs3/Emu/Cell/Modules/cellImeJp.cpp b/rpcs3/Emu/Cell/Modules/cellImeJp.cpp index e0d129c001..6eac492b76 100644 --- a/rpcs3/Emu/Cell/Modules/cellImeJp.cpp +++ b/rpcs3/Emu/Cell/Modules/cellImeJp.cpp @@ -2,7 +2,7 @@ #include "Emu/Cell/PPUModule.h" #include "cellImeJp.h" -logs::channel cellImeJp("cellImeJp", logs::level::notice); +logs::channel cellImeJp("cellImeJp"); // Return Codes enum diff --git a/rpcs3/Emu/Cell/Modules/cellJpgDec.cpp b/rpcs3/Emu/Cell/Modules/cellJpgDec.cpp index 8de68133a0..a5420e404f 100644 --- a/rpcs3/Emu/Cell/Modules/cellJpgDec.cpp +++ b/rpcs3/Emu/Cell/Modules/cellJpgDec.cpp @@ -9,7 +9,7 @@ #include "Emu/Cell/lv2/sys_fs.h" #include "cellJpgDec.h" -logs::channel cellJpgDec("cellJpgDec", logs::level::notice); +logs::channel cellJpgDec("cellJpgDec"); s32 cellJpgDecCreate(u32 mainHandle, u32 threadInParam, u32 threadOutParam) { diff --git a/rpcs3/Emu/Cell/Modules/cellJpgEnc.cpp b/rpcs3/Emu/Cell/Modules/cellJpgEnc.cpp index 6c6a1fbb1c..25e7f019ba 100644 --- a/rpcs3/Emu/Cell/Modules/cellJpgEnc.cpp +++ b/rpcs3/Emu/Cell/Modules/cellJpgEnc.cpp @@ -3,7 +3,7 @@ #include "cellJpgEnc.h" -logs::channel cellJpgEnc("cellJpgEnc", logs::level::notice); +logs::channel cellJpgEnc("cellJpgEnc"); s32 cellJpgEncQueryAttr() diff --git a/rpcs3/Emu/Cell/Modules/cellKey2char.cpp b/rpcs3/Emu/Cell/Modules/cellKey2char.cpp index a13e17b80e..ae22106228 100644 --- a/rpcs3/Emu/Cell/Modules/cellKey2char.cpp +++ b/rpcs3/Emu/Cell/Modules/cellKey2char.cpp @@ -3,7 +3,7 @@ namespace vm { using namespace ps3; } -logs::channel cellKey2char("cellKey2char", logs::level::notice); +logs::channel cellKey2char("cellKey2char"); // Return Codes enum CellKey2CharError : u32 diff --git a/rpcs3/Emu/Cell/Modules/cellL10n.cpp b/rpcs3/Emu/Cell/Modules/cellL10n.cpp index cdb5076a2f..b78749d563 100644 --- a/rpcs3/Emu/Cell/Modules/cellL10n.cpp +++ b/rpcs3/Emu/Cell/Modules/cellL10n.cpp @@ -15,7 +15,7 @@ typedef const char *HostCode; #include "cellL10n.h" -logs::channel cellL10n("cellL10n", logs::level::notice); +logs::channel cellL10n("cellL10n"); // Translate code id to code name. some codepage may has another name. // If this makes your compilation fail, try replace the string code with one in "iconv -l" diff --git a/rpcs3/Emu/Cell/Modules/cellLibprof.cpp b/rpcs3/Emu/Cell/Modules/cellLibprof.cpp index 31f6f53fde..5d176dc680 100644 --- a/rpcs3/Emu/Cell/Modules/cellLibprof.cpp +++ b/rpcs3/Emu/Cell/Modules/cellLibprof.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -logs::channel cellLibprof("cellLibprof", logs::level::notice); +logs::channel cellLibprof("cellLibprof"); s32 cellUserTraceInit() { diff --git a/rpcs3/Emu/Cell/Modules/cellMic.cpp b/rpcs3/Emu/Cell/Modules/cellMic.cpp index 5e36df9ff9..fe3928828d 100644 --- a/rpcs3/Emu/Cell/Modules/cellMic.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMic.cpp @@ -4,7 +4,7 @@ #include "cellMic.h" -logs::channel cellMic("cellMic", logs::level::notice); +logs::channel cellMic("cellMic"); s32 cellMicInit() { diff --git a/rpcs3/Emu/Cell/Modules/cellMusic.cpp b/rpcs3/Emu/Cell/Modules/cellMusic.cpp index 7d0ec47f5d..49e97d10fd 100644 --- a/rpcs3/Emu/Cell/Modules/cellMusic.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMusic.cpp @@ -6,7 +6,7 @@ #include "cellMusic.h" #include "cellSysutil.h" -logs::channel cellMusic("cellMusic", logs::level::notice); +logs::channel cellMusic("cellMusic"); struct music2_t { diff --git a/rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp b/rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp index f850afa90d..b11ff317bf 100644 --- a/rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMusicDecode.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -logs::channel cellMusicDecode("cellMusicDecode", logs::level::notice); +logs::channel cellMusicDecode("cellMusicDecode"); // Return Codes enum diff --git a/rpcs3/Emu/Cell/Modules/cellMusicExport.cpp b/rpcs3/Emu/Cell/Modules/cellMusicExport.cpp index 924306c3b3..fd43c9332c 100644 --- a/rpcs3/Emu/Cell/Modules/cellMusicExport.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMusicExport.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -logs::channel cellMusicExport("cellMusicExport", logs::level::notice); +logs::channel cellMusicExport("cellMusicExport"); // Return Codes enum diff --git a/rpcs3/Emu/Cell/Modules/cellNetCtl.cpp b/rpcs3/Emu/Cell/Modules/cellNetCtl.cpp index ebdd613528..ea2187b4a2 100644 --- a/rpcs3/Emu/Cell/Modules/cellNetCtl.cpp +++ b/rpcs3/Emu/Cell/Modules/cellNetCtl.cpp @@ -9,7 +9,7 @@ #include "Utilities/StrUtil.h" -logs::channel cellNetCtl("cellNetCtl", logs::level::notice); +logs::channel cellNetCtl("cellNetCtl"); template<> void fmt_class_string::format(std::string& out, u64 arg) diff --git a/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp b/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp index 4272280138..0d1fc6b69f 100644 --- a/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp +++ b/rpcs3/Emu/Cell/Modules/cellOskDialog.cpp @@ -6,7 +6,7 @@ #include #include "Emu/System.h" -logs::channel cellOskDialog("cellOskDialog", logs::level::notice); +logs::channel cellOskDialog("cellOskDialog"); static char16_t s_osk_text[CELL_OSKDIALOG_STRING_SIZE]; diff --git a/rpcs3/Emu/Cell/Modules/cellOvis.cpp b/rpcs3/Emu/Cell/Modules/cellOvis.cpp index 6600b38f7a..c40e73a9e0 100644 --- a/rpcs3/Emu/Cell/Modules/cellOvis.cpp +++ b/rpcs3/Emu/Cell/Modules/cellOvis.cpp @@ -4,7 +4,7 @@ namespace vm { using namespace ps3; } -logs::channel cellOvis("cellOvis", logs::level::notice); +logs::channel cellOvis("cellOvis"); // Return Codes enum diff --git a/rpcs3/Emu/Cell/Modules/cellPamf.cpp b/rpcs3/Emu/Cell/Modules/cellPamf.cpp index 22784651a8..e72a0bbe0e 100644 --- a/rpcs3/Emu/Cell/Modules/cellPamf.cpp +++ b/rpcs3/Emu/Cell/Modules/cellPamf.cpp @@ -12,7 +12,7 @@ bool squeue_test_exit() return Emu.IsStopped(); } -logs::channel cellPamf("cellPamf", logs::level::notice); +logs::channel cellPamf("cellPamf"); s32 pamfStreamTypeToEsFilterId(u8 type, u8 ch, CellCodecEsFilterId& pEsFilterId) { diff --git a/rpcs3/Emu/Cell/Modules/cellPhotoDecode.cpp b/rpcs3/Emu/Cell/Modules/cellPhotoDecode.cpp index 6d971b8b1c..d4b5741e39 100644 --- a/rpcs3/Emu/Cell/Modules/cellPhotoDecode.cpp +++ b/rpcs3/Emu/Cell/Modules/cellPhotoDecode.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -logs::channel cellPhotoDecode("cellPhotoDecode", logs::level::notice); +logs::channel cellPhotoDecode("cellPhotoDecode"); // Return Codes enum diff --git a/rpcs3/Emu/Cell/Modules/cellPhotoExport.cpp b/rpcs3/Emu/Cell/Modules/cellPhotoExport.cpp index dd1d76396d..091ec7bf8a 100644 --- a/rpcs3/Emu/Cell/Modules/cellPhotoExport.cpp +++ b/rpcs3/Emu/Cell/Modules/cellPhotoExport.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -logs::channel cellPhotoExport("cellPhotoExport", logs::level::notice); +logs::channel cellPhotoExport("cellPhotoExport"); // Return Codes enum diff --git a/rpcs3/Emu/Cell/Modules/cellPhotoImport.cpp b/rpcs3/Emu/Cell/Modules/cellPhotoImport.cpp index 5813848716..9586873aea 100644 --- a/rpcs3/Emu/Cell/Modules/cellPhotoImport.cpp +++ b/rpcs3/Emu/Cell/Modules/cellPhotoImport.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -logs::channel cellPhotoImportUtil("cellPhotoImportUtil", logs::level::notice); +logs::channel cellPhotoImportUtil("cellPhotoImportUtil"); // Return Codes enum diff --git a/rpcs3/Emu/Cell/Modules/cellPngDec.cpp b/rpcs3/Emu/Cell/Modules/cellPngDec.cpp index 9864ac3c4c..962f36f2e2 100644 --- a/rpcs3/Emu/Cell/Modules/cellPngDec.cpp +++ b/rpcs3/Emu/Cell/Modules/cellPngDec.cpp @@ -19,7 +19,7 @@ typedef png_bytep iCCP_profile_type; typedef png_charp iCCP_profile_type; #endif -logs::channel cellPngDec("cellPngDec", logs::level::notice); +logs::channel cellPngDec("cellPngDec"); // cellPngDec aliases to improve readability using PPHandle = vm::pptr; diff --git a/rpcs3/Emu/Cell/Modules/cellPngEnc.cpp b/rpcs3/Emu/Cell/Modules/cellPngEnc.cpp index 5ccf49dadb..45a47a4ede 100644 --- a/rpcs3/Emu/Cell/Modules/cellPngEnc.cpp +++ b/rpcs3/Emu/Cell/Modules/cellPngEnc.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -logs::channel cellPngEnc("cellPngEnc", logs::level::notice); +logs::channel cellPngEnc("cellPngEnc"); // Error Codes enum diff --git a/rpcs3/Emu/Cell/Modules/cellPrint.cpp b/rpcs3/Emu/Cell/Modules/cellPrint.cpp index 648237c75f..0fbe5af7f5 100644 --- a/rpcs3/Emu/Cell/Modules/cellPrint.cpp +++ b/rpcs3/Emu/Cell/Modules/cellPrint.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -logs::channel cellPrint("cellPrint", logs::level::notice); +logs::channel cellPrint("cellPrint"); // Error Codes enum diff --git a/rpcs3/Emu/Cell/Modules/cellRec.cpp b/rpcs3/Emu/Cell/Modules/cellRec.cpp index 443c8b7dab..fcc0cc9a2a 100644 --- a/rpcs3/Emu/Cell/Modules/cellRec.cpp +++ b/rpcs3/Emu/Cell/Modules/cellRec.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -logs::channel cellRec("cellRec", logs::level::notice); +logs::channel cellRec("cellRec"); s32 cellRecOpen() { diff --git a/rpcs3/Emu/Cell/Modules/cellRemotePlay.cpp b/rpcs3/Emu/Cell/Modules/cellRemotePlay.cpp index a11e9d74a7..a637c67aff 100644 --- a/rpcs3/Emu/Cell/Modules/cellRemotePlay.cpp +++ b/rpcs3/Emu/Cell/Modules/cellRemotePlay.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -logs::channel cellRemotePlay("cellRemotePlay", logs::level::notice); +logs::channel cellRemotePlay("cellRemotePlay"); s32 cellRemotePlayGetStatus() { diff --git a/rpcs3/Emu/Cell/Modules/cellResc.cpp b/rpcs3/Emu/Cell/Modules/cellResc.cpp index 31fb864f10..4d7965e945 100644 --- a/rpcs3/Emu/Cell/Modules/cellResc.cpp +++ b/rpcs3/Emu/Cell/Modules/cellResc.cpp @@ -6,7 +6,7 @@ #include "Emu/RSX/GCM.h" #include "cellResc.h" -logs::channel cellResc("cellResc", logs::level::notice); +logs::channel cellResc("cellResc"); s32 cellRescInit(vm::ptr initConfig) { diff --git a/rpcs3/Emu/Cell/Modules/cellRtc.cpp b/rpcs3/Emu/Cell/Modules/cellRtc.cpp index 2440a0ccb1..6bb89a56c5 100644 --- a/rpcs3/Emu/Cell/Modules/cellRtc.cpp +++ b/rpcs3/Emu/Cell/Modules/cellRtc.cpp @@ -3,7 +3,7 @@ #include "cellRtc.h" -logs::channel cellRtc("cellRtc", logs::level::notice); +logs::channel cellRtc("cellRtc"); s64 convertToUNIXTime(u16 seconds, u16 minutes, u16 hours, u16 days, s32 years) { diff --git a/rpcs3/Emu/Cell/Modules/cellRtcAlarm.cpp b/rpcs3/Emu/Cell/Modules/cellRtcAlarm.cpp index fdc112b80e..4b5f30c3c5 100644 --- a/rpcs3/Emu/Cell/Modules/cellRtcAlarm.cpp +++ b/rpcs3/Emu/Cell/Modules/cellRtcAlarm.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -logs::channel cellRtcAlarm("cellRtcAlarm", logs::level::notice); +logs::channel cellRtcAlarm("cellRtcAlarm"); s32 cellRtcAlarmRegister() { diff --git a/rpcs3/Emu/Cell/Modules/cellRudp.cpp b/rpcs3/Emu/Cell/Modules/cellRudp.cpp index c5dc9b20e1..4a813349b0 100644 --- a/rpcs3/Emu/Cell/Modules/cellRudp.cpp +++ b/rpcs3/Emu/Cell/Modules/cellRudp.cpp @@ -5,7 +5,7 @@ #include "cellRudp.h" -logs::channel cellRudp("cellRudp", logs::level::notice); +logs::channel cellRudp("cellRudp"); struct rudp_t { diff --git a/rpcs3/Emu/Cell/Modules/cellSail.cpp b/rpcs3/Emu/Cell/Modules/cellSail.cpp index 725cd6de9c..4864b0e62e 100644 --- a/rpcs3/Emu/Cell/Modules/cellSail.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSail.cpp @@ -5,7 +5,7 @@ #include "cellSail.h" #include "cellPamf.h" -logs::channel cellSail("cellSail", logs::level::notice); +logs::channel cellSail("cellSail"); s32 cellSailMemAllocatorInitialize(vm::ptr pSelf, vm::ptr pCallbacks) { diff --git a/rpcs3/Emu/Cell/Modules/cellSailRec.cpp b/rpcs3/Emu/Cell/Modules/cellSailRec.cpp index 46444b5cd2..fb44bf0d52 100644 --- a/rpcs3/Emu/Cell/Modules/cellSailRec.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSailRec.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -logs::channel cellSailRec("cellSailRec", logs::level::notice); +logs::channel cellSailRec("cellSailRec"); // Error Codes enum diff --git a/rpcs3/Emu/Cell/Modules/cellSaveData.cpp b/rpcs3/Emu/Cell/Modules/cellSaveData.cpp index be44971810..7682aa76ab 100644 --- a/rpcs3/Emu/Cell/Modules/cellSaveData.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSaveData.cpp @@ -10,7 +10,7 @@ #include #include -logs::channel cellSaveData("cellSaveData", logs::level::notice); +logs::channel cellSaveData("cellSaveData"); SaveDialogBase::~SaveDialogBase() { diff --git a/rpcs3/Emu/Cell/Modules/cellScreenshot.cpp b/rpcs3/Emu/Cell/Modules/cellScreenshot.cpp index 2ecc6d1030..9d60f82cc2 100644 --- a/rpcs3/Emu/Cell/Modules/cellScreenshot.cpp +++ b/rpcs3/Emu/Cell/Modules/cellScreenshot.cpp @@ -4,7 +4,7 @@ #include "cellScreenshot.h" -logs::channel cellScreenshot("cellScreenshot", logs::level::notice); +logs::channel cellScreenshot("cellScreenshot"); s32 cellScreenShotSetParameter(vm::cptr param) { diff --git a/rpcs3/Emu/Cell/Modules/cellSearch.cpp b/rpcs3/Emu/Cell/Modules/cellSearch.cpp index e1e199f450..d08ba282e5 100644 --- a/rpcs3/Emu/Cell/Modules/cellSearch.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSearch.cpp @@ -4,7 +4,7 @@ #include "cellSearch.h" -logs::channel cellSearch("cellSearch", logs::level::notice); +logs::channel cellSearch("cellSearch"); s32 cellSearchInitialize(CellSearchMode mode, u32 container, vm::ptr func, vm::ptr userData) { diff --git a/rpcs3/Emu/Cell/Modules/cellSheap.cpp b/rpcs3/Emu/Cell/Modules/cellSheap.cpp index 314178e1eb..d8228a2711 100644 --- a/rpcs3/Emu/Cell/Modules/cellSheap.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSheap.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -logs::channel cellSheap("cellSheap", logs::level::notice); +logs::channel cellSheap("cellSheap"); // Return Codes enum diff --git a/rpcs3/Emu/Cell/Modules/cellSpudll.cpp b/rpcs3/Emu/Cell/Modules/cellSpudll.cpp index 62f5c3b72b..ad2ed90a50 100644 --- a/rpcs3/Emu/Cell/Modules/cellSpudll.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSpudll.cpp @@ -5,7 +5,7 @@ namespace vm { using namespace ps3; } -logs::channel cellSpudll("cellSpudll", logs::level::notice); +logs::channel cellSpudll("cellSpudll"); template<> void fmt_class_string::format(std::string& out, u64 arg) diff --git a/rpcs3/Emu/Cell/Modules/cellSpurs.cpp b/rpcs3/Emu/Cell/Modules/cellSpurs.cpp index 7f4608e85f..1df9fb8beb 100644 --- a/rpcs3/Emu/Cell/Modules/cellSpurs.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSpurs.cpp @@ -15,7 +15,7 @@ #include "sysPrxForUser.h" #include "cellSpurs.h" -logs::channel cellSpurs("cellSpurs", logs::level::notice); +logs::channel cellSpurs("cellSpurs"); s32 sys_spu_image_close(vm::ptr img); diff --git a/rpcs3/Emu/Cell/Modules/cellSpursJq.cpp b/rpcs3/Emu/Cell/Modules/cellSpursJq.cpp index 5be8826002..4c7d521efd 100644 --- a/rpcs3/Emu/Cell/Modules/cellSpursJq.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSpursJq.cpp @@ -8,7 +8,7 @@ #include "cellSpurs.h" #include "cellSpursJq.h" -logs::channel cellSpursJq("cellSpursJq", logs::level::notice); +logs::channel cellSpursJq("cellSpursJq"); s32 cellSpursJobQueueAttributeInitialize() { diff --git a/rpcs3/Emu/Cell/Modules/cellSsl.cpp b/rpcs3/Emu/Cell/Modules/cellSsl.cpp index a016c64390..728d42fa22 100644 --- a/rpcs3/Emu/Cell/Modules/cellSsl.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSsl.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -logs::channel cellSsl("cellSsl", logs::level::notice); +logs::channel cellSsl("cellSsl"); s32 cellSslInit() { diff --git a/rpcs3/Emu/Cell/Modules/cellSubdisplay.cpp b/rpcs3/Emu/Cell/Modules/cellSubdisplay.cpp index 7f95dc23bf..5caecf4716 100644 --- a/rpcs3/Emu/Cell/Modules/cellSubdisplay.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSubdisplay.cpp @@ -3,7 +3,7 @@ #include "cellSubdisplay.h" -logs::channel cellSubdisplay("cellSubdisplay", logs::level::notice); +logs::channel cellSubdisplay("cellSubdisplay"); template<> void fmt_class_string::format(std::string& out, u64 arg) diff --git a/rpcs3/Emu/Cell/Modules/cellSync.cpp b/rpcs3/Emu/Cell/Modules/cellSync.cpp index 2aec259e7b..06d21222ba 100644 --- a/rpcs3/Emu/Cell/Modules/cellSync.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSync.cpp @@ -6,7 +6,7 @@ #include "Emu/Cell/lv2/sys_process.h" #include "cellSync.h" -logs::channel cellSync("cellSync", logs::level::notice); +logs::channel cellSync("cellSync"); template<> void fmt_class_string::format(std::string& out, u64 arg) diff --git a/rpcs3/Emu/Cell/Modules/cellSync2.cpp b/rpcs3/Emu/Cell/Modules/cellSync2.cpp index 27e28faff9..c1bb519fb7 100644 --- a/rpcs3/Emu/Cell/Modules/cellSync2.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSync2.cpp @@ -6,7 +6,7 @@ #include "Utilities/StrUtil.h" -logs::channel cellSync2("cellSync2", logs::level::notice); +logs::channel cellSync2("cellSync2"); vm::gvar gCellSync2CallerThreadTypePpuThread; vm::gvar gCellSync2NotifierPpuThread; diff --git a/rpcs3/Emu/Cell/Modules/cellSysconf.cpp b/rpcs3/Emu/Cell/Modules/cellSysconf.cpp index 59d5c1ad78..672a54d5bb 100644 --- a/rpcs3/Emu/Cell/Modules/cellSysconf.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSysconf.cpp @@ -3,7 +3,7 @@ #include "cellSysconf.h" -logs::channel cellSysconf("cellSysconf", logs::level::notice); +logs::channel cellSysconf("cellSysconf"); s32 cellSysconfAbort() { diff --git a/rpcs3/Emu/Cell/Modules/cellSysmodule.cpp b/rpcs3/Emu/Cell/Modules/cellSysmodule.cpp index 6ed5671246..c9ce1773c0 100644 --- a/rpcs3/Emu/Cell/Modules/cellSysmodule.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSysmodule.cpp @@ -2,7 +2,7 @@ #include "Emu/System.h" #include "Emu/Cell/PPUModule.h" -logs::channel cellSysmodule("cellSysmodule", logs::level::notice); +logs::channel cellSysmodule("cellSysmodule"); enum { diff --git a/rpcs3/Emu/Cell/Modules/cellSysutil.cpp b/rpcs3/Emu/Cell/Modules/cellSysutil.cpp index 4c73984b38..8c0fe5b196 100644 --- a/rpcs3/Emu/Cell/Modules/cellSysutil.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSysutil.cpp @@ -11,7 +11,7 @@ #include #include -logs::channel cellSysutil("cellSysutil", logs::level::notice); +logs::channel cellSysutil("cellSysutil"); struct sysutil_cb_manager { diff --git a/rpcs3/Emu/Cell/Modules/cellSysutilAp.cpp b/rpcs3/Emu/Cell/Modules/cellSysutilAp.cpp index 56cf397dd2..bc70503053 100644 --- a/rpcs3/Emu/Cell/Modules/cellSysutilAp.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSysutilAp.cpp @@ -3,7 +3,7 @@ namespace vm { using namespace ps3; } -logs::channel cellSysutilAp("cellSysutilAp", logs::level::notice); +logs::channel cellSysutilAp("cellSysutilAp"); // Return Codes enum diff --git a/rpcs3/Emu/Cell/Modules/cellSysutilAvc.cpp b/rpcs3/Emu/Cell/Modules/cellSysutilAvc.cpp index 607ca0daee..951fb700ca 100644 --- a/rpcs3/Emu/Cell/Modules/cellSysutilAvc.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSysutilAvc.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -logs::channel cellSysutilAvc("cellSysutilAvc", logs::level::notice); +logs::channel cellSysutilAvc("cellSysutilAvc"); s32 cellSysutilAvcByeRequest() { diff --git a/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.cpp b/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.cpp index 4053eb4a2c..9945d068bb 100644 --- a/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSysutilAvc2.cpp @@ -5,7 +5,7 @@ #include "sceNp2.h" #include "cellSysutilAvc2.h" -logs::channel cellSysutilAvc2("cellSysutilAvc2", logs::level::notice); +logs::channel cellSysutilAvc2("cellSysutilAvc2"); s32 cellSysutilAvc2GetPlayerInfo() { diff --git a/rpcs3/Emu/Cell/Modules/cellSysutilMisc.cpp b/rpcs3/Emu/Cell/Modules/cellSysutilMisc.cpp index 109e7a817a..e807d52ae7 100644 --- a/rpcs3/Emu/Cell/Modules/cellSysutilMisc.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSysutilMisc.cpp @@ -2,7 +2,7 @@ #include "Emu/System.h" #include "Emu/Cell/PPUModule.h" -logs::channel cellSysutilMisc("cellSysutilMisc", logs::level::notice); +logs::channel cellSysutilMisc("cellSysutilMisc"); // License areas enum diff --git a/rpcs3/Emu/Cell/Modules/cellSysutilNpEula.cpp b/rpcs3/Emu/Cell/Modules/cellSysutilNpEula.cpp index b696f7fbb8..e809c51770 100644 --- a/rpcs3/Emu/Cell/Modules/cellSysutilNpEula.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSysutilNpEula.cpp @@ -2,7 +2,7 @@ #include "Emu/System.h" #include "Emu/Cell/PPUModule.h" -logs::channel cellSysutilNpEula("cellSysutilNpEula", logs::level::notice); +logs::channel cellSysutilNpEula("cellSysutilNpEula"); s32 cellSysutilNpEula_59D1629A() // Resistance 3, Uncharted 2 { diff --git a/rpcs3/Emu/Cell/Modules/cellUsbd.cpp b/rpcs3/Emu/Cell/Modules/cellUsbd.cpp index d998d9387c..ddeb4c3bef 100644 --- a/rpcs3/Emu/Cell/Modules/cellUsbd.cpp +++ b/rpcs3/Emu/Cell/Modules/cellUsbd.cpp @@ -3,7 +3,7 @@ #include "Emu/Cell/PPUModule.h" #include "cellUsbd.h" -logs::channel cellUsbd("cellUsbd", logs::level::notice); +logs::channel cellUsbd("cellUsbd"); s32 cellUsbdInit() { diff --git a/rpcs3/Emu/Cell/Modules/cellUsbpspcm.cpp b/rpcs3/Emu/Cell/Modules/cellUsbpspcm.cpp index 88267a3468..a302dcfea0 100644 --- a/rpcs3/Emu/Cell/Modules/cellUsbpspcm.cpp +++ b/rpcs3/Emu/Cell/Modules/cellUsbpspcm.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -logs::channel cellUsbPspcm("cellUsbPspcm", logs::level::notice); +logs::channel cellUsbPspcm("cellUsbPspcm"); // Return Codes enum diff --git a/rpcs3/Emu/Cell/Modules/cellUserInfo.cpp b/rpcs3/Emu/Cell/Modules/cellUserInfo.cpp index 3d15511d70..5e613b7437 100644 --- a/rpcs3/Emu/Cell/Modules/cellUserInfo.cpp +++ b/rpcs3/Emu/Cell/Modules/cellUserInfo.cpp @@ -6,7 +6,7 @@ #include "Utilities/StrUtil.h" -logs::channel cellUserInfo("cellUserInfo", logs::level::notice); +logs::channel cellUserInfo("cellUserInfo"); template<> void fmt_class_string::format(std::string& out, u64 arg) diff --git a/rpcs3/Emu/Cell/Modules/cellVdec.cpp b/rpcs3/Emu/Cell/Modules/cellVdec.cpp index 0460f51bfe..65a0b04505 100644 --- a/rpcs3/Emu/Cell/Modules/cellVdec.cpp +++ b/rpcs3/Emu/Cell/Modules/cellVdec.cpp @@ -20,7 +20,7 @@ extern "C" std::mutex g_mutex_avcodec_open2; -logs::channel cellVdec("cellVdec", logs::level::notice); +logs::channel cellVdec("cellVdec"); vm::gvar _cell_vdec_prx_ver; // ??? diff --git a/rpcs3/Emu/Cell/Modules/cellVideoExport.cpp b/rpcs3/Emu/Cell/Modules/cellVideoExport.cpp index b817edef33..a089a404c4 100644 --- a/rpcs3/Emu/Cell/Modules/cellVideoExport.cpp +++ b/rpcs3/Emu/Cell/Modules/cellVideoExport.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -logs::channel cellVideoExport("cellVideoExport", logs::level::notice); +logs::channel cellVideoExport("cellVideoExport"); s32 cellVideoExportProgress() { diff --git a/rpcs3/Emu/Cell/Modules/cellVideoUpload.cpp b/rpcs3/Emu/Cell/Modules/cellVideoUpload.cpp index 8d436a5640..80dd8a0b62 100644 --- a/rpcs3/Emu/Cell/Modules/cellVideoUpload.cpp +++ b/rpcs3/Emu/Cell/Modules/cellVideoUpload.cpp @@ -3,7 +3,7 @@ #include "cellVideoUpload.h" -logs::channel cellVideoUpload("cellVideoUpload", logs::level::notice); +logs::channel cellVideoUpload("cellVideoUpload"); s32 cellVideoUploadInitialize(vm::cptr pParam, vm::ptr cb, vm::ptr userdata) { diff --git a/rpcs3/Emu/Cell/Modules/cellVoice.cpp b/rpcs3/Emu/Cell/Modules/cellVoice.cpp index 660c9f3cd1..91f912f189 100644 --- a/rpcs3/Emu/Cell/Modules/cellVoice.cpp +++ b/rpcs3/Emu/Cell/Modules/cellVoice.cpp @@ -4,7 +4,7 @@ #include "cellVoice.h" -logs::channel cellVoice("cellVoice", logs::level::notice); +logs::channel cellVoice("cellVoice"); s32 cellVoiceConnectIPortToOPort() diff --git a/rpcs3/Emu/Cell/Modules/cellVpost.cpp b/rpcs3/Emu/Cell/Modules/cellVpost.cpp index a8bdcbef42..9542dd13a1 100644 --- a/rpcs3/Emu/Cell/Modules/cellVpost.cpp +++ b/rpcs3/Emu/Cell/Modules/cellVpost.cpp @@ -10,7 +10,7 @@ extern "C" #include "cellVpost.h" -logs::channel cellVpost("cellVpost", logs::level::notice); +logs::channel cellVpost("cellVpost"); s32 cellVpostQueryAttr(vm::cptr cfgParam, vm::ptr attr) { diff --git a/rpcs3/Emu/Cell/Modules/cell_FreeType2.cpp b/rpcs3/Emu/Cell/Modules/cell_FreeType2.cpp index 49bf308542..909bb9e9b7 100644 --- a/rpcs3/Emu/Cell/Modules/cell_FreeType2.cpp +++ b/rpcs3/Emu/Cell/Modules/cell_FreeType2.cpp @@ -2,7 +2,7 @@ #include "Emu/System.h" #include "Emu/Cell/PPUModule.h" -logs::channel cell_FreeType2("cell_FreeType2", logs::level::notice); +logs::channel cell_FreeType2("cell_FreeType2"); // Functions s32 cellFreeType2Ex() diff --git a/rpcs3/Emu/Cell/Modules/libmedi.cpp b/rpcs3/Emu/Cell/Modules/libmedi.cpp index bcf01ba4eb..47ac4e3420 100644 --- a/rpcs3/Emu/Cell/Modules/libmedi.cpp +++ b/rpcs3/Emu/Cell/Modules/libmedi.cpp @@ -2,7 +2,7 @@ #include "Emu/System.h" #include "Emu/Cell/PPUModule.h" -logs::channel libmedi("libmedi", logs::level::notice); +logs::channel libmedi("libmedi"); s32 cellMediatorCloseContext() { diff --git a/rpcs3/Emu/Cell/Modules/libmixer.cpp b/rpcs3/Emu/Cell/Modules/libmixer.cpp index cdc0871573..1cdb7aae81 100644 --- a/rpcs3/Emu/Cell/Modules/libmixer.cpp +++ b/rpcs3/Emu/Cell/Modules/libmixer.cpp @@ -11,7 +11,7 @@ #include #include -logs::channel libmixer("libmixer", logs::level::notice); +logs::channel libmixer("libmixer"); struct SurMixerConfig { diff --git a/rpcs3/Emu/Cell/Modules/libsnd3.cpp b/rpcs3/Emu/Cell/Modules/libsnd3.cpp index fa95e7ac03..6223ac7d06 100644 --- a/rpcs3/Emu/Cell/Modules/libsnd3.cpp +++ b/rpcs3/Emu/Cell/Modules/libsnd3.cpp @@ -3,7 +3,7 @@ #include "libsnd3.h" -logs::channel libsnd3("libsnd3", logs::level::notice); +logs::channel libsnd3("libsnd3"); s32 cellSnd3Init(u32 maxVoice, u32 samples, vm::ptr queue) { diff --git a/rpcs3/Emu/Cell/Modules/libsynth2.cpp b/rpcs3/Emu/Cell/Modules/libsynth2.cpp index 07285b1606..e87c0539f5 100644 --- a/rpcs3/Emu/Cell/Modules/libsynth2.cpp +++ b/rpcs3/Emu/Cell/Modules/libsynth2.cpp @@ -5,7 +5,7 @@ namespace vm { using namespace ps3; } -logs::channel libsynth2("libsynth2", logs::level::notice); +logs::channel libsynth2("libsynth2"); s32 cellSoundSynth2Config(s16 param, s32 value) { diff --git a/rpcs3/Emu/Cell/Modules/sceNp.cpp b/rpcs3/Emu/Cell/Modules/sceNp.cpp index 5061cdcab9..aca7c3484c 100644 --- a/rpcs3/Emu/Cell/Modules/sceNp.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNp.cpp @@ -9,7 +9,7 @@ #include "cellRtc.h" #include "sceNp.h" -logs::channel sceNp("sceNp", logs::level::notice); +logs::channel sceNp("sceNp"); s32 g_psn_connection_status = SCE_NP_MANAGER_STATUS_OFFLINE; diff --git a/rpcs3/Emu/Cell/Modules/sceNp2.cpp b/rpcs3/Emu/Cell/Modules/sceNp2.cpp index 41086fbfe5..8366b18c65 100644 --- a/rpcs3/Emu/Cell/Modules/sceNp2.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNp2.cpp @@ -4,7 +4,7 @@ #include "sceNp.h" #include "sceNp2.h" -logs::channel sceNp2("sceNp2", logs::level::notice); +logs::channel sceNp2("sceNp2"); s32 sceNp2Init(u32 poolsize, vm::ptr poolptr) { diff --git a/rpcs3/Emu/Cell/Modules/sceNpClans.cpp b/rpcs3/Emu/Cell/Modules/sceNpClans.cpp index eb3e3bed8a..03d3e317b1 100644 --- a/rpcs3/Emu/Cell/Modules/sceNpClans.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNpClans.cpp @@ -5,7 +5,7 @@ #include "sceNp.h" #include "sceNpClans.h" -logs::channel sceNpClans("sceNpClans", logs::level::notice); +logs::channel sceNpClans("sceNpClans"); s32 sceNpClansInit(vm::ptr commId, vm::ptr passphrase, vm::ptr pool, vm::ptr poolSize, u32 flags) { diff --git a/rpcs3/Emu/Cell/Modules/sceNpCommerce2.cpp b/rpcs3/Emu/Cell/Modules/sceNpCommerce2.cpp index 38074b00d6..8e4fd0fc7f 100644 --- a/rpcs3/Emu/Cell/Modules/sceNpCommerce2.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNpCommerce2.cpp @@ -3,7 +3,7 @@ #include "sceNpCommerce2.h" -logs::channel sceNpCommerce2("sceNpCommerce2", logs::level::notice); +logs::channel sceNpCommerce2("sceNpCommerce2"); s32 sceNpCommerce2ExecuteStoreBrowse() { diff --git a/rpcs3/Emu/Cell/Modules/sceNpSns.cpp b/rpcs3/Emu/Cell/Modules/sceNpSns.cpp index 70526a5dce..828c59a7d4 100644 --- a/rpcs3/Emu/Cell/Modules/sceNpSns.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNpSns.cpp @@ -4,7 +4,7 @@ #include "sceNpSns.h" -logs::channel sceNpSns("sceNpSns", logs::level::notice); +logs::channel sceNpSns("sceNpSns"); template<> void fmt_class_string::format(std::string& out, u64 arg) diff --git a/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp b/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp index 3322ef1e69..9baa2fd085 100644 --- a/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp @@ -14,7 +14,7 @@ #include "Utilities/StrUtil.h" -logs::channel sceNpTrophy("sceNpTrophy", logs::level::notice); +logs::channel sceNpTrophy("sceNpTrophy"); struct trophy_context_t { diff --git a/rpcs3/Emu/Cell/Modules/sceNpTus.cpp b/rpcs3/Emu/Cell/Modules/sceNpTus.cpp index 932f667f51..9193b0d7a0 100644 --- a/rpcs3/Emu/Cell/Modules/sceNpTus.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNpTus.cpp @@ -4,7 +4,7 @@ #include "sceNp.h" #include "sceNpTus.h" -logs::channel sceNpTus("sceNpTus", logs::level::notice); +logs::channel sceNpTus("sceNpTus"); s32 sceNpTusInit() { diff --git a/rpcs3/Emu/Cell/Modules/sceNpUtil.cpp b/rpcs3/Emu/Cell/Modules/sceNpUtil.cpp index 0d99b7e843..0253780533 100644 --- a/rpcs3/Emu/Cell/Modules/sceNpUtil.cpp +++ b/rpcs3/Emu/Cell/Modules/sceNpUtil.cpp @@ -4,7 +4,7 @@ #include "sceNp.h" #include "sceNpUtil.h" -logs::channel sceNpUtil("sceNpUtil", logs::level::notice); +logs::channel sceNpUtil("sceNpUtil"); s32 sceNpUtilBandwidthTestInitStart(u32 prio, size_t stack) { diff --git a/rpcs3/Emu/Cell/Modules/sysPrxForUser.cpp b/rpcs3/Emu/Cell/Modules/sysPrxForUser.cpp index 880ab2b13a..55837f4b5b 100644 --- a/rpcs3/Emu/Cell/Modules/sysPrxForUser.cpp +++ b/rpcs3/Emu/Cell/Modules/sysPrxForUser.cpp @@ -6,7 +6,7 @@ #include "Emu/Cell/lv2/sys_process.h" #include "sysPrxForUser.h" -logs::channel sysPrxForUser("sysPrxForUser", logs::level::notice); +logs::channel sysPrxForUser("sysPrxForUser"); extern u64 get_system_time(); diff --git a/rpcs3/Emu/Cell/Modules/sys_io.cpp b/rpcs3/Emu/Cell/Modules/sys_io.cpp index 802eedae08..845f10957d 100644 --- a/rpcs3/Emu/Cell/Modules/sys_io.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_io.cpp @@ -1,7 +1,7 @@ #include "stdafx.h" #include "Emu/Cell/PPUModule.h" -logs::channel sys_io("sys_io", logs::level::notice); +logs::channel sys_io("sys_io"); extern void cellPad_init(); extern void cellKb_init(); diff --git a/rpcs3/Emu/Cell/Modules/sys_libc.cpp b/rpcs3/Emu/Cell/Modules/sys_libc.cpp index 0e37a4125e..5ee373c60f 100644 --- a/rpcs3/Emu/Cell/Modules/sys_libc.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_libc.cpp @@ -5,7 +5,7 @@ namespace vm { using namespace ps3; } -logs::channel sys_libc("sys_libc", logs::level::notice); +logs::channel sys_libc("sys_libc"); void sys_libc_memcpy(vm::ptr dst, vm::cptr src, u32 size) { diff --git a/rpcs3/Emu/Cell/Modules/sys_lv2dbg.cpp b/rpcs3/Emu/Cell/Modules/sys_lv2dbg.cpp index bf318d83bc..57a950cfc2 100644 --- a/rpcs3/Emu/Cell/Modules/sys_lv2dbg.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_lv2dbg.cpp @@ -5,7 +5,7 @@ #include "sys_lv2dbg.h" -logs::channel sys_lv2dbg("sys_lv2dbg", logs::level::notice); +logs::channel sys_lv2dbg("sys_lv2dbg"); s32 sys_dbg_read_ppu_thread_context(u64 id, vm::ptr ppu_context) { diff --git a/rpcs3/Emu/Cell/Modules/sys_net.cpp b/rpcs3/Emu/Cell/Modules/sys_net.cpp index ba7d57926a..e7a44ead4a 100644 --- a/rpcs3/Emu/Cell/Modules/sys_net.cpp +++ b/rpcs3/Emu/Cell/Modules/sys_net.cpp @@ -19,7 +19,7 @@ #include -logs::channel libnet("libnet", logs::level::notice); +logs::channel libnet("libnet"); namespace sys_net { diff --git a/rpcs3/Emu/Cell/PPUModule.cpp b/rpcs3/Emu/Cell/PPUModule.cpp index 9f6cada3ac..3cd4ce2300 100644 --- a/rpcs3/Emu/Cell/PPUModule.cpp +++ b/rpcs3/Emu/Cell/PPUModule.cpp @@ -19,106 +19,6 @@ namespace vm { using namespace ps3; } -LOG_CHANNEL(cellAdec); -LOG_CHANNEL(cellAtrac); -LOG_CHANNEL(cellAtracMulti); -LOG_CHANNEL(cellAudio); -LOG_CHANNEL(cellAvconfExt); -LOG_CHANNEL(cellBGDL); -LOG_CHANNEL(cellCamera); -LOG_CHANNEL(cellCelp8Enc); -LOG_CHANNEL(cellCelpEnc); -LOG_CHANNEL(cellCrossController); -LOG_CHANNEL(cellDaisy); -LOG_CHANNEL(cellDmux); -LOG_CHANNEL(cellFiber); -LOG_CHANNEL(cellFont); -LOG_CHANNEL(cellFontFT); -LOG_CHANNEL(cell_FreeType2); -LOG_CHANNEL(cellFs); -LOG_CHANNEL(cellGame); -LOG_CHANNEL(cellGameExec); -LOG_CHANNEL(cellGcmSys); -LOG_CHANNEL(cellGem); -LOG_CHANNEL(cellGifDec); -LOG_CHANNEL(cellHttp); -LOG_CHANNEL(cellHttpUtil); -LOG_CHANNEL(cellImeJp); -LOG_CHANNEL(cellJpgDec); -LOG_CHANNEL(cellJpgEnc); -LOG_CHANNEL(cellKey2char); -LOG_CHANNEL(cellL10n); -LOG_CHANNEL(cellLibprof); -LOG_CHANNEL(cellMic); -LOG_CHANNEL(cellMusic); -LOG_CHANNEL(cellMusicDecode); -LOG_CHANNEL(cellMusicExport); -LOG_CHANNEL(cellNetCtl); -LOG_CHANNEL(cellOskDialog); -LOG_CHANNEL(cellOvis); -LOG_CHANNEL(cellPamf); -LOG_CHANNEL(cellPhotoDecode); -LOG_CHANNEL(cellPhotoExport); -LOG_CHANNEL(cellPhotoImportUtil); -LOG_CHANNEL(cellPngDec); -LOG_CHANNEL(cellPngEnc); -LOG_CHANNEL(cellPrint); -LOG_CHANNEL(cellRec); -LOG_CHANNEL(cellRemotePlay); -LOG_CHANNEL(cellResc); -LOG_CHANNEL(cellRtc); -LOG_CHANNEL(cellRtcAlarm); -LOG_CHANNEL(cellRudp); -LOG_CHANNEL(cellSail); -LOG_CHANNEL(cellSailRec); -LOG_CHANNEL(cellSaveData); -LOG_CHANNEL(cellScreenshot); -LOG_CHANNEL(cellSearch); -LOG_CHANNEL(cellSheap); -LOG_CHANNEL(cellSpudll); -LOG_CHANNEL(cellSpurs); -LOG_CHANNEL(cellSpursJq); -LOG_CHANNEL(cellSsl); -LOG_CHANNEL(cellSubdisplay); -LOG_CHANNEL(cellSync); -LOG_CHANNEL(cellSync2); -LOG_CHANNEL(cellSysconf); -LOG_CHANNEL(cellSysmodule); -LOG_CHANNEL(cellSysutil); -LOG_CHANNEL(cellSysutilAp); -LOG_CHANNEL(cellSysutilAvc); -LOG_CHANNEL(cellSysutilAvc2); -LOG_CHANNEL(cellSysutilMisc); -LOG_CHANNEL(cellSysutilNpEula); -LOG_CHANNEL(cellUsbd); -LOG_CHANNEL(cellUsbPspcm); -LOG_CHANNEL(cellUserInfo); -LOG_CHANNEL(cellVdec); -LOG_CHANNEL(cellVideoExport); -LOG_CHANNEL(cellVideoUpload); -LOG_CHANNEL(cellVoice); -LOG_CHANNEL(cellVpost); -LOG_CHANNEL(libmedi); -LOG_CHANNEL(libmixer); -LOG_CHANNEL(libsnd3); -LOG_CHANNEL(libsynth2); -LOG_CHANNEL(sceNp); -LOG_CHANNEL(sceNp2); -LOG_CHANNEL(sceNpClans); -LOG_CHANNEL(sceNpCommerce2); -LOG_CHANNEL(sceNpSns); -LOG_CHANNEL(sceNpTrophy); -LOG_CHANNEL(sceNpTus); -LOG_CHANNEL(sceNpUtil); -LOG_CHANNEL(sys_io); -LOG_CHANNEL(sys_libc); -LOG_CHANNEL(sys_lv2dbg); -LOG_CHANNEL(libnet); -LOG_CHANNEL(sysPrxForUser); -#ifdef WITH_GDB_DEBUGGER -LOG_CHANNEL(gdbDebugServer); -#endif - enum class lib_loader_mode { automatic, diff --git a/rpcs3/Emu/Cell/lv2/lv2.cpp b/rpcs3/Emu/Cell/lv2/lv2.cpp index 942640ef9c..24596fc536 100644 --- a/rpcs3/Emu/Cell/lv2/lv2.cpp +++ b/rpcs3/Emu/Cell/lv2/lv2.cpp @@ -32,31 +32,6 @@ #include "sys_gamepad.h" #include "sys_ss.h" -LOG_CHANNEL(sys_cond); -LOG_CHANNEL(sys_dbg); -LOG_CHANNEL(sys_event); -LOG_CHANNEL(sys_event_flag); -LOG_CHANNEL(sys_fs); -LOG_CHANNEL(sys_interrupt); -LOG_CHANNEL(sys_lwcond); -LOG_CHANNEL(sys_lwmutex); -LOG_CHANNEL(sys_memory); -LOG_CHANNEL(sys_mmapper); -LOG_CHANNEL(sys_mutex); -LOG_CHANNEL(sys_ppu_thread); -LOG_CHANNEL(sys_process); -LOG_CHANNEL(sys_prx); -LOG_CHANNEL(sys_rsx); -LOG_CHANNEL(sys_rwlock); -LOG_CHANNEL(sys_semaphore); -LOG_CHANNEL(sys_spu); -LOG_CHANNEL(sys_time); -LOG_CHANNEL(sys_timer); -LOG_CHANNEL(sys_trace); -LOG_CHANNEL(sys_tty); -LOG_CHANNEL(sys_vm); -LOG_CHANNEL(sys_gamepad); - extern std::string ppu_get_syscall_name(u64 code); static constexpr ppu_function_t null_func = nullptr; @@ -1041,7 +1016,7 @@ void lv2_obj::sleep_timeout(named_thread& thread, u64 timeout) if (auto ppu = dynamic_cast(&thread)) { - sys_ppu_thread.trace("sleep() - waiting (%zu)", g_pending.size()); + LOG_TRACE(PPU, "sleep() - waiting (%zu)", g_pending.size()); auto state = ppu->state.fetch_op([&](auto& val) { @@ -1053,7 +1028,7 @@ void lv2_obj::sleep_timeout(named_thread& thread, u64 timeout) if (test(state, cpu_flag::signal)) { - sys_ppu_thread.trace("sleep() failed (signaled)"); + LOG_TRACE(PPU, "sleep() failed (signaled)"); return; } @@ -1126,14 +1101,14 @@ void lv2_obj::awake(cpu_thread& cpu, u32 prio) { if (i < g_ppu.size() && g_ppu[i] == &cpu) { - sys_ppu_thread.trace("sleep() - suspended (p=%zu)", g_pending.size()); + LOG_TRACE(PPU, "sleep() - suspended (p=%zu)", g_pending.size()); break; } // Use priority, also preserve FIFO order if (i == g_ppu.size() || g_ppu[i]->prio > static_cast(cpu).prio) { - sys_ppu_thread.trace("awake(): %s", cpu.id); + LOG_TRACE(PPU, "awake(): %s", cpu.id); g_ppu.insert(g_ppu.cbegin() + i, &static_cast(cpu)); // Unregister timeout if necessary @@ -1163,7 +1138,7 @@ void lv2_obj::awake(cpu_thread& cpu, u32 prio) if (!target->state.test_and_set(cpu_flag::suspend)) { - sys_ppu_thread.trace("suspend(): %s", target->id); + LOG_TRACE(PPU, "suspend(): %s", target->id); g_pending.emplace_back(target); } } @@ -1189,7 +1164,7 @@ void lv2_obj::schedule_all() if (test(target->state, cpu_flag::suspend)) { - sys_ppu_thread.trace("schedule(): %s", target->id); + LOG_TRACE(PPU, "schedule(): %s", target->id); target->state ^= (cpu_flag::signal + cpu_flag::suspend); target->start_time = 0; diff --git a/rpcs3/Emu/Cell/lv2/sys_cond.cpp b/rpcs3/Emu/Cell/lv2/sys_cond.cpp index d52c6357c4..ff7627f579 100644 --- a/rpcs3/Emu/Cell/lv2/sys_cond.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_cond.cpp @@ -10,7 +10,7 @@ namespace vm { using namespace ps3; } -logs::channel sys_cond("sys_cond", logs::level::notice); +logs::channel sys_cond("sys_cond"); extern u64 get_system_time(); diff --git a/rpcs3/Emu/Cell/lv2/sys_dbg.cpp b/rpcs3/Emu/Cell/lv2/sys_dbg.cpp index 577cd73d45..4a969eab90 100644 --- a/rpcs3/Emu/Cell/lv2/sys_dbg.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_dbg.cpp @@ -8,4 +8,4 @@ namespace vm { using namespace ps3; } -logs::channel sys_dbg("sys_dbg", logs::level::notice); +logs::channel sys_dbg("sys_dbg"); diff --git a/rpcs3/Emu/Cell/lv2/sys_event.cpp b/rpcs3/Emu/Cell/lv2/sys_event.cpp index ce90ac7118..b7f4c1ff4b 100644 --- a/rpcs3/Emu/Cell/lv2/sys_event.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_event.cpp @@ -12,7 +12,7 @@ namespace vm { using namespace ps3; } -logs::channel sys_event("sys_event", logs::level::notice); +logs::channel sys_event("sys_event"); template<> DECLARE(ipc_manager::g_ipc) {}; diff --git a/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp b/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp index c9c57c21f5..47ad65541d 100644 --- a/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_event_flag.cpp @@ -11,7 +11,7 @@ namespace vm { using namespace ps3; } -logs::channel sys_event_flag("sys_event_flag", logs::level::notice); +logs::channel sys_event_flag("sys_event_flag"); extern u64 get_system_time(); diff --git a/rpcs3/Emu/Cell/lv2/sys_fs.cpp b/rpcs3/Emu/Cell/lv2/sys_fs.cpp index 615d4a599b..205a20765f 100644 --- a/rpcs3/Emu/Cell/lv2/sys_fs.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_fs.cpp @@ -11,7 +11,7 @@ namespace vm { using namespace ps3; } -logs::channel sys_fs("sys_fs", logs::level::notice); +logs::channel sys_fs("sys_fs"); struct lv2_fs_mount_point { diff --git a/rpcs3/Emu/Cell/lv2/sys_interrupt.cpp b/rpcs3/Emu/Cell/lv2/sys_interrupt.cpp index 54305c8f55..fafeedb8b2 100644 --- a/rpcs3/Emu/Cell/lv2/sys_interrupt.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_interrupt.cpp @@ -10,7 +10,7 @@ namespace vm { using namespace ps3; } -logs::channel sys_interrupt("sys_interrupt", logs::level::notice); +logs::channel sys_interrupt("sys_interrupt"); void lv2_int_serv::exec() { diff --git a/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp b/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp index df7a7d6561..6bd74b829a 100644 --- a/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_lwcond.cpp @@ -10,7 +10,7 @@ namespace vm { using namespace ps3; } -logs::channel sys_lwcond("sys_lwcond", logs::level::notice); +logs::channel sys_lwcond("sys_lwcond"); extern u64 get_system_time(); diff --git a/rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp b/rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp index e88647e14b..9bdb334fee 100644 --- a/rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_lwmutex.cpp @@ -9,7 +9,7 @@ namespace vm { using namespace ps3; } -logs::channel sys_lwmutex("sys_lwmutex", logs::level::notice); +logs::channel sys_lwmutex("sys_lwmutex"); extern u64 get_system_time(); diff --git a/rpcs3/Emu/Cell/lv2/sys_memory.cpp b/rpcs3/Emu/Cell/lv2/sys_memory.cpp index 7dd4ddeeb0..419be54210 100644 --- a/rpcs3/Emu/Cell/lv2/sys_memory.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_memory.cpp @@ -3,7 +3,7 @@ namespace vm { using namespace ps3; } -logs::channel sys_memory("sys_memory", logs::level::notice); +logs::channel sys_memory("sys_memory"); error_code sys_memory_allocate(u32 size, u64 flags, vm::ptr alloc_addr) { diff --git a/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp b/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp index c11966f0d9..cbee10e92d 100644 --- a/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp @@ -3,7 +3,7 @@ namespace vm { using namespace ps3; } -logs::channel sys_mmapper("sys_mmapper", logs::level::notice); +logs::channel sys_mmapper("sys_mmapper"); error_code sys_mmapper_allocate_address(u64 size, u64 flags, u64 alignment, vm::ptr alloc_addr) { diff --git a/rpcs3/Emu/Cell/lv2/sys_mutex.cpp b/rpcs3/Emu/Cell/lv2/sys_mutex.cpp index d5d5990233..d79402387f 100644 --- a/rpcs3/Emu/Cell/lv2/sys_mutex.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_mutex.cpp @@ -9,7 +9,7 @@ namespace vm { using namespace ps3; } -logs::channel sys_mutex("sys_mutex", logs::level::notice); +logs::channel sys_mutex("sys_mutex"); extern u64 get_system_time(); diff --git a/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp b/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp index 27585ef4df..ce8bbfc011 100644 --- a/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp @@ -10,7 +10,7 @@ namespace vm { using namespace ps3; } -logs::channel sys_ppu_thread("sys_ppu_thread", logs::level::notice); +logs::channel sys_ppu_thread("sys_ppu_thread"); void _sys_ppu_thread_exit(ppu_thread& ppu, u64 errorcode) { diff --git a/rpcs3/Emu/Cell/lv2/sys_process.cpp b/rpcs3/Emu/Cell/lv2/sys_process.cpp index a1ba49f54e..c9fa057158 100644 --- a/rpcs3/Emu/Cell/lv2/sys_process.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_process.cpp @@ -24,7 +24,7 @@ namespace vm { using namespace ps3; } -logs::channel sys_process("sys_process", logs::level::notice); +logs::channel sys_process("sys_process"); u32 g_ps3_sdk_version; diff --git a/rpcs3/Emu/Cell/lv2/sys_prx.cpp b/rpcs3/Emu/Cell/lv2/sys_prx.cpp index c829436b60..f68d555bd6 100644 --- a/rpcs3/Emu/Cell/lv2/sys_prx.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_prx.cpp @@ -14,7 +14,7 @@ namespace vm { using namespace ps3; } extern std::shared_ptr ppu_load_prx(const ppu_prx_object&, const std::string&); extern void ppu_initialize(const ppu_module&); -logs::channel sys_prx("sys_prx", logs::level::notice); +logs::channel sys_prx("sys_prx"); static const std::unordered_map s_prx_ignore { diff --git a/rpcs3/Emu/Cell/lv2/sys_rsx.cpp b/rpcs3/Emu/Cell/lv2/sys_rsx.cpp index 43f2dc3f19..2cb5ba9945 100644 --- a/rpcs3/Emu/Cell/lv2/sys_rsx.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_rsx.cpp @@ -7,7 +7,7 @@ namespace vm { using namespace ps3; } -logs::channel sys_rsx("sys_rsx", logs::level::notice); +logs::channel sys_rsx("sys_rsx"); s32 sys_rsx_device_open() { diff --git a/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp b/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp index 226c9180a9..79351653a9 100644 --- a/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_rwlock.cpp @@ -9,7 +9,7 @@ namespace vm { using namespace ps3; } -logs::channel sys_rwlock("sys_rwlock", logs::level::notice); +logs::channel sys_rwlock("sys_rwlock"); extern u64 get_system_time(); diff --git a/rpcs3/Emu/Cell/lv2/sys_semaphore.cpp b/rpcs3/Emu/Cell/lv2/sys_semaphore.cpp index 22c609432a..91da75c689 100644 --- a/rpcs3/Emu/Cell/lv2/sys_semaphore.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_semaphore.cpp @@ -9,7 +9,7 @@ namespace vm { using namespace ps3; } -logs::channel sys_semaphore("sys_semaphore", logs::level::notice); +logs::channel sys_semaphore("sys_semaphore"); extern u64 get_system_time(); diff --git a/rpcs3/Emu/Cell/lv2/sys_spu.cpp b/rpcs3/Emu/Cell/lv2/sys_spu.cpp index d431c16a4a..081e41b4e2 100644 --- a/rpcs3/Emu/Cell/lv2/sys_spu.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_spu.cpp @@ -16,7 +16,7 @@ namespace vm { using namespace ps3; } -logs::channel sys_spu("sys_spu", logs::level::notice); +logs::channel sys_spu("sys_spu"); void sys_spu_image::load(const fs::file& stream) { diff --git a/rpcs3/Emu/Cell/lv2/sys_ss.cpp b/rpcs3/Emu/Cell/lv2/sys_ss.cpp index a41513c5e1..0077bb3413 100644 --- a/rpcs3/Emu/Cell/lv2/sys_ss.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_ss.cpp @@ -5,7 +5,7 @@ namespace vm { using namespace ps3; } -logs::channel sys_ss("sys_ss", logs::level::notice); +logs::channel sys_ss("sys_ss"); s32 sys_ss_get_console_id(vm::ps3::ptr buf) { diff --git a/rpcs3/Emu/Cell/lv2/sys_time.cpp b/rpcs3/Emu/Cell/lv2/sys_time.cpp index 77d987b01c..6843505e66 100644 --- a/rpcs3/Emu/Cell/lv2/sys_time.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_time.cpp @@ -105,7 +105,7 @@ static int clock_gettime(int clk_id, struct timespec* tp) namespace vm { using namespace ps3; } -logs::channel sys_time("sys_time", logs::level::notice); +logs::channel sys_time("sys_time"); static const u64 g_timebase_freq = /*79800000*/ 80000000; // 80 Mhz diff --git a/rpcs3/Emu/Cell/lv2/sys_timer.cpp b/rpcs3/Emu/Cell/lv2/sys_timer.cpp index 64602334ef..3ec9cf5cd5 100644 --- a/rpcs3/Emu/Cell/lv2/sys_timer.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_timer.cpp @@ -13,7 +13,7 @@ namespace vm { using namespace ps3; } -logs::channel sys_timer("sys_timer", logs::level::notice); +logs::channel sys_timer("sys_timer"); extern u64 get_system_time(); diff --git a/rpcs3/Emu/Cell/lv2/sys_trace.cpp b/rpcs3/Emu/Cell/lv2/sys_trace.cpp index f02b3cd922..6a43d9b093 100644 --- a/rpcs3/Emu/Cell/lv2/sys_trace.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_trace.cpp @@ -7,7 +7,7 @@ namespace vm { using namespace ps3; } -logs::channel sys_trace("sys_trace", logs::level::notice); +logs::channel sys_trace("sys_trace"); s32 sys_trace_create() { diff --git a/rpcs3/Emu/Cell/lv2/sys_tty.cpp b/rpcs3/Emu/Cell/lv2/sys_tty.cpp index 18e122959b..e112c32664 100644 --- a/rpcs3/Emu/Cell/lv2/sys_tty.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_tty.cpp @@ -3,7 +3,7 @@ namespace vm { using namespace ps3; } -logs::channel sys_tty("sys_tty", logs::level::notice); +logs::channel sys_tty("sys_tty"); extern fs::file g_tty; diff --git a/rpcs3/Emu/Cell/lv2/sys_vm.cpp b/rpcs3/Emu/Cell/lv2/sys_vm.cpp index 150478dfec..624428f9f3 100644 --- a/rpcs3/Emu/Cell/lv2/sys_vm.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_vm.cpp @@ -4,7 +4,7 @@ namespace vm { using namespace ps3; } -logs::channel sys_vm("sys_vm", logs::level::notice); +logs::channel sys_vm("sys_vm"); error_code sys_vm_memory_map(u32 vsize, u32 psize, u32 cid, u64 flag, u64 policy, vm::ptr addr) { diff --git a/rpcs3/Emu/PSP2/ARMv7Module.cpp b/rpcs3/Emu/PSP2/ARMv7Module.cpp index 1d45610725..6c328d7a16 100644 --- a/rpcs3/Emu/PSP2/ARMv7Module.cpp +++ b/rpcs3/Emu/PSP2/ARMv7Module.cpp @@ -11,67 +11,6 @@ #include "ARMv7Module.h" #include "Modules/sceLibKernel.h" -LOG_CHANNEL(sceAppMgr); -LOG_CHANNEL(sceAppUtil); -LOG_CHANNEL(sceAudio); -LOG_CHANNEL(sceAudiodec); -LOG_CHANNEL(sceAudioenc); -LOG_CHANNEL(sceAudioIn); -LOG_CHANNEL(sceCamera); -LOG_CHANNEL(sceCodecEngine); -LOG_CHANNEL(sceCommonDialog); -LOG_CHANNEL(sceCtrl); -LOG_CHANNEL(sceDbg); -LOG_CHANNEL(sceDeci4p); -LOG_CHANNEL(sceDeflt); -LOG_CHANNEL(sceDisplay); -LOG_CHANNEL(sceFiber); -LOG_CHANNEL(sceFios); -LOG_CHANNEL(sceFpu); -LOG_CHANNEL(sceGxm); -LOG_CHANNEL(sceHttp); -LOG_CHANNEL(sceIme); -LOG_CHANNEL(sceJpeg); -LOG_CHANNEL(sceJpegEnc); -LOG_CHANNEL(sceLibc); -LOG_CHANNEL(sceLibKernel); -LOG_CHANNEL(sceLibm); -LOG_CHANNEL(sceLibstdcxx); -LOG_CHANNEL(sceLibXml); -LOG_CHANNEL(sceLiveArea); -LOG_CHANNEL(sceLocation); -LOG_CHANNEL(sceMd5); -LOG_CHANNEL(sceMotion); -LOG_CHANNEL(sceMt19937); -LOG_CHANNEL(sceNet); -LOG_CHANNEL(sceNetCtl); -LOG_CHANNEL(sceNgs); -LOG_CHANNEL(sceNpBasic); -LOG_CHANNEL(sceNpCommon); -LOG_CHANNEL(sceNpManager); -LOG_CHANNEL(sceNpMatching); -LOG_CHANNEL(sceNpScore); -LOG_CHANNEL(sceNpUtility); -LOG_CHANNEL(scePerf); -LOG_CHANNEL(scePgf); -LOG_CHANNEL(scePhotoExport); -LOG_CHANNEL(sceRazorCapture); -LOG_CHANNEL(sceRtc); -LOG_CHANNEL(sceSas); -LOG_CHANNEL(sceScreenShot); -LOG_CHANNEL(sceSfmt); -LOG_CHANNEL(sceSha); -LOG_CHANNEL(sceSqlite); -LOG_CHANNEL(sceSsl); -LOG_CHANNEL(sceSulpha); -LOG_CHANNEL(sceSysmodule); -LOG_CHANNEL(sceSystemGesture); -LOG_CHANNEL(sceTouch); -LOG_CHANNEL(sceUlt); -LOG_CHANNEL(sceVideodec); -LOG_CHANNEL(sceVoice); -LOG_CHANNEL(sceVoiceQoS); - extern std::string arm_get_function_name(const std::string& module, u32 fnid); extern std::string arm_get_variable_name(const std::string& module, u32 vnid); diff --git a/rpcs3/Emu/PSP2/Modules/sceAppMgr.cpp b/rpcs3/Emu/PSP2/Modules/sceAppMgr.cpp index 34711d773a..bc0e577d5b 100644 --- a/rpcs3/Emu/PSP2/Modules/sceAppMgr.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceAppMgr.cpp @@ -4,7 +4,7 @@ #include "sceAppMgr.h" -logs::channel sceAppMgr("sceAppMgr", logs::level::notice); +logs::channel sceAppMgr("sceAppMgr"); s32 sceAppMgrReceiveEventNum(vm::ptr eventNum) { diff --git a/rpcs3/Emu/PSP2/Modules/sceAppUtil.cpp b/rpcs3/Emu/PSP2/Modules/sceAppUtil.cpp index 2d2314b1e7..6a6971d54b 100644 --- a/rpcs3/Emu/PSP2/Modules/sceAppUtil.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceAppUtil.cpp @@ -4,7 +4,7 @@ #include "sceAppUtil.h" -logs::channel sceAppUtil("sceAppUtil", logs::level::notice); +logs::channel sceAppUtil("sceAppUtil"); s32 sceAppUtilInit(vm::cptr initParam, vm::ptr bootParam) { diff --git a/rpcs3/Emu/PSP2/Modules/sceAudio.cpp b/rpcs3/Emu/PSP2/Modules/sceAudio.cpp index 815607bf86..b9411b29e5 100644 --- a/rpcs3/Emu/PSP2/Modules/sceAudio.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceAudio.cpp @@ -4,7 +4,7 @@ #include "sceAudio.h" -logs::channel sceAudio("sceAudio", logs::level::notice); +logs::channel sceAudio("sceAudio"); s32 sceAudioOutOpenPort(s32 portType, s32 len, s32 freq, s32 param) { diff --git a/rpcs3/Emu/PSP2/Modules/sceAudioIn.cpp b/rpcs3/Emu/PSP2/Modules/sceAudioIn.cpp index e8c5d05285..acfb572d81 100644 --- a/rpcs3/Emu/PSP2/Modules/sceAudioIn.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceAudioIn.cpp @@ -4,7 +4,7 @@ #include "sceAudioIn.h" -logs::channel sceAudioIn("sceAudioIn", logs::level::notice); +logs::channel sceAudioIn("sceAudioIn"); s32 sceAudioInOpenPort(s32 portType, s32 grain, s32 freq, s32 param) { diff --git a/rpcs3/Emu/PSP2/Modules/sceAudiodec.cpp b/rpcs3/Emu/PSP2/Modules/sceAudiodec.cpp index 803d0277bc..13ee8f0bcf 100644 --- a/rpcs3/Emu/PSP2/Modules/sceAudiodec.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceAudiodec.cpp @@ -4,7 +4,7 @@ #include "sceAudiodec.h" -logs::channel sceAudiodec("sceAudiodec", logs::level::notice); +logs::channel sceAudiodec("sceAudiodec"); s32 sceAudiodecInitLibrary(u32 codecType, vm::ptr pInitParam) { diff --git a/rpcs3/Emu/PSP2/Modules/sceAudioenc.cpp b/rpcs3/Emu/PSP2/Modules/sceAudioenc.cpp index 202e01513d..049b2b0dd4 100644 --- a/rpcs3/Emu/PSP2/Modules/sceAudioenc.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceAudioenc.cpp @@ -4,7 +4,7 @@ #include "sceAudioenc.h" -logs::channel sceAudioenc("sceAudioenc", logs::level::notice); +logs::channel sceAudioenc("sceAudioenc"); s32 sceAudioencInitLibrary(u32 codecType, vm::ptr pInitParam) { diff --git a/rpcs3/Emu/PSP2/Modules/sceCamera.cpp b/rpcs3/Emu/PSP2/Modules/sceCamera.cpp index 4b1b068b2d..cb4027553a 100644 --- a/rpcs3/Emu/PSP2/Modules/sceCamera.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceCamera.cpp @@ -4,7 +4,7 @@ #include "sceCamera.h" -logs::channel sceCamera("sceCamera", logs::level::notice); +logs::channel sceCamera("sceCamera"); s32 sceCameraOpen(s32 devnum, vm::ptr pInfo) { diff --git a/rpcs3/Emu/PSP2/Modules/sceCodecEngine.cpp b/rpcs3/Emu/PSP2/Modules/sceCodecEngine.cpp index f104719357..2c5d432404 100644 --- a/rpcs3/Emu/PSP2/Modules/sceCodecEngine.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceCodecEngine.cpp @@ -4,7 +4,7 @@ #include "sceCodecEngine.h" -logs::channel sceCodecEngine("sceCodecEngine", logs::level::notice); +logs::channel sceCodecEngine("sceCodecEngine"); s32 sceCodecEnginePmonStart() { diff --git a/rpcs3/Emu/PSP2/Modules/sceCommonDialog.cpp b/rpcs3/Emu/PSP2/Modules/sceCommonDialog.cpp index 2b978eeaa1..e324c615cc 100644 --- a/rpcs3/Emu/PSP2/Modules/sceCommonDialog.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceCommonDialog.cpp @@ -4,7 +4,7 @@ #include "sceCommonDialog.h" -logs::channel sceCommonDialog("sceCommonDialog", logs::level::notice); +logs::channel sceCommonDialog("sceCommonDialog"); s32 sceCommonDialogUpdate(vm::cptr updateParam) { diff --git a/rpcs3/Emu/PSP2/Modules/sceCtrl.cpp b/rpcs3/Emu/PSP2/Modules/sceCtrl.cpp index 94a7f01477..a8b5cdfaea 100644 --- a/rpcs3/Emu/PSP2/Modules/sceCtrl.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceCtrl.cpp @@ -4,7 +4,7 @@ #include "sceCtrl.h" -logs::channel sceCtrl("sceCtrl", logs::level::notice); +logs::channel sceCtrl("sceCtrl"); s32 sceCtrlSetSamplingMode(u32 uiMode) { diff --git a/rpcs3/Emu/PSP2/Modules/sceDbg.cpp b/rpcs3/Emu/PSP2/Modules/sceDbg.cpp index 0e3ebf4e7e..b22ca2d112 100644 --- a/rpcs3/Emu/PSP2/Modules/sceDbg.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceDbg.cpp @@ -4,7 +4,7 @@ #include "sceDbg.h" -logs::channel sceDbg("sceDbg", logs::level::notice); +logs::channel sceDbg("sceDbg"); s32 sceDbgSetMinimumLogLevel(s32 minimumLogLevel) { diff --git a/rpcs3/Emu/PSP2/Modules/sceDeci4p.cpp b/rpcs3/Emu/PSP2/Modules/sceDeci4p.cpp index 7d0b7e94b4..39f61f1d0f 100644 --- a/rpcs3/Emu/PSP2/Modules/sceDeci4p.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceDeci4p.cpp @@ -4,7 +4,7 @@ #include "sceDeci4p.h" -logs::channel sceDeci4p("sceDeci4p", logs::level::notice); +logs::channel sceDeci4p("sceDeci4p"); s32 sceKernelDeci4pOpen(vm::cptr protoname, u32 protonum, u32 bufsize) { diff --git a/rpcs3/Emu/PSP2/Modules/sceDeflt.cpp b/rpcs3/Emu/PSP2/Modules/sceDeflt.cpp index 6aeae3c6f2..4d20ddd039 100644 --- a/rpcs3/Emu/PSP2/Modules/sceDeflt.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceDeflt.cpp @@ -4,7 +4,7 @@ #include "sceDeflt.h" -logs::channel sceDeflt("sceDeflt", logs::level::notice); +logs::channel sceDeflt("sceDeflt"); s32 sceGzipIsValid(vm::cptr pSrcGzip) { diff --git a/rpcs3/Emu/PSP2/Modules/sceDisplay.cpp b/rpcs3/Emu/PSP2/Modules/sceDisplay.cpp index 555aa3681b..f6e89e3b3e 100644 --- a/rpcs3/Emu/PSP2/Modules/sceDisplay.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceDisplay.cpp @@ -4,7 +4,7 @@ #include "sceDisplay.h" -logs::channel sceDisplay("sceDisplay", logs::level::notice); +logs::channel sceDisplay("sceDisplay"); s32 sceDisplayGetRefreshRate(vm::ptr pFps) { diff --git a/rpcs3/Emu/PSP2/Modules/sceFiber.cpp b/rpcs3/Emu/PSP2/Modules/sceFiber.cpp index 4beaaeddce..56f1739052 100644 --- a/rpcs3/Emu/PSP2/Modules/sceFiber.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceFiber.cpp @@ -4,7 +4,7 @@ #include "sceFiber.h" -logs::channel sceFiber("sceFiber", logs::level::notice); +logs::channel sceFiber("sceFiber"); s32 _sceFiberInitializeImpl(vm::ptr fiber, vm::cptr name, vm::ptr entry, u32 argOnInitialize, vm::ptr addrContext, u32 sizeContext, vm::cptr optParam, u32 buildVersion) { diff --git a/rpcs3/Emu/PSP2/Modules/sceFios.cpp b/rpcs3/Emu/PSP2/Modules/sceFios.cpp index eb68c8c459..fead4326e9 100644 --- a/rpcs3/Emu/PSP2/Modules/sceFios.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceFios.cpp @@ -4,7 +4,7 @@ #include "sceFios.h" -logs::channel sceFios("sceFios", logs::level::notice); +logs::channel sceFios("sceFios"); s32 sceFiosInitialize(vm::cptr pParameters) { diff --git a/rpcs3/Emu/PSP2/Modules/sceFpu.cpp b/rpcs3/Emu/PSP2/Modules/sceFpu.cpp index edf5e19ac7..761989b94c 100644 --- a/rpcs3/Emu/PSP2/Modules/sceFpu.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceFpu.cpp @@ -4,7 +4,7 @@ #include "sceFpu.h" -logs::channel sceFpu("sceFpu", logs::level::notice); +logs::channel sceFpu("sceFpu"); float sceFpuSinf(float x) { diff --git a/rpcs3/Emu/PSP2/Modules/sceGxm.cpp b/rpcs3/Emu/PSP2/Modules/sceGxm.cpp index 60a04ced03..b8d84fae4e 100644 --- a/rpcs3/Emu/PSP2/Modules/sceGxm.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceGxm.cpp @@ -4,7 +4,7 @@ #include "sceGxm.h" -logs::channel sceGxm("sceGxm", logs::level::notice); +logs::channel sceGxm("sceGxm"); s32 sceGxmInitialize(vm::cptr params) { diff --git a/rpcs3/Emu/PSP2/Modules/sceHttp.cpp b/rpcs3/Emu/PSP2/Modules/sceHttp.cpp index 402605e3a8..27c1e237fd 100644 --- a/rpcs3/Emu/PSP2/Modules/sceHttp.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceHttp.cpp @@ -4,7 +4,7 @@ #include "sceHttp.h" -logs::channel sceHttp("sceHttp", logs::level::notice); +logs::channel sceHttp("sceHttp"); s32 sceHttpInit(u32 poolSize) { diff --git a/rpcs3/Emu/PSP2/Modules/sceIme.cpp b/rpcs3/Emu/PSP2/Modules/sceIme.cpp index fb9552f3b9..bb842cfb90 100644 --- a/rpcs3/Emu/PSP2/Modules/sceIme.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceIme.cpp @@ -4,7 +4,7 @@ #include "sceIme.h" -logs::channel sceIme("sceIme", logs::level::notice); +logs::channel sceIme("sceIme"); s32 sceImeOpen(vm::ptr param) { diff --git a/rpcs3/Emu/PSP2/Modules/sceJpeg.cpp b/rpcs3/Emu/PSP2/Modules/sceJpeg.cpp index 481220dbcd..8b9d209ff3 100644 --- a/rpcs3/Emu/PSP2/Modules/sceJpeg.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceJpeg.cpp @@ -4,7 +4,7 @@ #include "sceJpeg.h" -logs::channel sceJpeg("sceJpeg", logs::level::notice); +logs::channel sceJpeg("sceJpeg"); s32 sceJpegInitMJpeg(s32 maxSplitDecoder) { diff --git a/rpcs3/Emu/PSP2/Modules/sceJpegEnc.cpp b/rpcs3/Emu/PSP2/Modules/sceJpegEnc.cpp index 59c188b807..c412efaac2 100644 --- a/rpcs3/Emu/PSP2/Modules/sceJpegEnc.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceJpegEnc.cpp @@ -4,7 +4,7 @@ #include "sceJpegEnc.h" -logs::channel sceJpegEnc("sceJpegEnc", logs::level::notice); +logs::channel sceJpegEnc("sceJpegEnc"); s32 sceJpegEncoderGetContextSize() { diff --git a/rpcs3/Emu/PSP2/Modules/sceLibKernel.cpp b/rpcs3/Emu/PSP2/Modules/sceLibKernel.cpp index 54596f7014..11a898da3b 100644 --- a/rpcs3/Emu/PSP2/Modules/sceLibKernel.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceLibKernel.cpp @@ -11,7 +11,7 @@ #include -logs::channel sceLibKernel("sceLibKernel", logs::level::notice); +logs::channel sceLibKernel("sceLibKernel"); extern u64 get_system_time(); diff --git a/rpcs3/Emu/PSP2/Modules/sceLibXml.cpp b/rpcs3/Emu/PSP2/Modules/sceLibXml.cpp index 18d1686c47..531b5786ed 100644 --- a/rpcs3/Emu/PSP2/Modules/sceLibXml.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceLibXml.cpp @@ -4,7 +4,7 @@ #include "sceLibXml.h" -logs::channel sceLibXml("sceLibXml", logs::level::notice); +logs::channel sceLibXml("sceLibXml"); #define REG_FUNC(nid, name) REG_FNID(SceLibXml, nid, name) diff --git a/rpcs3/Emu/PSP2/Modules/sceLibc.cpp b/rpcs3/Emu/PSP2/Modules/sceLibc.cpp index 8bfd007b38..fc1e4d3ef5 100644 --- a/rpcs3/Emu/PSP2/Modules/sceLibc.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceLibc.cpp @@ -8,7 +8,7 @@ #include -logs::channel sceLibc("sceLibc", logs::level::notice); +logs::channel sceLibc("sceLibc"); extern fs::file g_tty; diff --git a/rpcs3/Emu/PSP2/Modules/sceLibm.cpp b/rpcs3/Emu/PSP2/Modules/sceLibm.cpp index c56118c908..5308b279da 100644 --- a/rpcs3/Emu/PSP2/Modules/sceLibm.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceLibm.cpp @@ -4,7 +4,7 @@ #include "sceLibm.h" -logs::channel sceLibm("sceLibm", logs::level::notice); +logs::channel sceLibm("sceLibm"); namespace sce_libm_func { diff --git a/rpcs3/Emu/PSP2/Modules/sceLibstdcxx.cpp b/rpcs3/Emu/PSP2/Modules/sceLibstdcxx.cpp index fdafb8cfb8..d86cfc3888 100644 --- a/rpcs3/Emu/PSP2/Modules/sceLibstdcxx.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceLibstdcxx.cpp @@ -4,7 +4,7 @@ #include "sceLibstdcxx.h" -logs::channel sceLibstdcxx("sceLibstdcxx", logs::level::notice); +logs::channel sceLibstdcxx("sceLibstdcxx"); namespace sce_libstdcxx_func { diff --git a/rpcs3/Emu/PSP2/Modules/sceLiveArea.cpp b/rpcs3/Emu/PSP2/Modules/sceLiveArea.cpp index 5b12bc8b5c..95b62b6fbe 100644 --- a/rpcs3/Emu/PSP2/Modules/sceLiveArea.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceLiveArea.cpp @@ -4,7 +4,7 @@ #include "sceLiveArea.h" -logs::channel sceLiveArea("sceLiveArea", logs::level::notice); +logs::channel sceLiveArea("sceLiveArea"); s32 sceLiveAreaResourceReplaceAll(vm::cptr dirpath) { diff --git a/rpcs3/Emu/PSP2/Modules/sceLocation.cpp b/rpcs3/Emu/PSP2/Modules/sceLocation.cpp index 63a95360b8..5011703fa4 100644 --- a/rpcs3/Emu/PSP2/Modules/sceLocation.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceLocation.cpp @@ -4,7 +4,7 @@ #include "sceLocation.h" -logs::channel sceLocation("sceLocation", logs::level::notice); +logs::channel sceLocation("sceLocation"); s32 sceLocationOpen(vm::ptr handle, SceLocationLocationMethod lmethod, SceLocationHeadingMethod hmethod) { diff --git a/rpcs3/Emu/PSP2/Modules/sceMd5.cpp b/rpcs3/Emu/PSP2/Modules/sceMd5.cpp index f4d013ef91..b5f43cac4e 100644 --- a/rpcs3/Emu/PSP2/Modules/sceMd5.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceMd5.cpp @@ -4,7 +4,7 @@ #include "sceMd5.h" -logs::channel sceMd5("sceMd5", logs::level::notice); +logs::channel sceMd5("sceMd5"); s32 sceMd5Digest(vm::cptr plain, u32 len, vm::ptr digest) { diff --git a/rpcs3/Emu/PSP2/Modules/sceMotion.cpp b/rpcs3/Emu/PSP2/Modules/sceMotion.cpp index c2edf5e1d7..7278b0c52b 100644 --- a/rpcs3/Emu/PSP2/Modules/sceMotion.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceMotion.cpp @@ -4,7 +4,7 @@ #include "sceMotion.h" -logs::channel sceMotion("sceMotion", logs::level::notice); +logs::channel sceMotion("sceMotion"); s32 sceMotionGetState(vm::ptr motionState) { diff --git a/rpcs3/Emu/PSP2/Modules/sceMt19937.cpp b/rpcs3/Emu/PSP2/Modules/sceMt19937.cpp index 4c66c3f27e..db85ab2b99 100644 --- a/rpcs3/Emu/PSP2/Modules/sceMt19937.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceMt19937.cpp @@ -4,7 +4,7 @@ #include "sceMt19937.h" -logs::channel sceMt19937("sceMt19937", logs::level::notice); +logs::channel sceMt19937("sceMt19937"); s32 sceMt19937Init(vm::ptr pCtx, u32 seed) { diff --git a/rpcs3/Emu/PSP2/Modules/sceNet.cpp b/rpcs3/Emu/PSP2/Modules/sceNet.cpp index a687e895aa..ae758557f6 100644 --- a/rpcs3/Emu/PSP2/Modules/sceNet.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceNet.cpp @@ -4,7 +4,7 @@ #include "sceNet.h" -logs::channel sceNet("sceNet", logs::level::notice); +logs::channel sceNet("sceNet"); s32 sceNetSetDnsInfo(vm::ptr info, s32 flags) { diff --git a/rpcs3/Emu/PSP2/Modules/sceNetCtl.cpp b/rpcs3/Emu/PSP2/Modules/sceNetCtl.cpp index 70f9ba9e94..2d921cf76a 100644 --- a/rpcs3/Emu/PSP2/Modules/sceNetCtl.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceNetCtl.cpp @@ -4,7 +4,7 @@ #include "sceNetCtl.h" -logs::channel sceNetCtl("sceNetCtl", logs::level::notice); +logs::channel sceNetCtl("sceNetCtl"); s32 sceNetCtlInit() { diff --git a/rpcs3/Emu/PSP2/Modules/sceNgs.cpp b/rpcs3/Emu/PSP2/Modules/sceNgs.cpp index b9d65cd487..faaee502f6 100644 --- a/rpcs3/Emu/PSP2/Modules/sceNgs.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceNgs.cpp @@ -4,7 +4,7 @@ #include "sceNgs.h" -logs::channel sceNgs("sceNgs", logs::level::notice); +logs::channel sceNgs("sceNgs"); s32 sceNgsSystemGetRequiredMemorySize(vm::cptr pSynthParams, vm::ptr pnSize) { diff --git a/rpcs3/Emu/PSP2/Modules/sceNpBasic.cpp b/rpcs3/Emu/PSP2/Modules/sceNpBasic.cpp index 5503ea8528..5b4507756c 100644 --- a/rpcs3/Emu/PSP2/Modules/sceNpBasic.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceNpBasic.cpp @@ -4,7 +4,7 @@ #include "sceNpBasic.h" -logs::channel sceNpBasic("sceNpBasic", logs::level::notice); +logs::channel sceNpBasic("sceNpBasic"); s32 sceNpBasicInit(vm::ptr opt) { diff --git a/rpcs3/Emu/PSP2/Modules/sceNpCommon.cpp b/rpcs3/Emu/PSP2/Modules/sceNpCommon.cpp index d88d225302..bc7c7270cf 100644 --- a/rpcs3/Emu/PSP2/Modules/sceNpCommon.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceNpCommon.cpp @@ -4,7 +4,7 @@ #include "sceNpCommon.h" -logs::channel sceNpCommon("sceNpCommon", logs::level::notice); +logs::channel sceNpCommon("sceNpCommon"); s32 sceNpAuthInit() { diff --git a/rpcs3/Emu/PSP2/Modules/sceNpManager.cpp b/rpcs3/Emu/PSP2/Modules/sceNpManager.cpp index 17b54348ab..c4ce3ad0ab 100644 --- a/rpcs3/Emu/PSP2/Modules/sceNpManager.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceNpManager.cpp @@ -4,7 +4,7 @@ #include "sceNpManager.h" -logs::channel sceNpManager("sceNpManager", logs::level::notice); +logs::channel sceNpManager("sceNpManager"); s32 sceNpInit(vm::cptr commConf, vm::ptr opt) { diff --git a/rpcs3/Emu/PSP2/Modules/sceNpMatching.cpp b/rpcs3/Emu/PSP2/Modules/sceNpMatching.cpp index bc92ecf1f4..05a3a9c1ff 100644 --- a/rpcs3/Emu/PSP2/Modules/sceNpMatching.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceNpMatching.cpp @@ -4,7 +4,7 @@ #include "sceNpMatching.h" -logs::channel sceNpMatching("sceNpMatching", logs::level::notice); +logs::channel sceNpMatching("sceNpMatching"); // Functions diff --git a/rpcs3/Emu/PSP2/Modules/sceNpScore.cpp b/rpcs3/Emu/PSP2/Modules/sceNpScore.cpp index 1f8df62522..4b144bc178 100644 --- a/rpcs3/Emu/PSP2/Modules/sceNpScore.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceNpScore.cpp @@ -4,7 +4,7 @@ #include "sceNpScore.h" -logs::channel sceNpScore("sceNpScore", logs::level::notice); +logs::channel sceNpScore("sceNpScore"); s32 sceNpScoreInit(s32 threadPriority, s32 cpuAffinityMask, vm::ptr option) { diff --git a/rpcs3/Emu/PSP2/Modules/sceNpUtility.cpp b/rpcs3/Emu/PSP2/Modules/sceNpUtility.cpp index 3d70517ba7..fd95b3b903 100644 --- a/rpcs3/Emu/PSP2/Modules/sceNpUtility.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceNpUtility.cpp @@ -4,7 +4,7 @@ #include "sceNpUtility.h" -logs::channel sceNpUtility("sceNpUtility", logs::level::notice); +logs::channel sceNpUtility("sceNpUtility"); s32 sceNpLookupInit(s32 usesAsync, s32 threadPriority, s32 cpuAffinityMask, vm::ptr option) { diff --git a/rpcs3/Emu/PSP2/Modules/scePerf.cpp b/rpcs3/Emu/PSP2/Modules/scePerf.cpp index abef505937..cdd8332613 100644 --- a/rpcs3/Emu/PSP2/Modules/scePerf.cpp +++ b/rpcs3/Emu/PSP2/Modules/scePerf.cpp @@ -4,7 +4,7 @@ #include "scePerf.h" -logs::channel scePerf("scePerf", logs::level::notice); +logs::channel scePerf("scePerf"); extern u64 get_system_time(); diff --git a/rpcs3/Emu/PSP2/Modules/scePgf.cpp b/rpcs3/Emu/PSP2/Modules/scePgf.cpp index 87418324a9..94d5d51b3c 100644 --- a/rpcs3/Emu/PSP2/Modules/scePgf.cpp +++ b/rpcs3/Emu/PSP2/Modules/scePgf.cpp @@ -4,7 +4,7 @@ #include "scePgf.h" -logs::channel scePgf("scePgf", logs::level::notice); +logs::channel scePgf("scePgf"); #define REG_FUNC(nid, name) REG_FNID(ScePgf, nid, name) diff --git a/rpcs3/Emu/PSP2/Modules/scePhotoExport.cpp b/rpcs3/Emu/PSP2/Modules/scePhotoExport.cpp index 791efd9710..34ea89c4b0 100644 --- a/rpcs3/Emu/PSP2/Modules/scePhotoExport.cpp +++ b/rpcs3/Emu/PSP2/Modules/scePhotoExport.cpp @@ -4,7 +4,7 @@ #include "scePhotoExport.h" -logs::channel scePhotoExport("scePhotoExport", logs::level::notice); +logs::channel scePhotoExport("scePhotoExport"); s32 scePhotoExportFromData( vm::cptr photodata, diff --git a/rpcs3/Emu/PSP2/Modules/sceRazorCapture.cpp b/rpcs3/Emu/PSP2/Modules/sceRazorCapture.cpp index c71abdd4fb..9d75d4278c 100644 --- a/rpcs3/Emu/PSP2/Modules/sceRazorCapture.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceRazorCapture.cpp @@ -4,7 +4,7 @@ #include "sceRazorCapture.h" -logs::channel sceRazorCapture("sceRazorCapture", logs::level::notice); +logs::channel sceRazorCapture("sceRazorCapture"); void sceRazorCaptureSetTrigger(u32 frameIndex, vm::cptr captureFilename) { diff --git a/rpcs3/Emu/PSP2/Modules/sceRtc.cpp b/rpcs3/Emu/PSP2/Modules/sceRtc.cpp index fdaae8526e..2e6cbfa82c 100644 --- a/rpcs3/Emu/PSP2/Modules/sceRtc.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceRtc.cpp @@ -4,7 +4,7 @@ #include "sceRtc.h" -logs::channel sceRtc("sceRtc", logs::level::notice); +logs::channel sceRtc("sceRtc"); u32 sceRtcGetTickResolution() { diff --git a/rpcs3/Emu/PSP2/Modules/sceSas.cpp b/rpcs3/Emu/PSP2/Modules/sceSas.cpp index 0fc7196e17..3af6d84e84 100644 --- a/rpcs3/Emu/PSP2/Modules/sceSas.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceSas.cpp @@ -4,7 +4,7 @@ #include "sceSas.h" -logs::channel sceSas("sceSas", logs::level::notice); +logs::channel sceSas("sceSas"); s32 sceSasGetNeededMemorySize(vm::cptr config, vm::ptr outSize) { diff --git a/rpcs3/Emu/PSP2/Modules/sceScreenShot.cpp b/rpcs3/Emu/PSP2/Modules/sceScreenShot.cpp index 2cd944e56d..f0e8230c09 100644 --- a/rpcs3/Emu/PSP2/Modules/sceScreenShot.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceScreenShot.cpp @@ -4,7 +4,7 @@ #include "sceScreenShot.h" -logs::channel sceScreenShot("sceScreenShot", logs::level::notice); +logs::channel sceScreenShot("sceScreenShot"); s32 sceScreenShotSetParam(vm::cptr param) { diff --git a/rpcs3/Emu/PSP2/Modules/sceSfmt.cpp b/rpcs3/Emu/PSP2/Modules/sceSfmt.cpp index ca0912b311..e242072248 100644 --- a/rpcs3/Emu/PSP2/Modules/sceSfmt.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceSfmt.cpp @@ -2,7 +2,7 @@ #include "Emu/System.h" #include "Emu/PSP2/ARMv7Module.h" -logs::channel sceSfmt("sceSfmt", logs::level::notice); +logs::channel sceSfmt("sceSfmt"); #define REG_FUNC(nid, name) REG_FNID(SceSfmt, nid, name) diff --git a/rpcs3/Emu/PSP2/Modules/sceSha.cpp b/rpcs3/Emu/PSP2/Modules/sceSha.cpp index 0cf3a6c1e0..7250f902f9 100644 --- a/rpcs3/Emu/PSP2/Modules/sceSha.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceSha.cpp @@ -2,7 +2,7 @@ #include "Emu/System.h" #include "Emu/PSP2/ARMv7Module.h" -logs::channel sceSha("sceSha", logs::level::notice); +logs::channel sceSha("sceSha"); #define REG_FUNC(nid, name) REG_FNID(SceSha, nid, name) diff --git a/rpcs3/Emu/PSP2/Modules/sceSqlite.cpp b/rpcs3/Emu/PSP2/Modules/sceSqlite.cpp index d73740a75f..90e5a6c0ac 100644 --- a/rpcs3/Emu/PSP2/Modules/sceSqlite.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceSqlite.cpp @@ -4,7 +4,7 @@ #include "sceSqlite.h" -logs::channel sceSqlite("sceSqlite", logs::level::notice); +logs::channel sceSqlite("sceSqlite"); #define REG_FUNC(nid, name) REG_FNID(SceSqlite, nid, name) diff --git a/rpcs3/Emu/PSP2/Modules/sceSsl.cpp b/rpcs3/Emu/PSP2/Modules/sceSsl.cpp index cd48fdbab2..7cdf868148 100644 --- a/rpcs3/Emu/PSP2/Modules/sceSsl.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceSsl.cpp @@ -4,7 +4,7 @@ #include "sceSsl.h" -logs::channel sceSsl("sceSsl", logs::level::notice); +logs::channel sceSsl("sceSsl"); s32 sceSslInit(u32 poolSize) { diff --git a/rpcs3/Emu/PSP2/Modules/sceSulpha.cpp b/rpcs3/Emu/PSP2/Modules/sceSulpha.cpp index 88d7981462..9ac4be8bcd 100644 --- a/rpcs3/Emu/PSP2/Modules/sceSulpha.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceSulpha.cpp @@ -4,7 +4,7 @@ #include "sceSulpha.h" -logs::channel sceSulpha("sceSulpha", logs::level::notice); +logs::channel sceSulpha("sceSulpha"); s32 sceSulphaNetworkInit() { diff --git a/rpcs3/Emu/PSP2/Modules/sceSysmodule.cpp b/rpcs3/Emu/PSP2/Modules/sceSysmodule.cpp index 71dbe9870f..5d50269e80 100644 --- a/rpcs3/Emu/PSP2/Modules/sceSysmodule.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceSysmodule.cpp @@ -4,7 +4,7 @@ #include "sceSysmodule.h" -logs::channel sceSysmodule("sceSysmodule", logs::level::notice); +logs::channel sceSysmodule("sceSysmodule"); s32 sceSysmoduleLoadModule(u16 id) { diff --git a/rpcs3/Emu/PSP2/Modules/sceSystemGesture.cpp b/rpcs3/Emu/PSP2/Modules/sceSystemGesture.cpp index 6e373b0bf0..211690634f 100644 --- a/rpcs3/Emu/PSP2/Modules/sceSystemGesture.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceSystemGesture.cpp @@ -4,7 +4,7 @@ #include "sceSystemGesture.h" -logs::channel sceSystemGesture("sceSystemGesture", logs::level::notice); +logs::channel sceSystemGesture("sceSystemGesture"); s32 sceSystemGestureInitializePrimitiveTouchRecognizer(vm::ptr parameter) { diff --git a/rpcs3/Emu/PSP2/Modules/sceTouch.cpp b/rpcs3/Emu/PSP2/Modules/sceTouch.cpp index 3f8925c2f5..19b9633d0d 100644 --- a/rpcs3/Emu/PSP2/Modules/sceTouch.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceTouch.cpp @@ -4,7 +4,7 @@ #include "sceTouch.h" -logs::channel sceTouch("sceTouch", logs::level::notice); +logs::channel sceTouch("sceTouch"); s32 sceTouchGetPanelInfo(u32 port, vm::ptr pPanelInfo) { diff --git a/rpcs3/Emu/PSP2/Modules/sceUlt.cpp b/rpcs3/Emu/PSP2/Modules/sceUlt.cpp index 625825ae9f..b34228efd1 100644 --- a/rpcs3/Emu/PSP2/Modules/sceUlt.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceUlt.cpp @@ -4,7 +4,7 @@ #include "sceUlt.h" -logs::channel sceUlt("sceUlt", logs::level::notice); +logs::channel sceUlt("sceUlt"); // Functions diff --git a/rpcs3/Emu/PSP2/Modules/sceVideodec.cpp b/rpcs3/Emu/PSP2/Modules/sceVideodec.cpp index d75ba323b9..42ed244845 100644 --- a/rpcs3/Emu/PSP2/Modules/sceVideodec.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceVideodec.cpp @@ -4,7 +4,7 @@ #include "sceVideodec.h" -logs::channel sceVideodec("sceVideodec", logs::level::notice); +logs::channel sceVideodec("sceVideodec"); s32 sceVideodecInitLibrary(u32 codecType, vm::cptr pInitInfo) { diff --git a/rpcs3/Emu/PSP2/Modules/sceVoice.cpp b/rpcs3/Emu/PSP2/Modules/sceVoice.cpp index 578b896f46..1036233bd1 100644 --- a/rpcs3/Emu/PSP2/Modules/sceVoice.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceVoice.cpp @@ -4,7 +4,7 @@ #include "sceVoice.h" -logs::channel sceVoice("sceVoice", logs::level::notice); +logs::channel sceVoice("sceVoice"); s32 sceVoiceInit(vm::ptr pArg, SceVoiceVersion version) { diff --git a/rpcs3/Emu/PSP2/Modules/sceVoiceQoS.cpp b/rpcs3/Emu/PSP2/Modules/sceVoiceQoS.cpp index 751b5569e4..6647c47f9f 100644 --- a/rpcs3/Emu/PSP2/Modules/sceVoiceQoS.cpp +++ b/rpcs3/Emu/PSP2/Modules/sceVoiceQoS.cpp @@ -4,7 +4,7 @@ #include "sceVoiceQoS.h" -logs::channel sceVoiceQoS("sceVoiceQoS", logs::level::notice); +logs::channel sceVoiceQoS("sceVoiceQoS"); s32 sceVoiceQoSInit() { diff --git a/rpcs3/Gui/ConLogFrame.cpp b/rpcs3/Gui/ConLogFrame.cpp index 0ba46b436e..df702f8871 100644 --- a/rpcs3/Gui/ConLogFrame.cpp +++ b/rpcs3/Gui/ConLogFrame.cpp @@ -60,7 +60,7 @@ struct gui_listener : logs::listener _new->msg += "} "; } - if (msg.ch->name) + if ('\0' != *msg.ch->name) { _new->msg += msg.ch->name; _new->msg += msg.sev == logs::level::todo ? " TODO: " : ": "; diff --git a/rpcs3/Loader/PSF.cpp b/rpcs3/Loader/PSF.cpp index a6f8325898..0a2097f239 100644 --- a/rpcs3/Loader/PSF.cpp +++ b/rpcs3/Loader/PSF.cpp @@ -19,7 +19,7 @@ void fmt_class_string::format(std::string& out, u64 arg) namespace psf { - logs::channel log("PSF", logs::level::notice); + logs::channel log("PSF"); struct header_t { diff --git a/rpcs3/sys_gamepad.cpp b/rpcs3/sys_gamepad.cpp index c77186b578..70b3661029 100644 --- a/rpcs3/sys_gamepad.cpp +++ b/rpcs3/sys_gamepad.cpp @@ -9,7 +9,7 @@ namespace vm { using namespace ps3; } -logs::channel sys_gamepad("sys_gamepad", logs::level::notice); +logs::channel sys_gamepad("sys_gamepad"); u32 sys_gamepad_ycon_initalize(vm::ps3::ptr in, vm::ps3::ptr out) {