diff options
| author | James Rowe <jroweboy@gmail.com> | 2019-02-16 03:52:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-16 03:52:11 +0100 |
| commit | 99da6362c43a24c608a2790f668f10a62e3b80a6 (patch) | |
| tree | 6257ac07283ebb4ea5ac622784cc7a041d48f8b1 /src/core/hle/service/time | |
| parent | Merge pull request #2112 from lioncash/shadowing (diff) | |
| parent | core_timing: Convert core timing into a class (diff) | |
| download | yuzu-99da6362c43a24c608a2790f668f10a62e3b80a6.tar yuzu-99da6362c43a24c608a2790f668f10a62e3b80a6.tar.gz yuzu-99da6362c43a24c608a2790f668f10a62e3b80a6.tar.bz2 yuzu-99da6362c43a24c608a2790f668f10a62e3b80a6.tar.lz yuzu-99da6362c43a24c608a2790f668f10a62e3b80a6.tar.xz yuzu-99da6362c43a24c608a2790f668f10a62e3b80a6.tar.zst yuzu-99da6362c43a24c608a2790f668f10a62e3b80a6.zip | |
Diffstat (limited to 'src/core/hle/service/time')
| -rw-r--r-- | src/core/hle/service/time/time.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/hle/service/time/time.cpp b/src/core/hle/service/time/time.cpp index efebd1b24..aa115935d 100644 --- a/src/core/hle/service/time/time.cpp +++ b/src/core/hle/service/time/time.cpp @@ -5,6 +5,7 @@ #include <chrono> #include <ctime> #include "common/logging/log.h" +#include "core/core.h" #include "core/core_timing.h" #include "core/core_timing_util.h" #include "core/hle/ipc_helpers.h" @@ -106,8 +107,9 @@ private: void GetCurrentTimePoint(Kernel::HLERequestContext& ctx) { LOG_DEBUG(Service_Time, "called"); + const auto& core_timing = Core::System::GetInstance().CoreTiming(); const SteadyClockTimePoint steady_clock_time_point{ - Core::Timing::cyclesToMs(Core::Timing::GetTicks()) / 1000}; + Core::Timing::cyclesToMs(core_timing.GetTicks()) / 1000}; IPC::ResponseBuilder rb{ctx, (sizeof(SteadyClockTimePoint) / 4) + 2}; rb.Push(RESULT_SUCCESS); rb.PushRaw(steady_clock_time_point); @@ -281,8 +283,9 @@ void Module::Interface::GetClockSnapshot(Kernel::HLERequestContext& ctx) { return; } + const auto& core_timing = Core::System::GetInstance().CoreTiming(); const SteadyClockTimePoint steady_clock_time_point{ - Core::Timing::cyclesToMs(Core::Timing::GetTicks()) / 1000, {}}; + Core::Timing::cyclesToMs(core_timing.GetTicks()) / 1000, {}}; CalendarTime calendar_time{}; calendar_time.year = tm->tm_year + 1900; |