diff options
| author | bunnei <bunneidev@gmail.com> | 2015-01-14 10:04:33 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-01-14 10:04:33 -0500 |
| commit | 394d44cf7480da210f5aeac9c0d86462b0c36d57 (patch) | |
| tree | 47c2fee9bbf771240c3b2b34505a9710a9b421b8 /src/core/hle/kernel/address_arbiter.h | |
| parent | 93f36c49f78ede924cce68375554d8418ae638af (diff) | |
| parent | 9e2ae289b8b269bfe2835356780c160dbccc18f4 (diff) | |
Merge pull request #480 from Subv/arb_2
AddrArbiter: Implement arbitration types 3 and 4.
Diffstat (limited to 'src/core/hle/kernel/address_arbiter.h')
| -rw-r--r-- | src/core/hle/kernel/address_arbiter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/address_arbiter.h b/src/core/hle/kernel/address_arbiter.h index 030e7ad7b..3ffd465a2 100644 --- a/src/core/hle/kernel/address_arbiter.h +++ b/src/core/hle/kernel/address_arbiter.h @@ -28,7 +28,7 @@ enum class ArbitrationType : u32 { }; /// Arbitrate an address -ResultCode ArbitrateAddress(Handle handle, ArbitrationType type, u32 address, s32 value); +ResultCode ArbitrateAddress(Handle handle, ArbitrationType type, u32 address, s32 value, u64 nanoseconds); /// Create an address arbiter Handle CreateAddressArbiter(const std::string& name = "Unknown"); |