diff options
| author | 2021-02-13 10:43:01 +1100 | |
|---|---|---|
| committer | 2021-02-12 15:43:01 -0800 | |
| commit | 37939482fb93d2155d8625596f2b1145d4f6e8e3 (patch) | |
| tree | 0c18a00c0f9be5cc87b50ff46c439765d9f7db46 /src/core/hle/kernel/process.cpp | |
| parent | Merge pull request #5902 from lioncash/core-warn (diff) | |
| download | yuzu-37939482fb93d2155d8625596f2b1145d4f6e8e3.tar.gz yuzu-37939482fb93d2155d8625596f2b1145d4f6e8e3.tar.xz yuzu-37939482fb93d2155d8625596f2b1145d4f6e8e3.zip | |
kernel: Unify result codes (#5890)
* kernel: Unify result codes
Drop the usage of ERR_NAME convention in kernel for ResultName. Removed seperation between svc_results.h & errors.h as we mainly include both most of the time anyways.
* oops
* rename errors to svc_results
Diffstat (limited to 'src/core/hle/kernel/process.cpp')
| -rw-r--r-- | src/core/hle/kernel/process.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index 2286b292d..39dc3898a 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include "core/device_memory.h" | 14 | #include "core/device_memory.h" |
| 15 | #include "core/file_sys/program_metadata.h" | 15 | #include "core/file_sys/program_metadata.h" |
| 16 | #include "core/hle/kernel/code_set.h" | 16 | #include "core/hle/kernel/code_set.h" |
| 17 | #include "core/hle/kernel/errors.h" | ||
| 18 | #include "core/hle/kernel/k_resource_limit.h" | 17 | #include "core/hle/kernel/k_resource_limit.h" |
| 19 | #include "core/hle/kernel/k_scheduler.h" | 18 | #include "core/hle/kernel/k_scheduler.h" |
| 20 | #include "core/hle/kernel/k_thread.h" | 19 | #include "core/hle/kernel/k_thread.h" |
| @@ -248,8 +247,8 @@ ResultCode Process::Reset() { | |||
| 248 | KScopedSchedulerLock sl{kernel}; | 247 | KScopedSchedulerLock sl{kernel}; |
| 249 | 248 | ||
| 250 | // Validate that we're in a state that we can reset. | 249 | // Validate that we're in a state that we can reset. |
| 251 | R_UNLESS(status != ProcessStatus::Exited, Svc::ResultInvalidState); | 250 | R_UNLESS(status != ProcessStatus::Exited, ResultInvalidState); |
| 252 | R_UNLESS(is_signaled, Svc::ResultInvalidState); | 251 | R_UNLESS(is_signaled, ResultInvalidState); |
| 253 | 252 | ||
| 254 | // Clear signaled. | 253 | // Clear signaled. |
| 255 | is_signaled = false; | 254 | is_signaled = false; |