service: refactor server architecture

Converts services to have their own processes

2 files changed, 11 insertions, 12 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
diff --git a/src/core/hle/service/usb/usb.h b/src/core/hle/service/usb/usb.h
index b41b9684c..98376ebc0 100644
--- a/src/core/hle/service/usb/usb.h
+++ b/src/core/hle/service/usb/usb.h
@@ -7,12 +7,8 @@ namespace Core {
 class System;
 }
 
-namespace Service::SM {
-class ServiceManager;
-}
-
 namespace Service::USB {
 
-void InstallInterfaces(SM::ServiceManager& sm, Core::System& system);
+void LoopProcess(Core::System& system);
 
 } // namespace Service::USB