summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorGravatar Zach Hilman2019-06-05 15:52:37 -0400
committerGravatar GitHub2019-06-05 15:52:37 -0400
commit81e09bb1213720c31b7881c9396385375dac5749 (patch)
tree06ea501a4f516ac82f1ac91f953d4325475940bc /src/core/hle/kernel
parentMerge pull request #2541 from lioncash/input (diff)
parentcore/core_timing_util: Amend casing of cyclesTo* functions (diff)
downloadyuzu-81e09bb1213720c31b7881c9396385375dac5749.tar.gz
yuzu-81e09bb1213720c31b7881c9396385375dac5749.tar.xz
yuzu-81e09bb1213720c31b7881c9396385375dac5749.zip
Merge pull request #2545 from lioncash/timing
core/core_timing_util: Use std::chrono types for specifying time units
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/thread.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 2abf9efca..c73a40977 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -75,9 +75,9 @@ void Thread::WakeAfterDelay(s64 nanoseconds) {
75 75
76 // This function might be called from any thread so we have to be cautious and use the 76 // This function might be called from any thread so we have to be cautious and use the
77 // thread-safe version of ScheduleEvent. 77 // thread-safe version of ScheduleEvent.
78 const s64 cycles = Core::Timing::nsToCycles(std::chrono::nanoseconds{nanoseconds});
78 Core::System::GetInstance().CoreTiming().ScheduleEventThreadsafe( 79 Core::System::GetInstance().CoreTiming().ScheduleEventThreadsafe(
79 Core::Timing::nsToCycles(nanoseconds), kernel.ThreadWakeupCallbackEventType(), 80 cycles, kernel.ThreadWakeupCallbackEventType(), callback_handle);
80 callback_handle);
81} 81}
82 82
83void Thread::CancelWakeupTimer() { 83void Thread::CancelWakeupTimer() {