2 files changed, 27 insertions, 21 deletions

diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 2d8fa6070..95ce2205a 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -693,7 +693,7 @@ static ResultCode SignalProcessWideKey(VAddr condition_variable_addr, s32 target
 // Wait for an address (via Address Arbiter)
 static ResultCode WaitForAddress(VAddr address, u32 type, s32 value, s64 timeout) {
     NGLOG_WARNING(Kernel_SVC, "called, address=0x{:X}, type=0x{:X}, value=0x{:X}, timeout={}",
-        address, type, value, timeout);
+                  address, type, value, timeout);
     // If the passed address is a kernel virtual address, return invalid memory state.
     if ((address + 0x8000000000LL) < 0x7FFFE00000LL) {
         return ERR_INVALID_ADDRESS_STATE;
@@ -704,21 +704,22 @@ static ResultCode WaitForAddress(VAddr address, u32 type, s32 value, s64 timeout
     }
 
     switch ((AddressArbiter::ArbitrationType)type) {
-        case AddressArbiter::ArbitrationType::WaitIfLessThan:
-            return AddressArbiter::WaitForAddressIfLessThan(address, value, timeout, false);
-        case AddressArbiter::ArbitrationType::DecrementAndWaitIfLessThan:
-            return AddressArbiter::WaitForAddressIfLessThan(address, value, timeout, true);
-        case AddressArbiter::ArbitrationType::WaitIfEqual:
-            return AddressArbiter::WaitForAddressIfEqual(address, value, timeout);
-        default:
-            return ERR_INVALID_ENUM_VALUE;
+    case AddressArbiter::ArbitrationType::WaitIfLessThan:
+        return AddressArbiter::WaitForAddressIfLessThan(address, value, timeout, false);
+    case AddressArbiter::ArbitrationType::DecrementAndWaitIfLessThan:
+        return AddressArbiter::WaitForAddressIfLessThan(address, value, timeout, true);
+    case AddressArbiter::ArbitrationType::WaitIfEqual:
+        return AddressArbiter::WaitForAddressIfEqual(address, value, timeout);
+    default:
+        return ERR_INVALID_ENUM_VALUE;
     }
 }
 
 // Signals to an address (via Address Arbiter)
 static ResultCode SignalToAddress(VAddr address, u32 type, s32 value, s32 num_to_wake) {
-    NGLOG_WARNING(Kernel_SVC, "called, address=0x{:X}, type=0x{:X}, value=0x{:X}, num_to_wake=0x{:X}",
-        address, type, value, num_to_wake);
+    NGLOG_WARNING(Kernel_SVC,
+                  "called, address=0x{:X}, type=0x{:X}, value=0x{:X}, num_to_wake=0x{:X}", address,
+                  type, value, num_to_wake);
     // If the passed address is a kernel virtual address, return invalid memory state.
     if ((address + 0x8000000000LL) < 0x7FFFE00000LL) {
         return ERR_INVALID_ADDRESS_STATE;
@@ -729,14 +730,15 @@ static ResultCode SignalToAddress(VAddr address, u32 type, s32 value, s32 num_to
     }
 
     switch ((AddressArbiter::SignalType)type) {
-        case AddressArbiter::SignalType::Signal:
-            return AddressArbiter::SignalToAddress(address, num_to_wake);
-        case AddressArbiter::SignalType::IncrementAndSignalIfEqual:
-            return AddressArbiter::IncrementAndSignalToAddressIfEqual(address, value, num_to_wake);
-        case AddressArbiter::SignalType::ModifyByWaitingCountAndSignalIfEqual:
-            return AddressArbiter::ModifyByWaitingCountAndSignalToAddressIfEqual(address, value, num_to_wake);
-        default:
-            return ERR_INVALID_ENUM_VALUE;
+    case AddressArbiter::SignalType::Signal:
+        return AddressArbiter::SignalToAddress(address, num_to_wake);
+    case AddressArbiter::SignalType::IncrementAndSignalIfEqual:
+        return AddressArbiter::IncrementAndSignalToAddressIfEqual(address, value, num_to_wake);
+    case AddressArbiter::SignalType::ModifyByWaitingCountAndSignalIfEqual:
+        return AddressArbiter::ModifyByWaitingCountAndSignalToAddressIfEqual(address, value,
+                                                                             num_to_wake);
+    default:
+        return ERR_INVALID_ENUM_VALUE;
     }
 }
 
diff --git a/src/core/hle/kernel/svc_wrap.h b/src/core/hle/kernel/svc_wrap.h
index efae4fdfe..79c3fe31b 100644
--- a/src/core/hle/kernel/svc_wrap.h
+++ b/src/core/hle/kernel/svc_wrap.h
@@ -181,12 +181,16 @@ void SvcWrap() {
 
 template <ResultCode func(u64, u32, s32, s64)>
 void SvcWrap() {
-    FuncReturn(func(PARAM(0), (u32)(PARAM(1) & 0xFFFFFFFF), (s32)(PARAM(2) & 0xFFFFFFFF), (s64)PARAM(3)).raw);
+    FuncReturn(
+        func(PARAM(0), (u32)(PARAM(1) & 0xFFFFFFFF), (s32)(PARAM(2) & 0xFFFFFFFF), (s64)PARAM(3))
+            .raw);
 }
 
 template <ResultCode func(u64, u32, s32, s32)>
 void SvcWrap() {
-    FuncReturn(func(PARAM(0), (u32)(PARAM(1) & 0xFFFFFFFF), (s32)(PARAM(2) & 0xFFFFFFFF), (s32)(PARAM(3) & 0xFFFFFFFF)).raw);
+    FuncReturn(func(PARAM(0), (u32)(PARAM(1) & 0xFFFFFFFF), (s32)(PARAM(2) & 0xFFFFFFFF),
+                    (s32)(PARAM(3) & 0xFFFFFFFF))
+                   .raw);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////