From 56f35ab2629c3753dbb624799bd8aaff2a179f58 Mon Sep 17 00:00:00 2001
From: David Marcec <dmarcecguzman@gmail.com>
Date: Sat, 6 Oct 2018 00:23:21 +1000
Subject: "Better Hid" rework part 1

---
 src/core/hle/service/hid/controllers/gesture.h | 61 ++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 src/core/hle/service/hid/controllers/gesture.h

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

diff --git a/src/core/hle/service/hid/controllers/gesture.h b/src/core/hle/service/hid/controllers/gesture.h
new file mode 100644
index 000000000..f46819829
--- /dev/null
+++ b/src/core/hle/service/hid/controllers/gesture.h
@@ -0,0 +1,61 @@
+// Copyright 2018 yuzu emulator team
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+#include <array>
+#include "common/common_types.h"
+#include "common/swap.h"
+#include "core/hle/service/hid/controllers/controller_base.h"
+
+namespace Service::HID {
+class Controller_Gesture final : public ControllerBase {
+public:
+    Controller_Gesture() = default;
+
+    // Called when the controller is initialized
+    void OnInit() override;
+
+    // When the controller is released
+    void OnRelease() override;
+
+    // When the controller is requesting an update for the shared memory
+    void OnUpdate(u8* data, size_t size) override;
+
+    // Called when input devices should be loaded
+    void OnLoadInputDevices() override;
+
+private:
+    struct Locations {
+        s32_le x;
+        s32_le y;
+    };
+
+    struct GestureState {
+        s64_le sampling_number;
+        s64_le sampling_number2;
+
+        s64_le detection_count;
+        s32_le type;
+        s32_le dir;
+        s32_le x;
+        s32_le y;
+        s32_le delta_x;
+        s32_le delta_y;
+        f32 vel_x;
+        f32 vel_y;
+        s32_le attributes;
+        f32 scale;
+        f32 rotation;
+        s32_le location_count;
+        std::array<Locations, 4> locations{};
+    };
+    static_assert(sizeof(GestureState) == 0x68, "GestureState is an invalid size");
+
+    struct SharedMemory {
+        CommonHeader header;
+        std::array<GestureState, 17> gesture_states;
+    };
+    SharedMemory shared_memory{};
+};
+}; // namespace Service::HID
-- 
cgit v1.2.3


From 5857aea94ef52186f64a6794adf418ba92329329 Mon Sep 17 00:00:00 2001
From: David Marcec <dmarcecguzman@gmail.com>
Date: Sat, 6 Oct 2018 13:14:42 +1000
Subject: Addressed changes for better hid

---
 src/core/hle/service/hid/controllers/gesture.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/src/core/hle/service/hid/controllers/gesture.h b/src/core/hle/service/hid/controllers/gesture.h
index f46819829..0ced50dfd 100644
--- a/src/core/hle/service/hid/controllers/gesture.h
+++ b/src/core/hle/service/hid/controllers/gesture.h
@@ -3,6 +3,7 @@
 // Refer to the license.txt file included.
 
 #pragma once
+
 #include <array>
 #include "common/common_types.h"
 #include "common/swap.h"
@@ -11,7 +12,7 @@
 namespace Service::HID {
 class Controller_Gesture final : public ControllerBase {
 public:
-    Controller_Gesture() = default;
+    Controller_Gesture();
 
     // Called when the controller is initialized
     void OnInit() override;
@@ -48,7 +49,7 @@ private:
         f32 scale;
         f32 rotation;
         s32_le location_count;
-        std::array<Locations, 4> locations{};
+        std::array<Locations, 4> locations;
     };
     static_assert(sizeof(GestureState) == 0x68, "GestureState is an invalid size");
 
@@ -58,4 +59,4 @@ private:
     };
     SharedMemory shared_memory{};
 };
-}; // namespace Service::HID
+} // namespace Service::HID
-- 
cgit v1.2.3