diff options
author | Narr the Reg <juangerman-13@hotmail.com> | 2022-04-19 22:30:32 +0200 |
---|---|---|
committer | Narr the Reg <juangerman-13@hotmail.com> | 2022-04-23 22:41:42 +0200 |
commit | 61582efeb976b0852e73b734835d60c73b38f3cf (patch) | |
tree | b5ac72746de0533cd292ad5cb962d0e663326b0e /src/core/hle/service/hid/controllers/mouse.h | |
parent | Merge pull request #8249 from german77/queued (diff) | |
download | yuzu-61582efeb976b0852e73b734835d60c73b38f3cf.tar yuzu-61582efeb976b0852e73b734835d60c73b38f3cf.tar.gz yuzu-61582efeb976b0852e73b734835d60c73b38f3cf.tar.bz2 yuzu-61582efeb976b0852e73b734835d60c73b38f3cf.tar.lz yuzu-61582efeb976b0852e73b734835d60c73b38f3cf.tar.xz yuzu-61582efeb976b0852e73b734835d60c73b38f3cf.tar.zst yuzu-61582efeb976b0852e73b734835d60c73b38f3cf.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/hid/controllers/mouse.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/core/hle/service/hid/controllers/mouse.h b/src/core/hle/service/hid/controllers/mouse.h index 62acdfb77..a9395c44b 100644 --- a/src/core/hle/service/hid/controllers/mouse.h +++ b/src/core/hle/service/hid/controllers/mouse.h @@ -16,7 +16,7 @@ struct AnalogStickState; namespace Service::HID { class Controller_Mouse final : public ControllerBase { public: - explicit Controller_Mouse(Core::HID::HIDCore& hid_core_); + explicit Controller_Mouse(Core::HID::HIDCore& hid_core_, u8* raw_shared_memory_); ~Controller_Mouse() override; // Called when the controller is initialized @@ -26,15 +26,20 @@ public: void OnRelease() override; // When the controller is requesting an update for the shared memory - void OnUpdate(const Core::Timing::CoreTiming& core_timing, u8* data, std::size_t size) override; + void OnUpdate(const Core::Timing::CoreTiming& core_timing) override; private: - // This is nn::hid::detail::MouseLifo - Lifo<Core::HID::MouseState, hid_entry_count> mouse_lifo{}; - static_assert(sizeof(mouse_lifo) == 0x350, "mouse_lifo is an invalid size"); + struct MouseSharedMemory { + // This is nn::hid::detail::MouseLifo + Lifo<Core::HID::MouseState, hid_entry_count> mouse_lifo{}; + static_assert(sizeof(mouse_lifo) == 0x350, "mouse_lifo is an invalid size"); + INSERT_PADDING_WORDS(0x2C); + }; + static_assert(sizeof(MouseSharedMemory) == 0x400, "MouseSharedMemory is an invalid size"); + + MouseSharedMemory* shared_memory; Core::HID::MouseState next_state{}; - - Core::HID::AnalogStickState last_mouse_wheel_state; + Core::HID::AnalogStickState last_mouse_wheel_state{}; Core::HID::EmulatedDevices* emulated_devices; }; } // namespace Service::HID |