diff options
| author | bunnei <bunneidev@gmail.com> | 2015-03-16 14:25:15 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-03-16 14:25:15 -0400 |
| commit | e4e2c929af8953fd9946d2556b112b80c9b0ffb5 (patch) | |
| tree | 2ea2d84aac8e0226f8cc089c5752178473ba4030 /src/core/hle/svc.cpp | |
| parent | 3e5aeb9a7abb74fb5492f8f93265c03f45c1757a (diff) | |
| parent | 8cf81643a96875d29f3c5b1054c16fe163836697 (diff) | |
Merge pull request #663 from lioncash/ticks
arm_interface: Get rid of GetTicks.
Diffstat (limited to 'src/core/hle/svc.cpp')
| -rw-r--r-- | src/core/hle/svc.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index 17385f9b2..bbb4eb9cd 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp @@ -7,8 +7,9 @@ #include "common/string_util.h" #include "common/symbols.h" -#include "core/arm/arm_interface.h" +#include "core/core_timing.h" #include "core/mem_map.h" +#include "core/arm/arm_interface.h" #include "core/hle/kernel/address_arbiter.h" #include "core/hle/kernel/event.h" @@ -551,7 +552,7 @@ static void SleepThread(s64 nanoseconds) { /// This returns the total CPU ticks elapsed since the CPU was powered-on static s64 GetSystemTick() { - return (s64)Core::g_app_core->GetTicks(); + return (s64)CoreTiming::GetTicks(); } /// Creates a memory block at the specified address with the specified permissions and size |