summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-04-30 09:24:27 +0200
committerLioncash <mathew1800@gmail.com>2018-04-30 09:32:59 +0200
commit0197e28cc95e96e651eab555f512d0bb292e9215 (patch)
treeed7367dd74a937809d9501b2d848e8e981b538ba /src/core/hle/kernel
parentMerge pull request #424 from lioncash/string (diff)
downloadyuzu-0197e28cc95e96e651eab555f512d0bb292e9215.tar
yuzu-0197e28cc95e96e651eab555f512d0bb292e9215.tar.gz
yuzu-0197e28cc95e96e651eab555f512d0bb292e9215.tar.bz2
yuzu-0197e28cc95e96e651eab555f512d0bb292e9215.tar.lz
yuzu-0197e28cc95e96e651eab555f512d0bb292e9215.tar.xz
yuzu-0197e28cc95e96e651eab555f512d0bb292e9215.tar.zst
yuzu-0197e28cc95e96e651eab555f512d0bb292e9215.zip
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/thread.cpp3
-rw-r--r--src/core/hle/kernel/timer.cpp5
2 files changed, 5 insertions, 3 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 63790ea00..1bd5d9ebf 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -146,7 +146,8 @@ void Thread::WakeAfterDelay(s64 nanoseconds) {
if (nanoseconds == -1)
return;
- CoreTiming::ScheduleEvent(nsToCycles(nanoseconds), ThreadWakeupEventType, callback_handle);
+ CoreTiming::ScheduleEvent(CoreTiming::nsToCycles(nanoseconds), ThreadWakeupEventType,
+ callback_handle);
}
void Thread::CancelWakeupTimer() {
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp
index ad58bf043..661356a97 100644
--- a/src/core/hle/kernel/timer.cpp
+++ b/src/core/hle/kernel/timer.cpp
@@ -57,7 +57,8 @@ void Timer::Set(s64 initial, s64 interval) {
// Immediately invoke the callback
Signal(0);
} else {
- CoreTiming::ScheduleEvent(nsToCycles(initial), timer_callback_event_type, callback_handle);
+ CoreTiming::ScheduleEvent(CoreTiming::nsToCycles(initial), timer_callback_event_type,
+ callback_handle);
}
}
@@ -86,7 +87,7 @@ void Timer::Signal(int cycles_late) {
if (interval_delay != 0) {
// Reschedule the timer with the interval delay
- CoreTiming::ScheduleEvent(nsToCycles(interval_delay) - cycles_late,
+ CoreTiming::ScheduleEvent(CoreTiming::nsToCycles(interval_delay) - cycles_late,
timer_callback_event_type, callback_handle);
}
}