diff options
| author | 2015-01-14 10:04:33 -0500 | |
|---|---|---|
| committer | 2015-01-14 10:04:33 -0500 | |
| commit | 394d44cf7480da210f5aeac9c0d86462b0c36d57 (patch) | |
| tree | 47c2fee9bbf771240c3b2b34505a9710a9b421b8 /src/core/hle/svc.cpp | |
| parent | Merge pull request #473 from archshift/pp3ports (diff) | |
| parent | AddrArbiter: Implement arbitration types 3 and 4. (diff) | |
| download | yuzu-394d44cf7480da210f5aeac9c0d86462b0c36d57.tar.gz yuzu-394d44cf7480da210f5aeac9c0d86462b0c36d57.tar.xz yuzu-394d44cf7480da210f5aeac9c0d86462b0c36d57.zip | |
Merge pull request #480 from Subv/arb_2
AddrArbiter: Implement arbitration types 3 and 4.
Diffstat (limited to 'src/core/hle/svc.cpp')
| -rw-r--r-- | src/core/hle/svc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index 5c6a3be80..a487f757c 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp | |||
| @@ -194,7 +194,7 @@ static Result ArbitrateAddress(Handle arbiter, u32 address, u32 type, u32 value, | |||
| 194 | LOG_TRACE(Kernel_SVC, "called handle=0x%08X, address=0x%08X, type=0x%08X, value=0x%08X", arbiter, | 194 | LOG_TRACE(Kernel_SVC, "called handle=0x%08X, address=0x%08X, type=0x%08X, value=0x%08X", arbiter, |
| 195 | address, type, value); | 195 | address, type, value); |
| 196 | return Kernel::ArbitrateAddress(arbiter, static_cast<Kernel::ArbitrationType>(type), | 196 | return Kernel::ArbitrateAddress(arbiter, static_cast<Kernel::ArbitrationType>(type), |
| 197 | address, value).raw; | 197 | address, value, nanoseconds).raw; |
| 198 | } | 198 | } |
| 199 | 199 | ||
| 200 | /// Used to output a message on a debug hardware unit - does nothing on a retail unit | 200 | /// Used to output a message on a debug hardware unit - does nothing on a retail unit |