diff options
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 4b6b32dd5..1fd4ba5d2 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -32,7 +32,7 @@ namespace Kernel { | |||
| 32 | */ | 32 | */ |
| 33 | static void ThreadWakeupCallback(u64 thread_handle, [[maybe_unused]] int cycles_late) { | 33 | static void ThreadWakeupCallback(u64 thread_handle, [[maybe_unused]] int cycles_late) { |
| 34 | const auto proper_handle = static_cast<Handle>(thread_handle); | 34 | const auto proper_handle = static_cast<Handle>(thread_handle); |
| 35 | auto& system = Core::System::GetInstance(); | 35 | const auto& system = Core::System::GetInstance(); |
| 36 | 36 | ||
| 37 | // Lock the global kernel mutex when we enter the kernel HLE. | 37 | // Lock the global kernel mutex when we enter the kernel HLE. |
| 38 | std::lock_guard<std::recursive_mutex> lock(HLE::g_hle_lock); | 38 | std::lock_guard<std::recursive_mutex> lock(HLE::g_hle_lock); |
| @@ -90,7 +90,7 @@ static void ThreadWakeupCallback(u64 thread_handle, [[maybe_unused]] int cycles_ | |||
| 90 | /// The timer callback event, called when a timer is fired | 90 | /// The timer callback event, called when a timer is fired |
| 91 | static void TimerCallback(u64 timer_handle, int cycles_late) { | 91 | static void TimerCallback(u64 timer_handle, int cycles_late) { |
| 92 | const auto proper_handle = static_cast<Handle>(timer_handle); | 92 | const auto proper_handle = static_cast<Handle>(timer_handle); |
| 93 | auto& system = Core::System::GetInstance(); | 93 | const auto& system = Core::System::GetInstance(); |
| 94 | SharedPtr<Timer> timer = system.Kernel().RetrieveTimerFromCallbackHandleTable(proper_handle); | 94 | SharedPtr<Timer> timer = system.Kernel().RetrieveTimerFromCallbackHandleTable(proper_handle); |
| 95 | 95 | ||
| 96 | if (timer == nullptr) { | 96 | if (timer == nullptr) { |
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 4e490e2b5..c7c579aaf 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp | |||
| @@ -572,7 +572,7 @@ static ResultCode GetInfo(u64* result, u64 info_id, u64 handle, u64 info_sub_id) | |||
| 572 | return ERR_INVALID_HANDLE; | 572 | return ERR_INVALID_HANDLE; |
| 573 | } | 573 | } |
| 574 | 574 | ||
| 575 | auto& system = Core::System::GetInstance(); | 575 | const auto& system = Core::System::GetInstance(); |
| 576 | const auto& scheduler = system.CurrentScheduler(); | 576 | const auto& scheduler = system.CurrentScheduler(); |
| 577 | const auto* const current_thread = scheduler.GetCurrentThread(); | 577 | const auto* const current_thread = scheduler.GetCurrentThread(); |
| 578 | const bool same_thread = current_thread == thread; | 578 | const bool same_thread = current_thread == thread; |