diff options
| author | Lioncash <mathew1800@gmail.com> | 2019-03-05 17:54:06 +0100 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2019-03-05 18:58:26 +0100 |
| commit | ec6664f6d61f46569a2686b864ba3e9a0f85fc60 (patch) | |
| tree | 67a78607f085efd3e4258fd90afd2aa2036d0448 /src/core/hle/kernel/svc.cpp | |
| parent | Merge pull request #2185 from FearlessTobi/port-4630 (diff) | |
| download | yuzu-ec6664f6d61f46569a2686b864ba3e9a0f85fc60.tar yuzu-ec6664f6d61f46569a2686b864ba3e9a0f85fc60.tar.gz yuzu-ec6664f6d61f46569a2686b864ba3e9a0f85fc60.tar.bz2 yuzu-ec6664f6d61f46569a2686b864ba3e9a0f85fc60.tar.lz yuzu-ec6664f6d61f46569a2686b864ba3e9a0f85fc60.tar.xz yuzu-ec6664f6d61f46569a2686b864ba3e9a0f85fc60.tar.zst yuzu-ec6664f6d61f46569a2686b864ba3e9a0f85fc60.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index c5d399bab..b7546087e 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -1495,13 +1495,14 @@ static ResultCode WaitForAddress(VAddr address, u32 type, s32 value, s64 timeout return ERR_INVALID_ADDRESS; } + auto& address_arbiter = Core::System::GetInstance().Kernel().AddressArbiter(); switch (static_cast<AddressArbiter::ArbitrationType>(type)) { case AddressArbiter::ArbitrationType::WaitIfLessThan: - return AddressArbiter::WaitForAddressIfLessThan(address, value, timeout, false); + return address_arbiter.WaitForAddressIfLessThan(address, value, timeout, false); case AddressArbiter::ArbitrationType::DecrementAndWaitIfLessThan: - return AddressArbiter::WaitForAddressIfLessThan(address, value, timeout, true); + return address_arbiter.WaitForAddressIfLessThan(address, value, timeout, true); case AddressArbiter::ArbitrationType::WaitIfEqual: - return AddressArbiter::WaitForAddressIfEqual(address, value, timeout); + return address_arbiter.WaitForAddressIfEqual(address, value, timeout); default: LOG_ERROR(Kernel_SVC, "Invalid arbitration type, expected WaitIfLessThan, DecrementAndWaitIfLessThan " @@ -1526,13 +1527,14 @@ static ResultCode SignalToAddress(VAddr address, u32 type, s32 value, s32 num_to return ERR_INVALID_ADDRESS; } + auto& address_arbiter = Core::System::GetInstance().Kernel().AddressArbiter(); switch (static_cast<AddressArbiter::SignalType>(type)) { case AddressArbiter::SignalType::Signal: - return AddressArbiter::SignalToAddress(address, num_to_wake); + return address_arbiter.SignalToAddress(address, num_to_wake); case AddressArbiter::SignalType::IncrementAndSignalIfEqual: - return AddressArbiter::IncrementAndSignalToAddressIfEqual(address, value, num_to_wake); + return address_arbiter.IncrementAndSignalToAddressIfEqual(address, value, num_to_wake); case AddressArbiter::SignalType::ModifyByWaitingCountAndSignalIfEqual: - return AddressArbiter::ModifyByWaitingCountAndSignalToAddressIfEqual(address, value, + return address_arbiter.ModifyByWaitingCountAndSignalToAddressIfEqual(address, value, num_to_wake); default: LOG_ERROR(Kernel_SVC, |