aboutsummaryrefslogtreecommitdiff
path: root/src/hid_core/resource_manager.cpp
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2024-01-26 09:55:47 -0500
committerGitHub <noreply@github.com>2024-01-26 09:55:47 -0500
commit9dd9c2a6cc5313dae34580527b82bcb28b72de4f (patch)
treebb292c61287e988e13dfd5feaecaa6503d932baf /src/hid_core/resource_manager.cpp
parent0584e5bcbb3116ea37f018b19d24c6a1582a375e (diff)
parentdf295231b8075bd94a2eb5331aa78eae94f70847 (diff)
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 8ef0df020d..a2295219a8 100644
--- a/src/hid_core/resource_manager.cpp
+++ b/src/hid_core/resource_manager.cpp
@@ -6,6 +6,8 @@
#include "core/core_timing.h"
#include "core/hle/kernel/k_shared_memory.h"
#include "core/hle/service/ipc_helpers.h"
+#include "core/hle/service/set/system_settings_server.h"
+#include "core/hle/service/sm/sm.h"
#include "hid_core/hid_core.h"
#include "hid_core/hid_util.h"
#include "hid_core/resource_manager.h"
@@ -180,7 +182,11 @@ void ResourceManager::InitializeHidCommonSampler() {
debug_pad->SetAppletResource(applet_resource, &shared_mutex);
digitizer->SetAppletResource(applet_resource, &shared_mutex);
keyboard->SetAppletResource(applet_resource, &shared_mutex);
- npad->SetNpadExternals(applet_resource, &shared_mutex, handheld_config);
+
+ const auto settings =
+ system.ServiceManager().GetService<Service::Set::ISystemSettingsServer>("set:sys");
+ npad->SetNpadExternals(applet_resource, &shared_mutex, handheld_config, settings);
+
six_axis->SetAppletResource(applet_resource, &shared_mutex);
mouse->SetAppletResource(applet_resource, &shared_mutex);
debug_mouse->SetAppletResource(applet_resource, &shared_mutex);