aboutsummaryrefslogtreecommitdiff
path: root/src/core/hle/service/hid/controllers/xpad.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-02-12 19:26:37 -0500
committerGitHub <noreply@github.com>2019-02-12 19:26:37 -0500
commit8135f4bfcef268c2d29a636f1c0b9f38ab8a25e4 (patch)
tree83c843cf14d53a45ed5aad3d60b00cecb9e6d20e /src/core/hle/service/hid/controllers/xpad.cpp
parentc440ecfafe5204b22ec00d2ba8e0cd39464c6a1a (diff)
parent48d9d66dc585477d26b4cfbf1c4f71fd637b42ea (diff)
Merge pull request #2110 from lioncash/namespace
core_timing: Rename CoreTiming namespace to Core::Timing
Diffstat (limited to 'src/core/hle/service/hid/controllers/xpad.cpp')
-rw-r--r--src/core/hle/service/hid/controllers/xpad.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/service/hid/controllers/xpad.cpp b/src/core/hle/service/hid/controllers/xpad.cpp
index cd397c70b..eff03d14e 100644
--- a/src/core/hle/service/hid/controllers/xpad.cpp
+++ b/src/core/hle/service/hid/controllers/xpad.cpp
@@ -19,7 +19,7 @@ void Controller_XPad::OnRelease() {}
void Controller_XPad::OnUpdate(u8* data, std::size_t size) {
for (auto& xpad_entry : shared_memory.shared_memory_entries) {
- xpad_entry.header.timestamp = CoreTiming::GetTicks();
+ xpad_entry.header.timestamp = Core::Timing::GetTicks();
xpad_entry.header.total_entry_count = 17;
if (!IsControllerActivated()) {