diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-04-30 03:24:27 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-04-30 03:32:59 -0400 |
| commit | 0197e28cc95e96e651eab555f512d0bb292e9215 (patch) | |
| tree | ed7367dd74a937809d9501b2d848e8e981b538ba /src/core/hle/kernel/timer.cpp | |
| parent | 81a0082f6bd4f2db9b09e56cce96351bb5084e46 (diff) | |
core_timing: Namespace all functions and constants in core_timing's header
All of these variables and functions are related to timings and should be within the namespace.
Diffstat (limited to 'src/core/hle/kernel/timer.cpp')
| -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 ad58bf043b..661356a976 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); } } |