VERY experimental Nintendo Switch 2 emulator
C++
psc: move IPmControl, IPmModule, IPmService
Liamdc62ca20ee70
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txtindex f67a12f8f7..6610da751e 100644--- a/src/core/CMakeLists.txt+++ b/src/core/CMakeLists.txt@@ -891,6 +891,12 @@ add_library(core STATIChle/service/pm/pm.hhle/service/prepo/prepo.cpphle/service/prepo/prepo.h+ hle/service/psc/pm_control.cpp+ hle/service/psc/pm_control.h+ hle/service/psc/pm_module.cpp+ hle/service/psc/pm_module.h+ hle/service/psc/pm_service.cpp+ hle/service/psc/pm_service.hhle/service/psc/psc.cpphle/service/psc/psc.hhle/service/psc/time/alarms.cppdiff --git a/src/core/hle/service/psc/pm_control.cpp b/src/core/hle/service/psc/pm_control.cppnew file mode 100644index 0000000000..7dedb76629--- /dev/null+++ b/src/core/hle/service/psc/pm_control.cpp@@ -0,0 +1,28 @@+// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project+// SPDX-License-Identifier: GPL-2.0-or-later++#include "core/hle/service/psc/pm_control.h"++namespace Service::PSC {++IPmControl::IPmControl(Core::System& system_) : ServiceFramework{system_, "psc:c"} {+ // clang-format off+ static const FunctionInfo functions[] = {+ {0, nullptr, "Initialize"},+ {1, nullptr, "DispatchRequest"},+ {2, nullptr, "GetResult"},+ {3, nullptr, "GetState"},+ {4, nullptr, "Cancel"},+ {5, nullptr, "PrintModuleInformation"},+ {6, nullptr, "GetModuleInformation"},+ {10, nullptr, "AcquireStateLock"},+ {11, nullptr, "HasStateLock"},+ };+ // clang-format on++ RegisterHandlers(functions);+}++IPmControl::~IPmControl() = default;++} // namespace Service::PSCdiff --git a/src/core/hle/service/psc/pm_control.h b/src/core/hle/service/psc/pm_control.hnew file mode 100644index 0000000000..e0ae2f39ca--- /dev/null+++ b/src/core/hle/service/psc/pm_control.h@@ -0,0 +1,16 @@+// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project+// SPDX-License-Identifier: GPL-2.0-or-later++#pragma once++#include "core/hle/service/service.h"++namespace Service::PSC {++class IPmControl final : public ServiceFramework<IPmControl> {+public:+ explicit IPmControl(Core::System& system_);+ ~IPmControl() override;+};++} // namespace Service::PSCdiff --git a/src/core/hle/service/psc/pm_module.cpp b/src/core/hle/service/psc/pm_module.cppnew file mode 100644index 0000000000..74dc7ed4e8--- /dev/null+++ b/src/core/hle/service/psc/pm_module.cpp@@ -0,0 +1,24 @@+// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project+// SPDX-License-Identifier: GPL-2.0-or-later++#include "core/hle/service/psc/pm_module.h"++namespace Service::PSC {++IPmModule::IPmModule(Core::System& system_) : ServiceFramework{system_, "IPmModule"} {+ // clang-format off+ static const FunctionInfo functions[] = {+ {0, nullptr, "Initialize"},+ {1, nullptr, "GetRequest"},+ {2, nullptr, "Acknowledge"},+ {3, nullptr, "Finalize"},+ {4, nullptr, "AcknowledgeEx"},+ };+ // clang-format on++ RegisterHandlers(functions);+}++IPmModule::~IPmModule() = default;++} // namespace Service::PSCdiff --git a/src/core/hle/service/psc/pm_module.h b/src/core/hle/service/psc/pm_module.hnew file mode 100644index 0000000000..b3a2d25842--- /dev/null+++ b/src/core/hle/service/psc/pm_module.h@@ -0,0 +1,16 @@+// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project+// SPDX-License-Identifier: GPL-2.0-or-later++#pragma once++#include "core/hle/service/service.h"++namespace Service::PSC {++class IPmModule final : public ServiceFramework<IPmModule> {+public:+ explicit IPmModule(Core::System& system_);+ ~IPmModule() override;+};++} // namespace Service::PSCdiff --git a/src/core/hle/service/psc/pm_service.cpp b/src/core/hle/service/psc/pm_service.cppnew file mode 100644index 0000000000..99b16bbb0a--- /dev/null+++ b/src/core/hle/service/psc/pm_service.cpp@@ -0,0 +1,30 @@+// 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/psc/pm_module.h"+#include "core/hle/service/psc/pm_service.h"++namespace Service::PSC {++IPmService::IPmService(Core::System& system_) : ServiceFramework{system_, "psc:m"} {+ // clang-format off+ static const FunctionInfo functions[] = {+ {0, &IPmService::GetPmModule, "GetPmModule"},+ };+ // clang-format on++ RegisterHandlers(functions);+}++IPmService::~IPmService() = default;++void IPmService::GetPmModule(HLERequestContext& ctx) {+ LOG_DEBUG(Service_PSC, "called");++ IPC::ResponseBuilder rb{ctx, 2, 0, 1};+ rb.Push(ResultSuccess);+ rb.PushIpcInterface<IPmModule>(system);+}++} // namespace Service::PSCdiff --git a/src/core/hle/service/psc/pm_service.h b/src/core/hle/service/psc/pm_service.hnew file mode 100644index 0000000000..e8bd1fa6b4--- /dev/null+++ b/src/core/hle/service/psc/pm_service.h@@ -0,0 +1,19 @@+// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project+// SPDX-License-Identifier: GPL-2.0-or-later++#pragma once++#include "core/hle/service/service.h"++namespace Service::PSC {++class IPmService final : public ServiceFramework<IPmService> {+public:+ explicit IPmService(Core::System& system_);+ ~IPmService() override;++private:+ void GetPmModule(HLERequestContext& ctx);+};++} // namespace Service::PSCdiff --git a/src/core/hle/service/psc/psc.cpp b/src/core/hle/service/psc/psc.cppindex 44310756b6..a086c13ed6 100644--- a/src/core/hle/service/psc/psc.cpp+++ b/src/core/hle/service/psc/psc.cpp@@ -1,11 +1,8 @@// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later-#include <memory>--#include "common/logging/log.h"-#include "core/core.h"-#include "core/hle/service/ipc_helpers.h"+#include "core/hle/service/psc/pm_control.h"+#include "core/hle/service/psc/pm_service.h"#include "core/hle/service/psc/psc.h"#include "core/hle/service/psc/time/manager.h"#include "core/hle/service/psc/time/power_state_service.h"@@ -15,66 +12,6 @@namespace Service::PSC {-class IPmControl final : public ServiceFramework<IPmControl> {-public:- explicit IPmControl(Core::System& system_) : ServiceFramework{system_, "psc:c"} {- // clang-format off- static const FunctionInfo functions[] = {- {0, nullptr, "Initialize"},- {1, nullptr, "DispatchRequest"},- {2, nullptr, "GetResult"},- {3, nullptr, "GetState"},- {4, nullptr, "Cancel"},- {5, nullptr, "PrintModuleInformation"},- {6, nullptr, "GetModuleInformation"},- {10, nullptr, "AcquireStateLock"},- {11, nullptr, "HasStateLock"},- };- // clang-format on-- RegisterHandlers(functions);- }-};--class IPmModule final : public ServiceFramework<IPmModule> {-public:- explicit IPmModule(Core::System& system_) : ServiceFramework{system_, "IPmModule"} {- // clang-format off- static const FunctionInfo functions[] = {- {0, nullptr, "Initialize"},- {1, nullptr, "GetRequest"},- {2, nullptr, "Acknowledge"},- {3, nullptr, "Finalize"},- {4, nullptr, "AcknowledgeEx"},- };- // clang-format on-- RegisterHandlers(functions);- }-};--class IPmService final : public ServiceFramework<IPmService> {-public:- explicit IPmService(Core::System& system_) : ServiceFramework{system_, "psc:m"} {- // clang-format off- static const FunctionInfo functions[] = {- {0, &IPmService::GetPmModule, "GetPmModule"},- };- // clang-format on-- RegisterHandlers(functions);- }--private:- void GetPmModule(HLERequestContext& ctx) {- LOG_DEBUG(Service_PSC, "called");-- IPC::ResponseBuilder rb{ctx, 2, 0, 1};- rb.Push(ResultSuccess);- rb.PushIpcInterface<IPmModule>(system);- }-};-void LoopProcess(Core::System& system) {auto server_manager = std::make_unique<ServerManager>(system);diff --git a/src/core/hle/service/psc/psc.h b/src/core/hle/service/psc/psc.hindex 459137f423..c83d07ca80 100644--- a/src/core/hle/service/psc/psc.h+++ b/src/core/hle/service/psc/psc.h@@ -7,10 +7,6 @@ namespace Core {class System;}-namespace Service::SM {-class ServiceManager;-}-namespace Service::PSC {void LoopProcess(Core::System& system);