diff options
author | Lioncash <mathew1800@gmail.com> | 2020-07-28 01:00:41 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2020-07-28 03:21:01 +0200 |
commit | a7af349daee85237384dba07533c9a407cf15592 (patch) | |
tree | e337a6e823960cc6b2a7d05c7e33e80cc51a4581 /src/core/hle/service/hid/hid.cpp | |
parent | Merge pull request #4419 from lioncash/initializer (diff) | |
download | yuzu-a7af349daee85237384dba07533c9a407cf15592.tar yuzu-a7af349daee85237384dba07533c9a407cf15592.tar.gz yuzu-a7af349daee85237384dba07533c9a407cf15592.tar.bz2 yuzu-a7af349daee85237384dba07533c9a407cf15592.tar.lz yuzu-a7af349daee85237384dba07533c9a407cf15592.tar.xz yuzu-a7af349daee85237384dba07533c9a407cf15592.tar.zst yuzu-a7af349daee85237384dba07533c9a407cf15592.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/hid/hid.cpp | 8 |
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); |