From b564f024f0be5023cf13fb2fca953ea6c1feeeb6 Mon Sep 17 00:00:00 2001
From: german77 <juangerman-13@hotmail.com>
Date: Fri, 22 Oct 2021 23:04:06 -0500
Subject: Morph review first wave

---
 src/core/hle/service/hid/controllers/touchscreen.h | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'src/core/hle/service/hid/controllers/touchscreen.h')

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
-- 
cgit v1.2.3