From 1776448df2a023f6735b69e27b72664e02f448ee Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 7 Mar 2023 20:48:46 -0500 Subject: kernel: add timer pointer to KThreadQueue --- src/core/hle/kernel/k_thread.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/core/hle/kernel/k_thread.cpp') diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cpp index 8c403f5fd..96b90ffef 100644 --- a/src/core/hle/kernel/k_thread.cpp +++ b/src/core/hle/kernel/k_thread.cpp @@ -1268,9 +1268,10 @@ Result KThread::Sleep(s64 timeout) { ASSERT(timeout > 0); ThreadQueueImplForKThreadSleep wait_queue_(kernel); + KHardwareTimer* timer{}; { // Setup the scheduling lock and sleep. - KScopedSchedulerLockAndSleep slp(kernel, this, timeout); + KScopedSchedulerLockAndSleep slp(kernel, std::addressof(timer), this, timeout); // Check if the thread should terminate. if (this->IsTerminationRequested()) { @@ -1279,6 +1280,7 @@ Result KThread::Sleep(s64 timeout) { } // Wait for the sleep to end. + wait_queue_.SetHardwareTimer(timer); this->BeginWait(std::addressof(wait_queue_)); SetWaitReasonForDebugging(ThreadWaitReasonForDebugging::Sleep); } -- cgit v1.2.3