diff options
author | Lioncash <mathew1800@gmail.com> | 2018-04-30 09:24:27 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-04-30 09:32:59 +0200 |
commit | 0197e28cc95e96e651eab555f512d0bb292e9215 (patch) | |
tree | ed7367dd74a937809d9501b2d848e8e981b538ba /src/core/hle/kernel/timer.cpp | |
parent | Merge pull request #424 from lioncash/string (diff) | |
download | yuzu-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 '')
-rw-r--r-- | src/core/hle/kernel/timer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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); } } |