1 files changed, 13 insertions, 10 deletions
diff --git a/src/core/hle/service/pcv/pcv.cpp b/src/core/hle/service/pcv/pcv.cpp
index 98037a8d4..c13ffa6f6 100644
--- a/src/core/hle/service/pcv/pcv.cpp
+++ b/src/core/hle/service/pcv/pcv.cpp
@@ -3,10 +3,10 @@
 
 #include <memory>
 
-#include "core/hle/ipc_helpers.h"
+#include "core/hle/service/ipc_helpers.h"
 #include "core/hle/service/pcv/pcv.h"
+#include "core/hle/service/server_manager.h"
 #include "core/hle/service/service.h"
-#include "core/hle/service/sm/sm.h"
 
 namespace Service::PCV {
 
@@ -76,7 +76,7 @@ public:
     }
 
 private:
-    void SetClockRate(Kernel::HLERequestContext& ctx) {
+    void SetClockRate(HLERequestContext& ctx) {
         IPC::RequestParser rp{ctx};
         clock_rate = rp.Pop<u32>();
         LOG_DEBUG(Service_PCV, "(STUBBED) called, clock_rate={}", clock_rate);
@@ -85,7 +85,7 @@ private:
         rb.Push(ResultSuccess);
     }
 
-    void GetClockRate(Kernel::HLERequestContext& ctx) {
+    void GetClockRate(HLERequestContext& ctx) {
         LOG_DEBUG(Service_PCV, "(STUBBED) called");
 
         IPC::ResponseBuilder rb{ctx, 3};
@@ -115,7 +115,7 @@ public:
     }
 
 private:
-    void OpenSession(Kernel::HLERequestContext& ctx) {
+    void OpenSession(HLERequestContext& ctx) {
         IPC::RequestParser rp{ctx};
         const auto device_code = static_cast<DeviceCode>(rp.Pop<u32>());
         const auto unkonwn_input = rp.Pop<u32>();
@@ -141,11 +141,14 @@ public:
     }
 };
 
-void InstallInterfaces(SM::ServiceManager& sm, Core::System& system) {
-    std::make_shared<PCV>(system)->InstallAsService(sm);
-    std::make_shared<CLKRST>(system, "clkrst")->InstallAsService(sm);
-    std::make_shared<CLKRST>(system, "clkrst:i")->InstallAsService(sm);
-    std::make_shared<CLKRST_A>(system)->InstallAsService(sm);
+void LoopProcess(Core::System& system) {
+    auto server_manager = std::make_unique<ServerManager>(system);
+
+    server_manager->RegisterNamedService("pcv", std::make_shared<PCV>(system));
+    server_manager->RegisterNamedService("clkrst", std::make_shared<CLKRST>(system, "clkrst"));
+    server_manager->RegisterNamedService("clkrst:i", std::make_shared<CLKRST>(system, "clkrst:i"));
+    server_manager->RegisterNamedService("clkrst:a", std::make_shared<CLKRST_A>(system));
+    ServerManager::RunServer(std::move(server_manager));
 }
 
 } // namespace Service::PCV