diff options
author | Narr the Reg <juangerman-13@hotmail.com> | 2024-01-01 20:56:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-01 20:56:31 +0100 |
commit | aa9ff2ffc2d9c3c1b7d6f4f6a7170acda7e17e9c (patch) | |
tree | 3f7ca8e93b7bc523b8dd357ec43d302fd794b37c /src/core/hle/service/hid/hidbus.cpp | |
parent | Merge pull request #12466 from liamwhite/sh2 (diff) | |
parent | core_timing: block advance thread while clearing and signal after (diff) | |
download | yuzu-aa9ff2ffc2d9c3c1b7d6f4f6a7170acda7e17e9c.tar yuzu-aa9ff2ffc2d9c3c1b7d6f4f6a7170acda7e17e9c.tar.gz yuzu-aa9ff2ffc2d9c3c1b7d6f4f6a7170acda7e17e9c.tar.bz2 yuzu-aa9ff2ffc2d9c3c1b7d6f4f6a7170acda7e17e9c.tar.lz yuzu-aa9ff2ffc2d9c3c1b7d6f4f6a7170acda7e17e9c.tar.xz yuzu-aa9ff2ffc2d9c3c1b7d6f4f6a7170acda7e17e9c.tar.zst yuzu-aa9ff2ffc2d9c3c1b7d6f4f6a7170acda7e17e9c.zip |
Diffstat (limited to 'src/core/hle/service/hid/hidbus.cpp')
-rw-r--r-- | src/core/hle/service/hid/hidbus.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/service/hid/hidbus.cpp b/src/core/hle/service/hid/hidbus.cpp index d12f9beb0..ffa7e144d 100644 --- a/src/core/hle/service/hid/hidbus.cpp +++ b/src/core/hle/service/hid/hidbus.cpp @@ -49,10 +49,10 @@ HidBus::HidBus(Core::System& system_) // Register update callbacks hidbus_update_event = Core::Timing::CreateEvent( "Hidbus::UpdateCallback", - [this](std::uintptr_t user_data, s64 time, + [this](s64 time, std::chrono::nanoseconds ns_late) -> std::optional<std::chrono::nanoseconds> { const auto guard = LockService(); - UpdateHidbus(user_data, ns_late); + UpdateHidbus(ns_late); return std::nullopt; }); @@ -61,10 +61,10 @@ HidBus::HidBus(Core::System& system_) } HidBus::~HidBus() { - system.CoreTiming().UnscheduleEvent(hidbus_update_event, 0); + system.CoreTiming().UnscheduleEvent(hidbus_update_event); } -void HidBus::UpdateHidbus(std::uintptr_t user_data, std::chrono::nanoseconds ns_late) { +void HidBus::UpdateHidbus(std::chrono::nanoseconds ns_late) { if (is_hidbus_enabled) { for (std::size_t i = 0; i < devices.size(); ++i) { if (!devices[i].is_device_initializated) { |