From e35cfc1b039abedd3ded7de66da8361c39e75c28 Mon Sep 17 00:00:00 2001 From: greggameplayer <33609333+greggameplayer@users.noreply.github.com> Date: Fri, 18 May 2018 23:28:30 +0200 Subject: [PATCH 1/3] Properly rename fatal module functions --- src/core/hle/service/fatal/fatal.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/hle/service/fatal/fatal.cpp b/src/core/hle/service/fatal/fatal.cpp index bb75e7314..2d4282209 100644 --- a/src/core/hle/service/fatal/fatal.cpp +++ b/src/core/hle/service/fatal/fatal.cpp @@ -13,7 +13,7 @@ namespace Service::Fatal { Module::Interface::Interface(std::shared_ptr module, const char* name) : ServiceFramework(name), module(std::move(module)) {} -void Module::Interface::FatalSimple(Kernel::HLERequestContext& ctx) { +void Module::Interface::ThrowFatalWithPolicy(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp(ctx); u32 error_code = rp.Pop(); NGLOG_WARNING(Service_Fatal, "(STUBBED) called, error_code=0x{:X}", error_code); @@ -21,7 +21,7 @@ void Module::Interface::FatalSimple(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); } -void Module::Interface::TransitionToFatalError(Kernel::HLERequestContext& ctx) { +void Module::Interface::ThrowFatalWithCpuContext(Kernel::HLERequestContext& ctx) { NGLOG_WARNING(Service_Fatal, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(RESULT_SUCCESS); From 536cfb13e6fb3ec5fb626d62784162b21569c073 Mon Sep 17 00:00:00 2001 From: greggameplayer <33609333+greggameplayer@users.noreply.github.com> Date: Fri, 18 May 2018 23:30:56 +0200 Subject: [PATCH 2/3] Properly update fatal.h void name --- src/core/hle/service/fatal/fatal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/hle/service/fatal/fatal.h b/src/core/hle/service/fatal/fatal.h index 2d8d08320..5bd111a14 100644 --- a/src/core/hle/service/fatal/fatal.h +++ b/src/core/hle/service/fatal/fatal.h @@ -14,8 +14,8 @@ public: public: Interface(std::shared_ptr module, const char* name); - void FatalSimple(Kernel::HLERequestContext& ctx); - void TransitionToFatalError(Kernel::HLERequestContext& ctx); + void ThrowFatalWithPolicy(Kernel::HLERequestContext& ctx); + void ThrowFatalWithCpuContext(Kernel::HLERequestContext& ctx); protected: std::shared_ptr module; From abe79b27241e73cf9531301fa4c88106ed042a80 Mon Sep 17 00:00:00 2001 From: greggameplayer <33609333+greggameplayer@users.noreply.github.com> Date: Fri, 18 May 2018 23:32:22 +0200 Subject: [PATCH 3/3] rename fatal:u functions & add ThrowFatal --- src/core/hle/service/fatal/fatal_u.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core/hle/service/fatal/fatal_u.cpp b/src/core/hle/service/fatal/fatal_u.cpp index 26aa9f3b7..f0631329e 100644 --- a/src/core/hle/service/fatal/fatal_u.cpp +++ b/src/core/hle/service/fatal/fatal_u.cpp @@ -8,8 +8,9 @@ namespace Service::Fatal { Fatal_U::Fatal_U(std::shared_ptr module) : Module::Interface(std::move(module), "fatal:u") { static const FunctionInfo functions[] = { - {1, &Fatal_U::FatalSimple, "FatalSimple"}, - {2, &Fatal_U::TransitionToFatalError, "TransitionToFatalError"}, + {0, nullptr, "ThrowFatal"}, + {1, &Fatal_U::ThrowFatalWithPolicy, "ThrowFatalWithPolicy"}, + {2, &Fatal_U::ThrowFatalWithCpuContext, "ThrowFatalWithCpuContext"}, }; RegisterHandlers(functions); }