summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/usb/usb.cpp
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-03-01 16:38:20 +0100
committerGitHub <noreply@github.com>2023-03-01 16:38:20 +0100
commit97f7a560f3905a1dd6a4e5a0a308ea752004bf08 (patch)
treee60a69f96d16d051220b66e90906a7abeacf1064 /src/core/hle/service/usb/usb.cpp
parentMerge pull request #9879 from zhaobot/tx-update-20230301024940 (diff)
parentsm:: fix lingering session initialization issues (diff)
downloadyuzu-97f7a560f3905a1dd6a4e5a0a308ea752004bf08.tar
yuzu-97f7a560f3905a1dd6a4e5a0a308ea752004bf08.tar.gz
yuzu-97f7a560f3905a1dd6a4e5a0a308ea752004bf08.tar.bz2
yuzu-97f7a560f3905a1dd6a4e5a0a308ea752004bf08.tar.lz
yuzu-97f7a560f3905a1dd6a4e5a0a308ea752004bf08.tar.xz
yuzu-97f7a560f3905a1dd6a4e5a0a308ea752004bf08.tar.zst
yuzu-97f7a560f3905a1dd6a4e5a0a308ea752004bf08.zip
Diffstat (limited to 'src/core/hle/service/usb/usb.cpp')
-rw-r--r--src/core/hle/service/usb/usb.cpp17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/core/hle/service/usb/usb.cpp b/src/core/hle/service/usb/usb.cpp
index ac46a406c..ddb73f394 100644
--- a/src/core/hle/service/usb/usb.cpp
+++ b/src/core/hle/service/usb/usb.cpp
@@ -5,8 +5,8 @@
#include "common/logging/log.h"
#include "core/hle/ipc_helpers.h"
+#include "core/hle/service/server_manager.h"
#include "core/hle/service/service.h"
-#include "core/hle/service/sm/sm.h"
#include "core/hle/service/usb/usb.h"
namespace Service::USB {
@@ -218,12 +218,15 @@ public:
}
};
-void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) {
- std::make_shared<USB_DS>(system)->InstallAsService(sm);
- std::make_shared<USB_HS>(system)->InstallAsService(sm);
- std::make_shared<USB_PD>(system)->InstallAsService(sm);
- std::make_shared<USB_PD_C>(system)->InstallAsService(sm);
- std::make_shared<USB_PM>(system)->InstallAsService(sm);
+void LoopProcess(Core::System& system) {
+ auto server_manager = std::make_unique<ServerManager>(system);
+
+ server_manager->RegisterNamedService("usb:ds", std::make_shared<USB_DS>(system));
+ server_manager->RegisterNamedService("usb:hs", std::make_shared<USB_HS>(system));
+ server_manager->RegisterNamedService("usb:pd", std::make_shared<USB_PD>(system));
+ server_manager->RegisterNamedService("usb:pd:c", std::make_shared<USB_PD_C>(system));
+ server_manager->RegisterNamedService("usb:pm", std::make_shared<USB_PM>(system));
+ ServerManager::RunServer(std::move(server_manager));
}
} // namespace Service::USB