summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/hid/hid.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-07-28 04:29:22 +0200
committerGitHub <noreply@github.com>2020-07-28 04:29:22 +0200
commit05781ce8c4dd4d4150185effac56ef9a71ae2705 (patch)
tree12d41a29b43577b95b158bc033aadc3957bde3d7 /src/core/hle/service/hid/hid.cpp
parentMerge pull request #4420 from lat9nq/fix-themed-label-bg (diff)
parentcore_timing: Make use of uintptr_t to represent user_data (diff)
downloadyuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.tar
yuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.tar.gz
yuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.tar.bz2
yuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.tar.lz
yuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.tar.xz
yuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.tar.zst
yuzu-05781ce8c4dd4d4150185effac56ef9a71ae2705.zip
Diffstat (limited to 'src/core/hle/service/hid/hid.cpp')
-rw-r--r--src/core/hle/service/hid/hid.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp
index 680290cbd..1e95b7580 100644
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -77,8 +77,9 @@ IAppletResource::IAppletResource(Core::System& system)
// Register update callbacks
pad_update_event = Core::Timing::CreateEvent(
- "HID::UpdatePadCallback", [this](u64 userdata, std::chrono::nanoseconds ns_late) {
- UpdateControllers(userdata, ns_late);
+ "HID::UpdatePadCallback",
+ [this](std::uintptr_t user_data, std::chrono::nanoseconds ns_late) {
+ UpdateControllers(user_data, ns_late);
});
// TODO(shinyquagsire23): Other update callbacks? (accel, gyro?)
@@ -108,7 +109,8 @@ void IAppletResource::GetSharedMemoryHandle(Kernel::HLERequestContext& ctx) {
rb.PushCopyObjects(shared_mem);
}
-void IAppletResource::UpdateControllers(u64 userdata, std::chrono::nanoseconds ns_late) {
+void IAppletResource::UpdateControllers(std::uintptr_t user_data,
+ std::chrono::nanoseconds ns_late) {
auto& core_timing = system.CoreTiming();
const bool should_reload = Settings::values.is_device_reload_pending.exchange(false);