From cb2ce9924a6ac65cebc0ebe1014cf6eb459506e5 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 28 Jan 2019 11:44:35 -0500 Subject: [PATCH 1/2] service/pm: Tidy up functionality related to SystemBootMode Just minor tidying of interfaces. --- src/core/hle/service/pm/pm.cpp | 4 +++- src/core/hle/service/pm/pm.h | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/core/hle/service/pm/pm.cpp b/src/core/hle/service/pm/pm.cpp index 53e7da9c3a..40655532c7 100644 --- a/src/core/hle/service/pm/pm.cpp +++ b/src/core/hle/service/pm/pm.cpp @@ -24,8 +24,10 @@ private: IPC::ResponseBuilder rb{ctx, 3}; rb.Push(RESULT_SUCCESS); - rb.Push(static_cast(SystemBootMode::Normal)); // Normal boot mode + rb.PushEnum(boot_mode); } + + SystemBootMode boot_mode = SystemBootMode::Normal; }; class DebugMonitor final : public ServiceFramework { diff --git a/src/core/hle/service/pm/pm.h b/src/core/hle/service/pm/pm.h index 370f2ed722..cc8d3f2152 100644 --- a/src/core/hle/service/pm/pm.h +++ b/src/core/hle/service/pm/pm.h @@ -9,7 +9,12 @@ class ServiceManager; } namespace Service::PM { -enum class SystemBootMode : u32 { Normal = 0, Maintenance = 1 }; + +enum class SystemBootMode { + Normal, + Maintenance, +}; + /// Registers all PM services with the specified service manager. void InstallInterfaces(SM::ServiceManager& service_manager); From 932922f67f6b2a6be05dd8d6c6966397367f2ca2 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 28 Jan 2019 11:48:08 -0500 Subject: [PATCH 2/2] service/pm: Implement SetMaintenanceBoot() This quite literally functions as a basic setter. No other error checking or anything (since there's nothing to really check against). With this, it completes the pm:bm interface in terms of functionality. --- src/core/hle/service/pm/pm.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/core/hle/service/pm/pm.cpp b/src/core/hle/service/pm/pm.cpp index 40655532c7..6b27dc4a33 100644 --- a/src/core/hle/service/pm/pm.cpp +++ b/src/core/hle/service/pm/pm.cpp @@ -13,7 +13,7 @@ public: explicit BootMode() : ServiceFramework{"pm:bm"} { static const FunctionInfo functions[] = { {0, &BootMode::GetBootMode, "GetBootMode"}, - {1, nullptr, "SetMaintenanceBoot"}, + {1, &BootMode::SetMaintenanceBoot, "SetMaintenanceBoot"}, }; RegisterHandlers(functions); } @@ -27,6 +27,15 @@ private: rb.PushEnum(boot_mode); } + void SetMaintenanceBoot(Kernel::HLERequestContext& ctx) { + LOG_DEBUG(Service_PM, "called"); + + boot_mode = SystemBootMode::Maintenance; + + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(RESULT_SUCCESS); + } + SystemBootMode boot_mode = SystemBootMode::Normal; };