diff options
author | german77 <juangerman-13@hotmail.com> | 2021-10-23 06:04:06 +0200 |
---|---|---|
committer | Narr the Reg <juangerman-13@hotmail.com> | 2021-11-25 03:30:25 +0100 |
commit | b564f024f0be5023cf13fb2fca953ea6c1feeeb6 (patch) | |
tree | bb2fb272058a239a345856d4b34389791ea0a783 /src/core/hle/service/hid/controllers/touchscreen.h | |
parent | service/hid: Match shared memory closer to HW (diff) | |
download | yuzu-b564f024f0be5023cf13fb2fca953ea6c1feeeb6.tar yuzu-b564f024f0be5023cf13fb2fca953ea6c1feeeb6.tar.gz yuzu-b564f024f0be5023cf13fb2fca953ea6c1feeeb6.tar.bz2 yuzu-b564f024f0be5023cf13fb2fca953ea6c1feeeb6.tar.lz yuzu-b564f024f0be5023cf13fb2fca953ea6c1feeeb6.tar.xz yuzu-b564f024f0be5023cf13fb2fca953ea6c1feeeb6.tar.zst yuzu-b564f024f0be5023cf13fb2fca953ea6c1feeeb6.zip |
Diffstat (limited to 'src/core/hle/service/hid/controllers/touchscreen.h')
-rw-r--r-- | src/core/hle/service/hid/controllers/touchscreen.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/core/hle/service/hid/controllers/touchscreen.h b/src/core/hle/service/hid/controllers/touchscreen.h index bcf79237d..fa4dfa1a2 100644 --- a/src/core/hle/service/hid/controllers/touchscreen.h +++ b/src/core/hle/service/hid/controllers/touchscreen.h @@ -50,27 +50,19 @@ private: // This is nn::hid::TouchScreenState struct TouchScreenState { - s64_le sampling_number; - s32_le entry_count; + s64 sampling_number; + s32 entry_count; INSERT_PADDING_BYTES(4); // Reserved std::array<Core::HID::TouchState, MAX_FINGERS> states; }; static_assert(sizeof(TouchScreenState) == 0x290, "TouchScreenState is an invalid size"); - struct Finger { - u64_le last_touch{}; - Common::Point<float> position; - u32_le id{}; - bool pressed{}; - Core::HID::TouchAttribute attribute; - }; - // This is nn::hid::detail::TouchScreenLifo Lifo<TouchScreenState> touch_screen_lifo{}; static_assert(sizeof(touch_screen_lifo) == 0x2C38, "touch_screen_lifo is an invalid size"); TouchScreenState next_state{}; - std::array<Finger, MAX_FINGERS> fingers; + std::array<Core::HID::TouchFinger, MAX_FINGERS> fingers; Core::HID::EmulatedConsole* console; }; } // namespace Service::HID |