From 05a3b480b47fe78d576f60ae011d76e6b63b04e2 Mon Sep 17 00:00:00 2001 From: Alex Barney Date: Tue, 30 Oct 2018 14:56:58 -0500 Subject: [PATCH] Fix alignment from last commit's renaming --- ChocolArm64/Translator.cs | 2 +- Ryujinx.Graphics/Texture/TextureHelper.cs | 2 +- Ryujinx.HLE/HOS/Homebrew.cs | 10 +++--- Ryujinx.HLE/HOS/Ipc/IpcHandler.cs | 12 +++---- Ryujinx.HLE/HOS/Kernel/KAddressArbiter.cs | 24 +++++++------- Ryujinx.HLE/HOS/Kernel/SvcHandler.cs | 6 ++-- Ryujinx.HLE/HOS/ServiceCtx.cs | 32 +++++++++---------- .../Aud/AudioRenderer/IAudioRenderer.cs | 2 +- Ryujinx.Tests/Cpu/CpuTest.cs | 2 +- 9 files changed, 46 insertions(+), 46 deletions(-) diff --git a/ChocolArm64/Translator.cs b/ChocolArm64/Translator.cs index 3f88b1d472..4e89d71c7d 100644 --- a/ChocolArm64/Translator.cs +++ b/ChocolArm64/Translator.cs @@ -27,7 +27,7 @@ namespace ChocolArm64 //when both ISAs are implemented with the interpreter and JIT. //As of now, A32 only has a interpreter and A64 a JIT. CpuThreadState state = thread.ThreadState; - MemoryManager memory = thread.Memory; + MemoryManager memory = thread.Memory; if (state.ExecutionMode == ExecutionMode.AArch32) { diff --git a/Ryujinx.Graphics/Texture/TextureHelper.cs b/Ryujinx.Graphics/Texture/TextureHelper.cs index 5ba71f89b6..6ac91d8b59 100644 --- a/Ryujinx.Graphics/Texture/TextureHelper.cs +++ b/Ryujinx.Graphics/Texture/TextureHelper.cs @@ -29,7 +29,7 @@ namespace Ryujinx.Graphics.Texture public static (MemoryManager Memory, long Position) GetMemoryAndPosition( IMemory Memory, - long Position) + long Position) { if (Memory is NvGpuVmm Vmm) { diff --git a/Ryujinx.HLE/HOS/Homebrew.cs b/Ryujinx.HLE/HOS/Homebrew.cs index 2216d74998..ffb22c7f5c 100644 --- a/Ryujinx.HLE/HOS/Homebrew.cs +++ b/Ryujinx.HLE/HOS/Homebrew.cs @@ -32,11 +32,11 @@ namespace Ryujinx.HLE.HOS private static void WriteConfigEntry( MemoryManager Memory, - ref long Position, - int Key, - int Flags = 0, - long Value0 = 0, - long Value1 = 0) + ref long Position, + int Key, + int Flags = 0, + long Value0 = 0, + long Value1 = 0) { Memory.WriteInt32(Position + 0x00, Key); Memory.WriteInt32(Position + 0x04, Flags); diff --git a/Ryujinx.HLE/HOS/Ipc/IpcHandler.cs b/Ryujinx.HLE/HOS/Ipc/IpcHandler.cs index d3eb9ec43d..ec27a6eaf9 100644 --- a/Ryujinx.HLE/HOS/Ipc/IpcHandler.cs +++ b/Ryujinx.HLE/HOS/Ipc/IpcHandler.cs @@ -8,12 +8,12 @@ namespace Ryujinx.HLE.HOS.Ipc static class IpcHandler { public static long IpcCall( - Switch Ns, - Process Process, - MemoryManager Memory, - KSession Session, - IpcMessage Request, - long CmdPtr) + Switch Ns, + Process Process, + MemoryManager Memory, + KSession Session, + IpcMessage Request, + long CmdPtr) { IpcMessage Response = new IpcMessage(); diff --git a/Ryujinx.HLE/HOS/Kernel/KAddressArbiter.cs b/Ryujinx.HLE/HOS/Kernel/KAddressArbiter.cs index b6a0f6d2d6..4a0f955fe3 100644 --- a/Ryujinx.HLE/HOS/Kernel/KAddressArbiter.cs +++ b/Ryujinx.HLE/HOS/Kernel/KAddressArbiter.cs @@ -24,11 +24,11 @@ namespace Ryujinx.HLE.HOS.Kernel } public long ArbitrateLock( - Process Process, + Process Process, MemoryManager Memory, - int OwnerHandle, - long MutexAddress, - int RequesterHandle) + int OwnerHandle, + long MutexAddress, + int RequesterHandle) { System.CriticalSectionLock.Lock(); @@ -101,10 +101,10 @@ namespace Ryujinx.HLE.HOS.Kernel public long WaitProcessWideKeyAtomic( MemoryManager Memory, - long MutexAddress, - long CondVarAddress, - int ThreadHandle, - long Timeout) + long MutexAddress, + long CondVarAddress, + int ThreadHandle, + long Timeout) { System.CriticalSectionLock.Lock(); @@ -374,10 +374,10 @@ namespace Ryujinx.HLE.HOS.Kernel public long WaitForAddressIfLessThan( MemoryManager Memory, - long Address, - int Value, - bool ShouldDecrement, - long Timeout) + long Address, + int Value, + bool ShouldDecrement, + long Timeout) { KThread CurrentThread = System.Scheduler.GetCurrentThread(); diff --git a/Ryujinx.HLE/HOS/Kernel/SvcHandler.cs b/Ryujinx.HLE/HOS/Kernel/SvcHandler.cs index 7fc136690b..9b475d4ebf 100644 --- a/Ryujinx.HLE/HOS/Kernel/SvcHandler.cs +++ b/Ryujinx.HLE/HOS/Kernel/SvcHandler.cs @@ -14,9 +14,9 @@ namespace Ryujinx.HLE.HOS.Kernel private Dictionary SvcFuncs; - private Switch Device; - private Process Process; - private Horizon System; + private Switch Device; + private Process Process; + private Horizon System; private MemoryManager Memory; private struct HleIpcMessage diff --git a/Ryujinx.HLE/HOS/ServiceCtx.cs b/Ryujinx.HLE/HOS/ServiceCtx.cs index 09bc061699..a591673e2c 100644 --- a/Ryujinx.HLE/HOS/ServiceCtx.cs +++ b/Ryujinx.HLE/HOS/ServiceCtx.cs @@ -7,24 +7,24 @@ namespace Ryujinx.HLE.HOS { class ServiceCtx { - public Switch Device { get; private set; } - public Process Process { get; private set; } - public MemoryManager Memory { get; private set; } - public KSession Session { get; private set; } - public IpcMessage Request { get; private set; } - public IpcMessage Response { get; private set; } - public BinaryReader RequestData { get; private set; } - public BinaryWriter ResponseData { get; private set; } + public Switch Device { get; private set; } + public Process Process { get; private set; } + public MemoryManager Memory { get; private set; } + public KSession Session { get; private set; } + public IpcMessage Request { get; private set; } + public IpcMessage Response { get; private set; } + public BinaryReader RequestData { get; private set; } + public BinaryWriter ResponseData { get; private set; } public ServiceCtx( - Switch Device, - Process Process, - MemoryManager Memory, - KSession Session, - IpcMessage Request, - IpcMessage Response, - BinaryReader RequestData, - BinaryWriter ResponseData) + Switch Device, + Process Process, + MemoryManager Memory, + KSession Session, + IpcMessage Request, + IpcMessage Response, + BinaryReader RequestData, + BinaryWriter ResponseData) { this.Device = Device; this.Process = Process; diff --git a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/IAudioRenderer.cs b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/IAudioRenderer.cs index ee1736a2fb..aae45081be 100644 --- a/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/IAudioRenderer.cs +++ b/Ryujinx.HLE/HOS/Services/Aud/AudioRenderer/IAudioRenderer.cs @@ -42,7 +42,7 @@ namespace Ryujinx.HLE.HOS.Services.Aud.AudioRenderer public IAudioRenderer( Horizon System, - MemoryManager Memory, + MemoryManager Memory, IAalOutput AudioOut, AudioRendererParameter Params) { diff --git a/Ryujinx.Tests/Cpu/CpuTest.cs b/Ryujinx.Tests/Cpu/CpuTest.cs index 640d5bb842..c273e89de2 100644 --- a/Ryujinx.Tests/Cpu/CpuTest.cs +++ b/Ryujinx.Tests/Cpu/CpuTest.cs @@ -25,7 +25,7 @@ namespace Ryujinx.Tests.Cpu private IntPtr RamPointer; private MemoryManager Memory; - private CpuThread Thread; + private CpuThread Thread; private static bool UnicornAvailable; private UnicornAArch64 UnicornEmu;