diff options
| -rw-r--r-- | src/core/hle/kernel/scheduler.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/kernel/scheduler.cpp b/src/core/hle/kernel/scheduler.cpp index dabeb05d6..e6dcb9639 100644 --- a/src/core/hle/kernel/scheduler.cpp +++ b/src/core/hle/kernel/scheduler.cpp | |||
| @@ -414,7 +414,7 @@ u64 Scheduler::GetLastContextSwitchTicks() const { | |||
| 414 | } | 414 | } |
| 415 | 415 | ||
| 416 | void Scheduler::TryDoContextSwitch() { | 416 | void Scheduler::TryDoContextSwitch() { |
| 417 | if (is_context_switch_pending ) { | 417 | if (is_context_switch_pending) { |
| 418 | SwitchContext(); | 418 | SwitchContext(); |
| 419 | } | 419 | } |
| 420 | } | 420 | } |
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 0c11da1e0..3408658e5 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp | |||
| @@ -42,7 +42,7 @@ Thread::~Thread() = default; | |||
| 42 | void Thread::Stop() { | 42 | void Thread::Stop() { |
| 43 | // Cancel any outstanding wakeup events for this thread | 43 | // Cancel any outstanding wakeup events for this thread |
| 44 | Core::System::GetInstance().CoreTiming().UnscheduleEvent(kernel.ThreadWakeupCallbackEventType(), | 44 | Core::System::GetInstance().CoreTiming().UnscheduleEvent(kernel.ThreadWakeupCallbackEventType(), |
| 45 | callback_handle); | 45 | callback_handle); |
| 46 | kernel.ThreadWakeupCallbackHandleTable().Close(callback_handle); | 46 | kernel.ThreadWakeupCallbackHandleTable().Close(callback_handle); |
| 47 | callback_handle = 0; | 47 | callback_handle = 0; |
| 48 | SetStatus(ThreadStatus::Dead); | 48 | SetStatus(ThreadStatus::Dead); |
| @@ -68,13 +68,13 @@ void Thread::WakeAfterDelay(s64 nanoseconds) { | |||
| 68 | // This function might be called from any thread so we have to be cautious and use the | 68 | // This function might be called from any thread so we have to be cautious and use the |
| 69 | // thread-safe version of ScheduleEvent. | 69 | // thread-safe version of ScheduleEvent. |
| 70 | const s64 cycles = Core::Timing::nsToCycles(std::chrono::nanoseconds{nanoseconds}); | 70 | const s64 cycles = Core::Timing::nsToCycles(std::chrono::nanoseconds{nanoseconds}); |
| 71 | Core::System::GetInstance().CoreTiming().ScheduleEvent(cycles, kernel.ThreadWakeupCallbackEventType(), | 71 | Core::System::GetInstance().CoreTiming().ScheduleEvent( |
| 72 | callback_handle); | 72 | cycles, kernel.ThreadWakeupCallbackEventType(), callback_handle); |
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | void Thread::CancelWakeupTimer() { | 75 | void Thread::CancelWakeupTimer() { |
| 76 | Core::System::GetInstance().CoreTiming().UnscheduleEvent(kernel.ThreadWakeupCallbackEventType(), | 76 | Core::System::GetInstance().CoreTiming().UnscheduleEvent(kernel.ThreadWakeupCallbackEventType(), |
| 77 | callback_handle); | 77 | callback_handle); |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | static std::optional<s32> GetNextProcessorId(u64 mask) { | 80 | static std::optional<s32> GetNextProcessorId(u64 mask) { |