yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #2133 from lioncash/arbiter 

address_arbiter: Use nested namespaces where applicable
This commit is contained in:
bunnei 2019-02-16 15:37:21 -05:00 committed by GitHub
parent 4699fdca8f 0113c36300
commit e869c5ef1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/hle/kernel/address_arbiter.cpp
View File

@ -17,8 +17,7 @@
#include "core/hle/result.h" #include "core/hle/result.h"
#include "core/memory.h" #include "core/memory.h"
namespace Kernel { namespace Kernel::AddressArbiter {
namespace AddressArbiter {
// Performs actual address waiting logic. // Performs actual address waiting logic.
static ResultCode WaitForAddress(VAddr address, s64 timeout) { static ResultCode WaitForAddress(VAddr address, s64 timeout) {
@ -176,5 +175,4 @@ ResultCode WaitForAddressIfEqual(VAddr address, s32 value, s64 timeout) {
return WaitForAddress(address, timeout); return WaitForAddress(address, timeout);
} }
} // namespace AddressArbiter } // namespace Kernel::AddressArbiter
} // namespace Kernel

6
src/core/hle/kernel/address_arbiter.h
View File

@ -8,9 +8,8 @@
union ResultCode; union ResultCode;
namespace Kernel { namespace Kernel::AddressArbiter {
namespace AddressArbiter {
enum class ArbitrationType { enum class ArbitrationType {
WaitIfLessThan = 0, WaitIfLessThan = 0,
DecrementAndWaitIfLessThan = 1, DecrementAndWaitIfLessThan = 1,
@ -29,6 +28,5 @@ ResultCode ModifyByWaitingCountAndSignalToAddressIfEqual(VAddr address, s32 valu
ResultCode WaitForAddressIfLessThan(VAddr address, s32 value, s64 timeout, bool should_decrement); ResultCode WaitForAddressIfLessThan(VAddr address, s32 value, s64 timeout, bool should_decrement);
ResultCode WaitForAddressIfEqual(VAddr address, s32 value, s64 timeout); ResultCode WaitForAddressIfEqual(VAddr address, s32 value, s64 timeout);
} // namespace AddressArbiter
} // namespace Kernel } // namespace Kernel::AddressArbiter