diff options
author | Liam <byteslice@airmail.cc> | 2023-02-05 20:22:02 +0100 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2023-02-07 05:57:44 +0100 |
commit | 2415d37ea296e8856267375989a8b95cebe2575a (patch) | |
tree | 376baf5952a8ccc15b445702d38c056ffa71dd1b /src/core/hle/kernel/svc/svc_address_arbiter.cpp | |
parent | Merge pull request #9731 from liamwhite/svc-move-only (diff) | |
download | yuzu-2415d37ea296e8856267375989a8b95cebe2575a.tar yuzu-2415d37ea296e8856267375989a8b95cebe2575a.tar.gz yuzu-2415d37ea296e8856267375989a8b95cebe2575a.tar.bz2 yuzu-2415d37ea296e8856267375989a8b95cebe2575a.tar.lz yuzu-2415d37ea296e8856267375989a8b95cebe2575a.tar.xz yuzu-2415d37ea296e8856267375989a8b95cebe2575a.tar.zst yuzu-2415d37ea296e8856267375989a8b95cebe2575a.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/svc/svc_address_arbiter.cpp | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/core/hle/kernel/svc/svc_address_arbiter.cpp b/src/core/hle/kernel/svc/svc_address_arbiter.cpp index 842107726..e6a5d2ae5 100644 --- a/src/core/hle/kernel/svc/svc_address_arbiter.cpp +++ b/src/core/hle/kernel/svc/svc_address_arbiter.cpp @@ -75,12 +75,6 @@ Result WaitForAddress(Core::System& system, VAddr address, ArbitrationType arb_t return system.Kernel().CurrentProcess()->WaitAddressArbiter(address, arb_type, value, timeout); } -Result WaitForAddress32(Core::System& system, u32 address, ArbitrationType arb_type, s32 value, - u32 timeout_ns_low, u32 timeout_ns_high) { - const auto timeout = static_cast<s64>(timeout_ns_low | (u64{timeout_ns_high} << 32)); - return WaitForAddress(system, address, arb_type, value, timeout); -} - // Signals to an address (via Address Arbiter) Result SignalToAddress(Core::System& system, VAddr address, SignalType signal_type, s32 value, s32 count) { @@ -105,9 +99,24 @@ Result SignalToAddress(Core::System& system, VAddr address, SignalType signal_ty count); } -Result SignalToAddress32(Core::System& system, u32 address, SignalType signal_type, s32 value, +Result WaitForAddress64(Core::System& system, VAddr address, ArbitrationType arb_type, s32 value, + s64 timeout_ns) { + return WaitForAddress(system, address, arb_type, value, timeout_ns); +} + +Result SignalToAddress64(Core::System& system, VAddr address, SignalType signal_type, s32 value, s32 count) { return SignalToAddress(system, address, signal_type, value, count); } +Result WaitForAddress64From32(Core::System& system, u32 address, ArbitrationType arb_type, + s32 value, s64 timeout_ns) { + return WaitForAddress(system, address, arb_type, value, timeout_ns); +} + +Result SignalToAddress64From32(Core::System& system, u32 address, SignalType signal_type, s32 value, + s32 count) { + return SignalToAddress(system, address, signal_type, value, count); +} + } // namespace Kernel::Svc |