diff options
| author | Lioncash <mathew1800@gmail.com> | 2019-03-10 23:23:39 +0100 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2019-03-10 23:23:42 +0100 |
| commit | d870cc5ad710b04fae15baee85e0fa0f4df1e8a0 (patch) | |
| tree | 74175f4eff4fa6cd305d66a723cc5b422cccd563 /src/core | |
| parent | Merge pull request #2207 from lioncash/hwopus (diff) | |
| download | yuzu-d870cc5ad710b04fae15baee85e0fa0f4df1e8a0.tar yuzu-d870cc5ad710b04fae15baee85e0fa0f4df1e8a0.tar.gz yuzu-d870cc5ad710b04fae15baee85e0fa0f4df1e8a0.tar.bz2 yuzu-d870cc5ad710b04fae15baee85e0fa0f4df1e8a0.tar.lz yuzu-d870cc5ad710b04fae15baee85e0fa0f4df1e8a0.tar.xz yuzu-d870cc5ad710b04fae15baee85e0fa0f4df1e8a0.tar.zst yuzu-d870cc5ad710b04fae15baee85e0fa0f4df1e8a0.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/ipc_helpers.h | 3 | ||||
| -rw-r--r-- | src/core/hle/result.h | 1 | ||||
| -rw-r--r-- | src/core/hle/service/service.cpp | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/core/hle/ipc_helpers.h b/src/core/hle/ipc_helpers.h index 079283830..fc997c3b7 100644 --- a/src/core/hle/ipc_helpers.h +++ b/src/core/hle/ipc_helpers.h @@ -19,9 +19,12 @@ #include "core/hle/kernel/hle_ipc.h" #include "core/hle/kernel/object.h" #include "core/hle/kernel/server_session.h" +#include "core/hle/result.h" namespace IPC { +constexpr ResultCode ERR_REMOTE_PROCESS_DEAD{ErrorModule::HIPC, 301}; + class RequestHelperBase { protected: Kernel::HLERequestContext* context = nullptr; diff --git a/src/core/hle/result.h b/src/core/hle/result.h index 1ed144481..9f6ac39e6 100644 --- a/src/core/hle/result.h +++ b/src/core/hle/result.h @@ -17,7 +17,6 @@ */ enum class ErrorDescription : u32 { Success = 0, - RemoteProcessDead = 301, }; /** diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index 117f87a45..bd56cc7bf 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp @@ -11,7 +11,6 @@ #include "core/hle/ipc.h" #include "core/hle/ipc_helpers.h" #include "core/hle/kernel/client_port.h" -#include "core/hle/kernel/handle_table.h" #include "core/hle/kernel/kernel.h" #include "core/hle/kernel/process.h" #include "core/hle/kernel/server_port.h" @@ -169,7 +168,7 @@ ResultCode ServiceFrameworkBase::HandleSyncRequest(Kernel::HLERequestContext& co case IPC::CommandType::Close: { IPC::ResponseBuilder rb{context, 2}; rb.Push(RESULT_SUCCESS); - return ResultCode(ErrorModule::HIPC, ErrorDescription::RemoteProcessDead); + return IPC::ERR_REMOTE_PROCESS_DEAD; } case IPC::CommandType::ControlWithContext: case IPC::CommandType::Control: { |