summaryrefslogtreecommitdiff
path: root/src/hid_core/resource_manager.cpp
diff options
context:
space:
mode:
authorGravatar liamwhite2024-01-26 09:55:47 -0500
committerGravatar GitHub2024-01-26 09:55:47 -0500
commit4d206d849ec0ac2e90226eb67d90b310afd0a269 (patch)
treebb292c61287e988e13dfd5feaecaa6503d932baf /src/hid_core/resource_manager.cpp
parentMerge pull request #12801 from german77/vibration-fix (diff)
parentservice: set: Implement more settings functions for Qlaunch (diff)
downloadyuzu-4d206d849ec0ac2e90226eb67d90b310afd0a269.tar.gz
yuzu-4d206d849ec0ac2e90226eb67d90b310afd0a269.tar.xz
yuzu-4d206d849ec0ac2e90226eb67d90b310afd0a269.zip
Merge pull request #12765 from german77/sys-hid
service: set: Implement more settings functions for Qlaunch
Diffstat (limited to 'src/hid_core/resource_manager.cpp')
-rw-r--r--src/hid_core/resource_manager.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/hid_core/resource_manager.cpp b/src/hid_core/resource_manager.cpp
index 8ef0df020..a2295219a 100644
--- a/src/hid_core/resource_manager.cpp
+++ b/src/hid_core/resource_manager.cpp
@@ -6,6 +6,8 @@
6#include "core/core_timing.h" 6#include "core/core_timing.h"
7#include "core/hle/kernel/k_shared_memory.h" 7#include "core/hle/kernel/k_shared_memory.h"
8#include "core/hle/service/ipc_helpers.h" 8#include "core/hle/service/ipc_helpers.h"
9#include "core/hle/service/set/system_settings_server.h"
10#include "core/hle/service/sm/sm.h"
9#include "hid_core/hid_core.h" 11#include "hid_core/hid_core.h"
10#include "hid_core/hid_util.h" 12#include "hid_core/hid_util.h"
11#include "hid_core/resource_manager.h" 13#include "hid_core/resource_manager.h"
@@ -180,7 +182,11 @@ void ResourceManager::InitializeHidCommonSampler() {
180 debug_pad->SetAppletResource(applet_resource, &shared_mutex); 182 debug_pad->SetAppletResource(applet_resource, &shared_mutex);
181 digitizer->SetAppletResource(applet_resource, &shared_mutex); 183 digitizer->SetAppletResource(applet_resource, &shared_mutex);
182 keyboard->SetAppletResource(applet_resource, &shared_mutex); 184 keyboard->SetAppletResource(applet_resource, &shared_mutex);
183 npad->SetNpadExternals(applet_resource, &shared_mutex, handheld_config); 185
186 const auto settings =
187 system.ServiceManager().GetService<Service::Set::ISystemSettingsServer>("set:sys");
188 npad->SetNpadExternals(applet_resource, &shared_mutex, handheld_config, settings);
189
184 six_axis->SetAppletResource(applet_resource, &shared_mutex); 190 six_axis->SetAppletResource(applet_resource, &shared_mutex);
185 mouse->SetAppletResource(applet_resource, &shared_mutex); 191 mouse->SetAppletResource(applet_resource, &shared_mutex);
186 debug_mouse->SetAppletResource(applet_resource, &shared_mutex); 192 debug_mouse->SetAppletResource(applet_resource, &shared_mutex);