summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/hid/hid.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2015-03-16 17:16:59 +0100
committerLioncash <mathew1800@gmail.com>2015-03-16 17:18:37 +0100
commit8cf81643a96875d29f3c5b1054c16fe163836697 (patch)
tree2ea2d84aac8e0226f8cc089c5752178473ba4030 /src/core/hle/service/hid/hid.cpp
parentMerge pull request #657 from Subv/flip (diff)
downloadyuzu-8cf81643a96875d29f3c5b1054c16fe163836697.tar
yuzu-8cf81643a96875d29f3c5b1054c16fe163836697.tar.gz
yuzu-8cf81643a96875d29f3c5b1054c16fe163836697.tar.bz2
yuzu-8cf81643a96875d29f3c5b1054c16fe163836697.tar.lz
yuzu-8cf81643a96875d29f3c5b1054c16fe163836697.tar.xz
yuzu-8cf81643a96875d29f3c5b1054c16fe163836697.tar.zst
yuzu-8cf81643a96875d29f3c5b1054c16fe163836697.zip
Diffstat (limited to 'src/core/hle/service/hid/hid.cpp')
-rw-r--r--src/core/hle/service/hid/hid.cpp6
1 files changed, 3 insertions, 3 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