diff options
| author | 2018-10-29 22:48:59 -0400 | |
|---|---|---|
| committer | 2018-10-29 22:48:59 -0400 | |
| commit | 938e45eb8304231b3b84193074f3d24bdc0928e3 (patch) | |
| tree | 8e1938f6954fa00012a2060c31c07cf1eef47e6d /src/core/hle/kernel/kernel.cpp | |
| parent | Merge pull request #1580 from FernandoS27/mm-impl (diff) | |
| parent | core: Make System references const where applicable (diff) | |
| download | yuzu-938e45eb8304231b3b84193074f3d24bdc0928e3.tar.gz yuzu-938e45eb8304231b3b84193074f3d24bdc0928e3.tar.xz yuzu-938e45eb8304231b3b84193074f3d24bdc0928e3.zip | |
Merge pull request #1611 from lioncash/const
core: Add missing const variants of getters for the System class
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 4 |
1 files changed, 2 insertions, 2 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) { |