Merge pull request #9832 from liamwhite/hle-mp

service: HLE multiprocess

2 files changed, 16 insertions, 13 deletions

diff --git a/src/core/hle/service/pctl/pctl_module.cpp b/src/core/hle/service/pctl/pctl_module.cpp
index 083609b34..a4a12a78c 100644
--- a/src/core/hle/service/pctl/pctl_module.cpp
+++ b/src/core/hle/service/pctl/pctl_module.cpp
@@ -8,6 +8,7 @@
 #include "core/hle/ipc_helpers.h"
 #include "core/hle/service/pctl/pctl.h"
 #include "core/hle/service/pctl/pctl_module.h"
+#include "core/hle/service/server_manager.h"
 
 namespace Service::PCTL {
 
@@ -393,19 +394,22 @@ Module::Interface::Interface(Core::System& system_, std::shared_ptr<Module> modu
 
 Module::Interface::~Interface() = default;
 
-void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system) {
+void LoopProcess(Core::System& system) {
+    auto server_manager = std::make_unique<ServerManager>(system);
+
     auto module = std::make_shared<Module>();
-    std::make_shared<PCTL>(system, module, "pctl",
-                           Capability::Application | Capability::SnsPost | Capability::Status |
-                               Capability::StereoVision)
-        ->InstallAsService(service_manager);
+    server_manager->RegisterNamedService(
+        "pctl", std::make_shared<PCTL>(system, module, "pctl",
+                                       Capability::Application | Capability::SnsPost |
+                                           Capability::Status | Capability::StereoVision));
     // TODO(ogniK): Implement remaining capabilities
-    std::make_shared<PCTL>(system, module, "pctl:a", Capability::None)
-        ->InstallAsService(service_manager);
-    std::make_shared<PCTL>(system, module, "pctl:r", Capability::None)
-        ->InstallAsService(service_manager);
-    std::make_shared<PCTL>(system, module, "pctl:s", Capability::None)
-        ->InstallAsService(service_manager);
+    server_manager->RegisterNamedService(
+        "pctl:a", std::make_shared<PCTL>(system, module, "pctl:a", Capability::None));
+    server_manager->RegisterNamedService(
+        "pctl:r", std::make_shared<PCTL>(system, module, "pctl:r", Capability::None));
+    server_manager->RegisterNamedService(
+        "pctl:s", std::make_shared<PCTL>(system, module, "pctl:s", Capability::None));
+    ServerManager::RunServer(std::move(server_manager));
 }
 
 } // namespace Service::PCTL
diff --git a/src/core/hle/service/pctl/pctl_module.h b/src/core/hle/service/pctl/pctl_module.h
index 6f584530d..4ea77ab21 100644
--- a/src/core/hle/service/pctl/pctl_module.h
+++ b/src/core/hle/service/pctl/pctl_module.h
@@ -42,7 +42,6 @@ public:
     };
 };
 
-/// Registers all PCTL services with the specified service manager.
-void InstallInterfaces(SM::ServiceManager& service_manager, Core::System& system);
+void LoopProcess(Core::System& system);
 
 } // namespace Service::PCTL