mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-21 13:03:22 +02:00
Merge pull request #2133 from lioncash/arbiter
address_arbiter: Use nested namespaces where applicable
This commit is contained in:
commit
e869c5ef1a
@ -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
|
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user