From b80c348b096623b8cef368d923b13d763f67954d Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 12 Feb 2020 01:00:39 -0500 Subject: kernel/thread: Remove trivial usages of the global system accessor We can just use the kernel member variable directly instead of going through the system to obtain the same thing. --- src/core/hle/kernel/thread.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core') diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index e965b5b04..ad464e03b 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -474,7 +474,7 @@ void Thread::AdjustSchedulingOnPriority(u32 old_priority) { if (GetSchedulingStatus() != ThreadSchedStatus::Runnable) { return; } - auto& scheduler = Core::System::GetInstance().GlobalScheduler(); + auto& scheduler = kernel.GlobalScheduler(); if (processor_id >= 0) { scheduler.Unschedule(old_priority, static_cast(processor_id), this); } @@ -506,7 +506,7 @@ void Thread::AdjustSchedulingOnPriority(u32 old_priority) { } void Thread::AdjustSchedulingOnAffinity(u64 old_affinity_mask, s32 old_core) { - auto& scheduler = Core::System::GetInstance().GlobalScheduler(); + auto& scheduler = kernel.GlobalScheduler(); if (GetSchedulingStatus() != ThreadSchedStatus::Runnable || current_priority >= THREADPRIO_COUNT) { return; -- cgit v1.2.3 From eefd97e80d0563fdc16f038c0194900d74279c0c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 12 Feb 2020 01:14:45 -0500 Subject: bcat/backend: Prevent fmt exception in debug log within NullBackend::Clear() A formatting specifier within Clear wasn't being used, which will cause fmt to throw an exception. This fixes that. --- src/core/hle/service/bcat/backend/backend.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core') diff --git a/src/core/hle/service/bcat/backend/backend.cpp b/src/core/hle/service/bcat/backend/backend.cpp index 6f5ea095a..826c89970 100644 --- a/src/core/hle/service/bcat/backend/backend.cpp +++ b/src/core/hle/service/bcat/backend/backend.cpp @@ -117,7 +117,7 @@ bool NullBackend::SynchronizeDirectory(TitleIDVersion title, std::string name, } bool NullBackend::Clear(u64 title_id) { - LOG_DEBUG(Service_BCAT, "called, title_id={:016X}"); + LOG_DEBUG(Service_BCAT, "called, title_id={:016X}", title_id); return true; } -- cgit v1.2.3 From f00a54f5081b7486e0a2f0bee8d15e3e41e186a0 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 12 Feb 2020 01:18:26 -0500 Subject: bcat/backend: Make formatting of passphrase consistent in NullBackend::SetPassphrase() Aligns the '=' to be consistent with the rest of the logs within this source file. --- src/core/hle/service/bcat/backend/backend.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core') diff --git a/src/core/hle/service/bcat/backend/backend.cpp b/src/core/hle/service/bcat/backend/backend.cpp index 826c89970..def3410cc 100644 --- a/src/core/hle/service/bcat/backend/backend.cpp +++ b/src/core/hle/service/bcat/backend/backend.cpp @@ -123,7 +123,7 @@ bool NullBackend::Clear(u64 title_id) { } void NullBackend::SetPassphrase(u64 title_id, const Passphrase& passphrase) { - LOG_DEBUG(Service_BCAT, "called, title_id={:016X}, passphrase = {}", title_id, + LOG_DEBUG(Service_BCAT, "called, title_id={:016X}, passphrase={}", title_id, Common::HexToString(passphrase)); } -- cgit v1.2.3