diff options
author | bunnei <bunneidev@gmail.com> | 2017-05-26 17:59:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-26 17:59:57 +0200 |
commit | 61decd84cc5308bded75eae62c3247a66b3698d8 (patch) | |
tree | bbe05121af1a971bc295cb81baeea63f8c54f407 /src/core/hle/kernel/address_arbiter.cpp | |
parent | Merge pull request #2697 from wwylele/proctex (diff) | |
parent | FS: Remove unused result definition (diff) | |
download | yuzu-61decd84cc5308bded75eae62c3247a66b3698d8.tar yuzu-61decd84cc5308bded75eae62c3247a66b3698d8.tar.gz yuzu-61decd84cc5308bded75eae62c3247a66b3698d8.tar.bz2 yuzu-61decd84cc5308bded75eae62c3247a66b3698d8.tar.lz yuzu-61decd84cc5308bded75eae62c3247a66b3698d8.tar.xz yuzu-61decd84cc5308bded75eae62c3247a66b3698d8.tar.zst yuzu-61decd84cc5308bded75eae62c3247a66b3698d8.zip |
Diffstat (limited to 'src/core/hle/kernel/address_arbiter.cpp')
-rw-r--r-- | src/core/hle/kernel/address_arbiter.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/hle/kernel/address_arbiter.cpp b/src/core/hle/kernel/address_arbiter.cpp index 01fab123e..776d342f0 100644 --- a/src/core/hle/kernel/address_arbiter.cpp +++ b/src/core/hle/kernel/address_arbiter.cpp @@ -5,6 +5,7 @@ #include "common/common_types.h" #include "common/logging/log.h" #include "core/hle/kernel/address_arbiter.h" +#include "core/hle/kernel/errors.h" #include "core/hle/kernel/thread.h" #include "core/memory.h" @@ -74,8 +75,7 @@ ResultCode AddressArbiter::ArbitrateAddress(ArbitrationType type, VAddr address, default: LOG_ERROR(Kernel, "unknown type=%d", type); - return ResultCode(ErrorDescription::InvalidEnumValue, ErrorModule::Kernel, - ErrorSummary::WrongArgument, ErrorLevel::Usage); + return ERR_INVALID_ENUM_VALUE_FND; } // The calls that use a timeout seem to always return a Timeout error even if they did not put @@ -83,8 +83,7 @@ ResultCode AddressArbiter::ArbitrateAddress(ArbitrationType type, VAddr address, if (type == ArbitrationType::WaitIfLessThanWithTimeout || type == ArbitrationType::DecrementAndWaitIfLessThanWithTimeout) { - return ResultCode(ErrorDescription::Timeout, ErrorModule::OS, ErrorSummary::StatusChanged, - ErrorLevel::Info); + return RESULT_TIMEOUT; } return RESULT_SUCCESS; } |