diff options
author | bunnei <bunneidev@gmail.com> | 2018-05-21 05:42:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-21 05:42:57 +0200 |
commit | ff54287a734a70a0e1148b720023708b52a328e0 (patch) | |
tree | 8b6664e989366754bab7da922b21652d1a6bafe2 /src/core/hle/service | |
parent | Merge pull request #453 from Subv/thread_callstack (diff) | |
parent | rename fatal:u functions & add ThrowFatal (diff) | |
download | yuzu-ff54287a734a70a0e1148b720023708b52a328e0.tar yuzu-ff54287a734a70a0e1148b720023708b52a328e0.tar.gz yuzu-ff54287a734a70a0e1148b720023708b52a328e0.tar.bz2 yuzu-ff54287a734a70a0e1148b720023708b52a328e0.tar.lz yuzu-ff54287a734a70a0e1148b720023708b52a328e0.tar.xz yuzu-ff54287a734a70a0e1148b720023708b52a328e0.tar.zst yuzu-ff54287a734a70a0e1148b720023708b52a328e0.zip |
Diffstat (limited to 'src/core/hle/service')
-rw-r--r-- | src/core/hle/service/fatal/fatal.cpp | 4 | ||||
-rw-r--r-- | src/core/hle/service/fatal/fatal.h | 4 | ||||
-rw-r--r-- | src/core/hle/service/fatal/fatal_u.cpp | 5 |
3 files changed, 7 insertions, 6 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> 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<u32>(); 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); 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> 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> module; 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) : 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); } |