summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorBrian Clinkenbeard <brianclinkenbeard@users.noreply.github.com>2020-02-13 01:07:07 +0100
committerBrian Clinkenbeard <brianclinkenbeard@users.noreply.github.com>2020-02-13 01:07:07 +0100
commit0d85b6bfe17541ea64d51ebe755a4c6120687005 (patch)
tree7042d6646778f08f13b8cd4cdb950769f322ae71 /src/core
parentuse config mode for finding SDL2 with CMake (diff)
parentMerge pull request #3403 from lioncash/debug (diff)
downloadyuzu-0d85b6bfe17541ea64d51ebe755a4c6120687005.tar
yuzu-0d85b6bfe17541ea64d51ebe755a4c6120687005.tar.gz
yuzu-0d85b6bfe17541ea64d51ebe755a4c6120687005.tar.bz2
yuzu-0d85b6bfe17541ea64d51ebe755a4c6120687005.tar.lz
yuzu-0d85b6bfe17541ea64d51ebe755a4c6120687005.tar.xz
yuzu-0d85b6bfe17541ea64d51ebe755a4c6120687005.tar.zst
yuzu-0d85b6bfe17541ea64d51ebe755a4c6120687005.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/kernel/thread.cpp4
-rw-r--r--src/core/hle/service/bcat/backend/backend.cpp4
2 files changed, 4 insertions, 4 deletions
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<u32>(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;
diff --git a/src/core/hle/service/bcat/backend/backend.cpp b/src/core/hle/service/bcat/backend/backend.cpp
index 6f5ea095a..def3410cc 100644
--- a/src/core/hle/service/bcat/backend/backend.cpp
+++ b/src/core/hle/service/bcat/backend/backend.cpp
@@ -117,13 +117,13 @@ 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;
}
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));
}