summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/address_arbiter.cpp6
-rw-r--r--src/core/hle/kernel/address_arbiter.h6
2 files changed, 4 insertions, 8 deletions
diff --git a/src/core/hle/kernel/address_arbiter.cpp b/src/core/hle/kernel/address_arbiter.cpp
index 57157beb4..a250d088d 100644
--- a/src/core/hle/kernel/address_arbiter.cpp
+++ b/src/core/hle/kernel/address_arbiter.cpp
@@ -17,8 +17,7 @@
17#include "core/hle/result.h" 17#include "core/hle/result.h"
18#include "core/memory.h" 18#include "core/memory.h"
19 19
20namespace Kernel { 20namespace Kernel::AddressArbiter {
21namespace AddressArbiter {
22 21
23// Performs actual address waiting logic. 22// Performs actual address waiting logic.
24static ResultCode WaitForAddress(VAddr address, s64 timeout) { 23static ResultCode WaitForAddress(VAddr address, s64 timeout) {
@@ -176,5 +175,4 @@ ResultCode WaitForAddressIfEqual(VAddr address, s32 value, s64 timeout) {
176 175
177 return WaitForAddress(address, timeout); 176 return WaitForAddress(address, timeout);
178} 177}
179} // namespace AddressArbiter 178} // namespace Kernel::AddressArbiter
180} // namespace Kernel
diff --git a/src/core/hle/kernel/address_arbiter.h b/src/core/hle/kernel/address_arbiter.h
index e3657b8e9..b58f21bec 100644
--- a/src/core/hle/kernel/address_arbiter.h
+++ b/src/core/hle/kernel/address_arbiter.h
@@ -8,9 +8,8 @@
8 8
9union ResultCode; 9union ResultCode;
10 10
11namespace Kernel { 11namespace Kernel::AddressArbiter {
12 12
13namespace AddressArbiter {
14enum class ArbitrationType { 13enum class ArbitrationType {
15 WaitIfLessThan = 0, 14 WaitIfLessThan = 0,
16 DecrementAndWaitIfLessThan = 1, 15 DecrementAndWaitIfLessThan = 1,
@@ -29,6 +28,5 @@ ResultCode ModifyByWaitingCountAndSignalToAddressIfEqual(VAddr address, s32 valu
29 28
30ResultCode WaitForAddressIfLessThan(VAddr address, s32 value, s64 timeout, bool should_decrement); 29ResultCode WaitForAddressIfLessThan(VAddr address, s32 value, s64 timeout, bool should_decrement);
31ResultCode WaitForAddressIfEqual(VAddr address, s32 value, s64 timeout); 30ResultCode WaitForAddressIfEqual(VAddr address, s32 value, s64 timeout);
32} // namespace AddressArbiter
33 31
34} // namespace Kernel 32} // namespace Kernel::AddressArbiter