summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/hid/hid.cpp
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2024-02-01 17:33:44 +0100
committerGitHub <noreply@github.com>2024-02-01 17:33:44 +0100
commit21138b6a867632c56330a48a7389430ae2b6e321 (patch)
tree6be048ee977f29f4c132d0cfb0bcdb79a7c5966d /src/core/hle/service/hid/hid.cpp
parentMerge pull request #12870 from liamwhite/mac-ci (diff)
parentservice: hid: Restore active aruid (diff)
downloadyuzu-21138b6a867632c56330a48a7389430ae2b6e321.tar
yuzu-21138b6a867632c56330a48a7389430ae2b6e321.tar.gz
yuzu-21138b6a867632c56330a48a7389430ae2b6e321.tar.bz2
yuzu-21138b6a867632c56330a48a7389430ae2b6e321.tar.lz
yuzu-21138b6a867632c56330a48a7389430ae2b6e321.tar.xz
yuzu-21138b6a867632c56330a48a7389430ae2b6e321.tar.zst
yuzu-21138b6a867632c56330a48a7389430ae2b6e321.zip
Diffstat (limited to 'src/core/hle/service/hid/hid.cpp')
-rw-r--r--src/core/hle/service/hid/hid.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp
index 5b28be577..b60fb9139 100644
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -18,9 +18,10 @@ namespace Service::HID {
void LoopProcess(Core::System& system) {
auto server_manager = std::make_unique<ServerManager>(system);
- std::shared_ptr<ResourceManager> resource_manager = std::make_shared<ResourceManager>(system);
std::shared_ptr<HidFirmwareSettings> firmware_settings =
std::make_shared<HidFirmwareSettings>(system);
+ std::shared_ptr<ResourceManager> resource_manager =
+ std::make_shared<ResourceManager>(system, firmware_settings);
// TODO: Remove this hack when am is emulated properly.
resource_manager->Initialize();
@@ -31,7 +32,7 @@ void LoopProcess(Core::System& system) {
server_manager->RegisterNamedService(
"hid", std::make_shared<IHidServer>(system, resource_manager, firmware_settings));
server_manager->RegisterNamedService(
- "hid:dbg", std::make_shared<IHidDebugServer>(system, resource_manager));
+ "hid:dbg", std::make_shared<IHidDebugServer>(system, resource_manager, firmware_settings));
server_manager->RegisterNamedService(
"hid:sys", std::make_shared<IHidSystemServer>(system, resource_manager, firmware_settings));