summaryrefslogtreecommitdiff
path: root/src/hid_core/resource_manager.h
diff options
context:
space:
mode:
authorGravatar Narr the Reg2024-01-31 18:46:06 -0600
committerGravatar Narr the Reg2024-02-01 10:37:44 -0600
commit818721d12d04f3a9cdf98e9cc31deae171ce6f7e (patch)
tree562a15e9da80eb96d5935d962820c0c9b116ac08 /src/hid_core/resource_manager.h
parentMerge pull request #12878 from zhaobot/tx-update-20240201020554 (diff)
downloadyuzu-818721d12d04f3a9cdf98e9cc31deae171ce6f7e.tar.gz
yuzu-818721d12d04f3a9cdf98e9cc31deae171ce6f7e.tar.xz
yuzu-818721d12d04f3a9cdf98e9cc31deae171ce6f7e.zip
service: hid: Multiple fixes
Diffstat (limited to 'src/hid_core/resource_manager.h')
-rw-r--r--src/hid_core/resource_manager.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/hid_core/resource_manager.h b/src/hid_core/resource_manager.h
index 0bfe09511..dc3ff01f8 100644
--- a/src/hid_core/resource_manager.h
+++ b/src/hid_core/resource_manager.h
@@ -147,6 +147,10 @@ private:
147 std::shared_ptr<SixAxis> six_axis{nullptr}; 147 std::shared_ptr<SixAxis> six_axis{nullptr};
148 std::shared_ptr<SleepButton> sleep_button{nullptr}; 148 std::shared_ptr<SleepButton> sleep_button{nullptr};
149 std::shared_ptr<UniquePad> unique_pad{nullptr}; 149 std::shared_ptr<UniquePad> unique_pad{nullptr};
150 std::shared_ptr<Core::Timing::EventType> npad_update_event;
151 std::shared_ptr<Core::Timing::EventType> default_update_event;
152 std::shared_ptr<Core::Timing::EventType> mouse_keyboard_update_event;
153 std::shared_ptr<Core::Timing::EventType> motion_update_event;
150 154
151 // TODO: Create these resources 155 // TODO: Create these resources
152 // std::shared_ptr<AudioControl> audio_control{nullptr}; 156 // std::shared_ptr<AudioControl> audio_control{nullptr};
@@ -179,11 +183,6 @@ public:
179private: 183private:
180 void GetSharedMemoryHandle(HLERequestContext& ctx); 184 void GetSharedMemoryHandle(HLERequestContext& ctx);
181 185
182 std::shared_ptr<Core::Timing::EventType> npad_update_event{nullptr};
183 std::shared_ptr<Core::Timing::EventType> default_update_event{nullptr};
184 std::shared_ptr<Core::Timing::EventType> mouse_keyboard_update_event{nullptr};
185 std::shared_ptr<Core::Timing::EventType> motion_update_event{nullptr};
186
187 u64 aruid{}; 186 u64 aruid{};
188 std::shared_ptr<ResourceManager> resource_manager; 187 std::shared_ptr<ResourceManager> resource_manager;
189}; 188};