summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-02-16 18:41:28 +0100
committerLioncash <mathew1800@gmail.com>2019-02-16 18:41:30 +0100
commit0113c36300202370b53c89b85375f6b1b3ea6f08 (patch)
treeffa81e80104a0d0ff264664801347ead1c4a8a57 /src/core/hle/kernel
parentMerge pull request #2123 from lioncash/coretiming-global (diff)
downloadyuzu-0113c36300202370b53c89b85375f6b1b3ea6f08.tar
yuzu-0113c36300202370b53c89b85375f6b1b3ea6f08.tar.gz
yuzu-0113c36300202370b53c89b85375f6b1b3ea6f08.tar.bz2
yuzu-0113c36300202370b53c89b85375f6b1b3ea6f08.tar.lz
yuzu-0113c36300202370b53c89b85375f6b1b3ea6f08.tar.xz
yuzu-0113c36300202370b53c89b85375f6b1b3ea6f08.tar.zst
yuzu-0113c36300202370b53c89b85375f6b1b3ea6f08.zip
Diffstat (limited to 'src/core/hle/kernel')
-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 @@
#include "core/hle/result.h"
#include "core/memory.h"
-namespace Kernel {
-namespace AddressArbiter {
+namespace Kernel::AddressArbiter {
// Performs actual address waiting logic.
static ResultCode WaitForAddress(VAddr address, s64 timeout) {
@@ -176,5 +175,4 @@ ResultCode WaitForAddressIfEqual(VAddr address, s32 value, s64 timeout) {
return WaitForAddress(address, timeout);
}
-} // namespace AddressArbiter
-} // namespace Kernel
+} // namespace Kernel::AddressArbiter
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 @@
union ResultCode;
-namespace Kernel {
+namespace Kernel::AddressArbiter {
-namespace AddressArbiter {
enum class ArbitrationType {
WaitIfLessThan = 0,
DecrementAndWaitIfLessThan = 1,
@@ -29,6 +28,5 @@ ResultCode ModifyByWaitingCountAndSignalToAddressIfEqual(VAddr address, s32 valu
ResultCode WaitForAddressIfLessThan(VAddr address, s32 value, s64 timeout, bool should_decrement);
ResultCode WaitForAddressIfEqual(VAddr address, s32 value, s64 timeout);
-} // namespace AddressArbiter
-} // namespace Kernel
+} // namespace Kernel::AddressArbiter