From 865abfc37c5b3e8945d833bd44db428ad720bd58 Mon Sep 17 00:00:00 2001
From: Narr the Reg <juangerman-13@hotmail.com>
Date: Sun, 31 Dec 2023 00:42:23 -0600
Subject: service: hid: Use applet resource to get latest shared memory handle

---
 .../hle/service/hid/controllers/applet_resource.h  | 94 ++++++++++++++--------
 1 file changed, 59 insertions(+), 35 deletions(-)

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

diff --git a/src/core/hle/service/hid/controllers/applet_resource.h b/src/core/hle/service/hid/controllers/applet_resource.h
index e7991f93a..52cc4cf42 100644
--- a/src/core/hle/service/hid/controllers/applet_resource.h
+++ b/src/core/hle/service/hid/controllers/applet_resource.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <array>
+#include <mutex>
 
 #include "common/bit_field.h"
 #include "common/common_types.h"
@@ -20,6 +21,59 @@ class KSharedMemory;
 
 namespace Service::HID {
 struct SharedMemoryFormat;
+class AppletResource;
+class NPadResource;
+
+static constexpr std::size_t AruidIndexMax = 0x20;
+
+enum class RegistrationStatus : u32 {
+    None,
+    Initialized,
+    PendingDelete,
+};
+
+struct DataStatusFlag {
+    union {
+        u32 raw{};
+
+        BitField<0, 1, u32> is_initialized;
+        BitField<1, 1, u32> is_assigned;
+        BitField<16, 1, u32> enable_pad_input;
+        BitField<17, 1, u32> enable_six_axis_sensor;
+        BitField<18, 1, u32> bit_18;
+        BitField<19, 1, u32> is_palma_connectable;
+        BitField<20, 1, u32> enable_palma_boost_mode;
+        BitField<21, 1, u32> enable_touchscreen;
+    };
+};
+
+struct AruidRegisterList {
+    std::array<RegistrationStatus, AruidIndexMax> flag{};
+    std::array<u64, AruidIndexMax> aruid{};
+};
+static_assert(sizeof(AruidRegisterList) == 0x180, "AruidRegisterList is an invalid size");
+
+struct AruidData {
+    DataStatusFlag flag{};
+    u64 aruid{};
+    SharedMemoryFormat* shared_memory_format{nullptr};
+};
+
+struct HandheldConfig {
+    bool is_handheld_hid_enabled;
+    bool is_force_handheld;
+    bool is_joycon_rail_enabled;
+    bool is_force_handheld_style_vibration;
+};
+static_assert(sizeof(HandheldConfig) == 0x4, "HandheldConfig is an invalid size");
+
+struct AppletResourceHolder {
+    std::shared_ptr<AppletResource> applet_resource{nullptr};
+    std::recursive_mutex* shared_mutex{nullptr};
+    NPadResource* shared_npad_resource{nullptr};
+    std::shared_ptr<HandheldConfig> handheld_config{nullptr};
+    long* handle_1;
+};
 
 class AppletResource {
 public:
@@ -36,6 +90,10 @@ public:
     u64 GetActiveAruid();
     Result GetSharedMemoryHandle(Kernel::KSharedMemory** out_handle, u64 aruid);
     Result GetSharedMemoryFormat(SharedMemoryFormat** out_shared_memory_format, u64 aruid);
+    AruidData* GetAruidData(u64 aruid);
+    AruidData* GetAruidDataByIndex(std::size_t aruid_index);
+
+    bool IsVibrationAruidActive(u64 aruid) const;
 
     u64 GetIndexFromAruid(u64 aruid);
 
@@ -52,46 +110,12 @@ public:
     Result UnregisterCoreAppletResource();
 
 private:
-    static constexpr std::size_t AruidIndexMax = 0x20;
-
-    enum RegistrationStatus : u32 {
-        None,
-        Initialized,
-        PendingDelete,
-    };
-
-    struct DataStatusFlag {
-        union {
-            u32 raw{};
-
-            BitField<0, 1, u32> is_initialized;
-            BitField<1, 1, u32> is_assigned;
-            BitField<16, 1, u32> enable_pad_input;
-            BitField<17, 1, u32> enable_six_axis_sensor;
-            BitField<18, 1, u32> bit_18;
-            BitField<19, 1, u32> is_palma_connectable;
-            BitField<20, 1, u32> enable_palma_boost_mode;
-            BitField<21, 1, u32> enable_touchscreen;
-        };
-    };
-
-    struct AruidRegisterList {
-        std::array<RegistrationStatus, AruidIndexMax> flag{};
-        std::array<u64, AruidIndexMax> aruid{};
-    };
-    static_assert(sizeof(AruidRegisterList) == 0x180, "AruidRegisterList is an invalid size");
-
-    struct AruidData {
-        DataStatusFlag flag{};
-        u64 aruid{};
-        SharedMemoryFormat* shared_memory_format{nullptr};
-    };
-
     u64 active_aruid{};
     AruidRegisterList registration_list{};
     std::array<AruidData, AruidIndexMax> data{};
     std::array<SharedMemoryHolder, AruidIndexMax> shared_memory_holder{};
     s32 ref_counter{};
+    u64 active_vibration_aruid;
 
     Core::System& system;
 };
-- 
cgit v1.2.3