diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2023-12-16 17:46:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-16 17:46:51 +0100 |
commit | b8f83aa4bf13f6783e31f190d530ef7be527bf49 (patch) | |
tree | 952d90666b0d253dce28742197d053d1db213eeb /src/core/hle/service/hid/controllers/mouse.h | |
parent | ssl: fix output byte buffer size issue (#12372) (diff) | |
parent | core: Make sure npad is initialized (diff) | |
download | yuzu-b8f83aa4bf13f6783e31f190d530ef7be527bf49.tar yuzu-b8f83aa4bf13f6783e31f190d530ef7be527bf49.tar.gz yuzu-b8f83aa4bf13f6783e31f190d530ef7be527bf49.tar.bz2 yuzu-b8f83aa4bf13f6783e31f190d530ef7be527bf49.tar.lz yuzu-b8f83aa4bf13f6783e31f190d530ef7be527bf49.tar.xz yuzu-b8f83aa4bf13f6783e31f190d530ef7be527bf49.tar.zst yuzu-b8f83aa4bf13f6783e31f190d530ef7be527bf49.zip |
Diffstat (limited to 'src/core/hle/service/hid/controllers/mouse.h')
-rw-r--r-- | src/core/hle/service/hid/controllers/mouse.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/core/hle/service/hid/controllers/mouse.h b/src/core/hle/service/hid/controllers/mouse.h index a80f3823f..363f316a5 100644 --- a/src/core/hle/service/hid/controllers/mouse.h +++ b/src/core/hle/service/hid/controllers/mouse.h @@ -3,9 +3,7 @@ #pragma once -#include "common/common_types.h" #include "core/hle/service/hid/controllers/controller_base.h" -#include "core/hle/service/hid/ring_lifo.h" namespace Core::HID { class EmulatedDevices; @@ -14,9 +12,11 @@ struct AnalogStickState; } // namespace Core::HID namespace Service::HID { +struct MouseSharedMemoryFormat; + class Mouse final : public ControllerBase { public: - explicit Mouse(Core::HID::HIDCore& hid_core_, u8* raw_shared_memory_); + explicit Mouse(Core::HID::HIDCore& hid_core_, MouseSharedMemoryFormat& mouse_shared_memory); ~Mouse() override; // Called when the controller is initialized @@ -29,17 +29,9 @@ public: void OnUpdate(const Core::Timing::CoreTiming& core_timing) override; private: - 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"); - Core::HID::MouseState next_state{}; Core::HID::AnalogStickState last_mouse_wheel_state{}; - MouseSharedMemory* shared_memory = nullptr; + MouseSharedMemoryFormat& shared_memory; Core::HID::EmulatedDevices* emulated_devices = nullptr; }; } // namespace Service::HID |