Merge pull request #663 from lioncash/ticks

arm_interface: Get rid of GetTicks.

2 files changed, 6 insertions, 5 deletions

diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp
index e7f9bec7e..8adb03f2e 100644
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -7,7 +7,7 @@
 #include "core/hle/service/hid/hid_spvr.h"
 #include "core/hle/service/hid/hid_user.h"
 
-#include "core/arm/arm_interface.h"
+#include "core/core_timing.h"
 #include "core/hle/kernel/event.h"
 #include "core/hle/kernel/shared_memory.h"
 #include "core/hle/hle.h"
@@ -82,7 +82,7 @@ void HIDUpdate() {
     // If we just updated index 0, provide a new timestamp
     if (mem->pad.index == 0) {
         mem->pad.index_reset_ticks_previous = mem->pad.index_reset_ticks;
-        mem->pad.index_reset_ticks = (s64)Core::g_app_core->GetTicks();
+        mem->pad.index_reset_ticks = (s64)CoreTiming::GetTicks();
     }
 
     mem->touch.index = next_touch_index;
@@ -102,7 +102,7 @@ void HIDUpdate() {
     // If we just updated index 0, provide a new timestamp
     if (mem->touch.index == 0) {
         mem->touch.index_reset_ticks_previous = mem->touch.index_reset_ticks;
-        mem->touch.index_reset_ticks = (s64)Core::g_app_core->GetTicks();
+        mem->touch.index_reset_ticks = (s64)CoreTiming::GetTicks();
     }
     
     // Signal both handles when there's an update to Pad or touch
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