VERY experimental Nintendo Switch 2 emulator
C++
psc: rewrite IPmService
Liamda7218845653
diff --git a/src/core/hle/service/psc/pm_service.cpp b/src/core/hle/service/psc/pm_service.cppindex 99b16bbb0a..c4e0ad2286 100644--- a/src/core/hle/service/psc/pm_service.cpp+++ b/src/core/hle/service/psc/pm_service.cpp@@ -1,7 +1,7 @@// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later-#include "core/hle/service/ipc_helpers.h"+#include "core/hle/service/cmif_serialization.h"#include "core/hle/service/psc/pm_module.h"#include "core/hle/service/psc/pm_service.h"@@ -10,7 +10,7 @@ namespace Service::PSC {IPmService::IPmService(Core::System& system_) : ServiceFramework{system_, "psc:m"} {// clang-format offstatic const FunctionInfo functions[] = {- {0, &IPmService::GetPmModule, "GetPmModule"},+ {0, D<&IPmService::GetPmModule>, "GetPmModule"},};// clang-format on@@ -19,12 +19,10 @@ IPmService::IPmService(Core::System& system_) : ServiceFramework{system_, "psc:mIPmService::~IPmService() = default;-void IPmService::GetPmModule(HLERequestContext& ctx) {+Result IPmService::GetPmModule(Out<SharedPointer<IPmModule>> out_module) {LOG_DEBUG(Service_PSC, "called");-- IPC::ResponseBuilder rb{ctx, 2, 0, 1};- rb.Push(ResultSuccess);- rb.PushIpcInterface<IPmModule>(system);+ *out_module = std::make_shared<IPmModule>(system);+ R_SUCCEED();}} // namespace Service::PSCdiff --git a/src/core/hle/service/psc/pm_service.h b/src/core/hle/service/psc/pm_service.hindex e8bd1fa6b4..08e14c6f8f 100644--- a/src/core/hle/service/psc/pm_service.h+++ b/src/core/hle/service/psc/pm_service.h@@ -3,17 +3,20 @@#pragma once+#include "core/hle/service/cmif_types.h"#include "core/hle/service/service.h"namespace Service::PSC {+class IPmModule;+class IPmService final : public ServiceFramework<IPmService> {public:explicit IPmService(Core::System& system_);~IPmService() override;private:- void GetPmModule(HLERequestContext& ctx);+ Result GetPmModule(Out<SharedPointer<IPmModule>> out_module);};} // namespace Service::PSC