diff options
author | bunnei <bunneidev@gmail.com> | 2020-07-28 04:29:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-28 04:29:22 +0200 |
commit | 05781ce8c4dd4d4150185effac56ef9a71ae2705 (patch) | |
tree | 12d41a29b43577b95b158bc033aadc3957bde3d7 /src/core/hle/service | |
parent | Merge pull request #4420 from lat9nq/fix-themed-label-bg (diff) | |
parent | core_timing: Make use of uintptr_t to represent user_data (diff) | |
download | yuzu-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')
-rw-r--r-- | src/core/hle/service/hid/hid.cpp | 8 | ||||
-rw-r--r-- | src/core/hle/service/hid/hid.h | 2 | ||||
-rw-r--r-- | src/core/hle/service/nvflinger/nvflinger.cpp | 2 |
3 files changed, 7 insertions, 5 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); diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h index c6f0a2584..efb07547f 100644 --- a/src/core/hle/service/hid/hid.h +++ b/src/core/hle/service/hid/hid.h @@ -64,7 +64,7 @@ private: } void GetSharedMemoryHandle(Kernel::HLERequestContext& ctx); - void UpdateControllers(u64 userdata, std::chrono::nanoseconds ns_late); + void UpdateControllers(std::uintptr_t user_data, std::chrono::nanoseconds ns_late); std::shared_ptr<Kernel::SharedMemory> shared_mem; diff --git a/src/core/hle/service/nvflinger/nvflinger.cpp b/src/core/hle/service/nvflinger/nvflinger.cpp index e561bf654..f644a460d 100644 --- a/src/core/hle/service/nvflinger/nvflinger.cpp +++ b/src/core/hle/service/nvflinger/nvflinger.cpp @@ -67,7 +67,7 @@ NVFlinger::NVFlinger(Core::System& system) : system(system) { // Schedule the screen composition events composition_event = Core::Timing::CreateEvent( - "ScreenComposition", [this](u64, std::chrono::nanoseconds ns_late) { + "ScreenComposition", [this](std::uintptr_t, std::chrono::nanoseconds ns_late) { const auto guard = Lock(); Compose(); |