aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.HLE/HOS/Kernel/Ipc
diff options
context:
space:
mode:
authorAlex Barney <thealexbarney@gmail.com>2019-07-01 21:39:22 -0500
committerAc_K <Acoustik666@gmail.com>2019-07-02 04:39:22 +0200
commitb2b736abc2569ab5d8199da666aef8d8394844a0 (patch)
tree88bcc2ae4fb0d4161c95df2cd7edb12388de922a /Ryujinx.HLE/HOS/Kernel/Ipc
parent10c74182babaf8cf6bedaeffd64c3109df4ea816 (diff)
Misc cleanup (#708)
* Fix typos * Remove unneeded using statements * Enforce var style more * Remove redundant qualifiers * Fix some indentation * Disable naming warnings on files with external enum names * Fix build * Mass find & replace for comments with no spacing * Standardize todo capitalization and for/if spacing
Diffstat (limited to 'Ryujinx.HLE/HOS/Kernel/Ipc')
-rw-r--r--Ryujinx.HLE/HOS/Kernel/Ipc/KBufferDescriptorTable.cs2
-rw-r--r--Ryujinx.HLE/HOS/Kernel/Ipc/KClientPort.cs4
-rw-r--r--Ryujinx.HLE/HOS/Kernel/Ipc/KClientSession.cs4
-rw-r--r--Ryujinx.HLE/HOS/Kernel/Ipc/KServerSession.cs34
4 files changed, 22 insertions, 22 deletions
diff --git a/Ryujinx.HLE/HOS/Kernel/Ipc/KBufferDescriptorTable.cs b/Ryujinx.HLE/HOS/Kernel/Ipc/KBufferDescriptorTable.cs
index ac805bee..6aa211dd 100644
--- a/Ryujinx.HLE/HOS/Kernel/Ipc/KBufferDescriptorTable.cs
+++ b/Ryujinx.HLE/HOS/Kernel/Ipc/KBufferDescriptorTable.cs
@@ -84,7 +84,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
ulong clientAddrTruncated = BitUtils.AlignDown(desc.ClientAddress, KMemoryManager.PageSize);
ulong clientAddrRounded = BitUtils.AlignUp (desc.ClientAddress, KMemoryManager.PageSize);
- //Check if address is not aligned, in this case we need to perform 2 copies.
+ // Check if address is not aligned, in this case we need to perform 2 copies.
if (clientAddrTruncated != clientAddrRounded)
{
ulong copySize = clientAddrRounded - desc.ClientAddress;
diff --git a/Ryujinx.HLE/HOS/Kernel/Ipc/KClientPort.cs b/Ryujinx.HLE/HOS/Kernel/Ipc/KClientPort.cs
index eaa4322d..901b0222 100644
--- a/Ryujinx.HLE/HOS/Kernel/Ipc/KClientPort.cs
+++ b/Ryujinx.HLE/HOS/Kernel/Ipc/KClientPort.cs
@@ -16,8 +16,8 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
private object _countIncLock;
- //TODO: Remove that, we need it for now to allow HLE
- //SM implementation to work with the new IPC system.
+ // TODO: Remove that, we need it for now to allow HLE
+ // SM implementation to work with the new IPC system.
public IpcService Service { get; set; }
public KClientPort(Horizon system, KPort parent, int maxSessions) : base(system)
diff --git a/Ryujinx.HLE/HOS/Kernel/Ipc/KClientSession.cs b/Ryujinx.HLE/HOS/Kernel/Ipc/KClientSession.cs
index f139d3d4..a5109e96 100644
--- a/Ryujinx.HLE/HOS/Kernel/Ipc/KClientSession.cs
+++ b/Ryujinx.HLE/HOS/Kernel/Ipc/KClientSession.cs
@@ -13,8 +13,8 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
public ChannelState State { get; set; }
- //TODO: Remove that, we need it for now to allow HLE
- //services implementation to work with the new IPC system.
+ // TODO: Remove that, we need it for now to allow HLE
+ // services implementation to work with the new IPC system.
public IpcService Service { get; set; }
public KClientSession(Horizon system, KSession parent) : base(system)
diff --git a/Ryujinx.HLE/HOS/Kernel/Ipc/KServerSession.cs b/Ryujinx.HLE/HOS/Kernel/Ipc/KServerSession.cs
index 5a45ff4a..7fba645f 100644
--- a/Ryujinx.HLE/HOS/Kernel/Ipc/KServerSession.cs
+++ b/Ryujinx.HLE/HOS/Kernel/Ipc/KServerSession.cs
@@ -327,7 +327,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
uint offset;
- //Copy handles.
+ // Copy handles.
if (clientHeader.HasHandles)
{
if (clientHeader.MoveHandlesCount != 0)
@@ -399,7 +399,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
offset = 2;
}
- //Copy pointer/receive list buffers.
+ // Copy pointer/receive list buffers.
uint recvListDstOffset = 0;
for (int index = 0; index < clientHeader.PointerBuffersCount; index++)
@@ -455,7 +455,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
offset += 2;
}
- //Copy send, receive and exchange buffers.
+ // Copy send, receive and exchange buffers.
uint totalBuffersCount =
clientHeader.SendBuffersCount +
clientHeader.ReceiveBuffersCount +
@@ -551,7 +551,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
offset += 3;
}
- //Copy raw data.
+ // Copy raw data.
if (clientHeader.RawDataSizeInWords != 0)
{
ulong copySrc = clientMsg.Address + offset * 4;
@@ -683,13 +683,13 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
return KernelResult.InvalidCombination;
}
- //Read receive list.
+ // Read receive list.
ulong[] receiveList = GetReceiveList(
clientMsg,
clientHeader.ReceiveListType,
clientHeader.ReceiveListOffset);
- //Copy receive and exchange buffers.
+ // Copy receive and exchange buffers.
clientResult = request.BufferDescriptorTable.CopyBuffersToClient(clientProcess.MemoryManager);
if (clientResult != KernelResult.Success)
@@ -699,11 +699,11 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
return serverResult;
}
- //Copy header.
+ // Copy header.
System.Device.Memory.WriteUInt32((long)clientMsg.DramAddress + 0, serverHeader.Word0);
System.Device.Memory.WriteUInt32((long)clientMsg.DramAddress + 4, serverHeader.Word1);
- //Copy handles.
+ // Copy handles.
uint offset;
if (serverHeader.HasHandles)
@@ -763,7 +763,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
offset = 2;
}
- //Copy pointer/receive list buffers.
+ // Copy pointer/receive list buffers.
uint recvListDstOffset = 0;
for (int index = 0; index < serverHeader.PointerBuffersCount; index++)
@@ -811,7 +811,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
offset += 2;
}
- //Set send, receive and exchange buffer descriptors to zero.
+ // Set send, receive and exchange buffer descriptors to zero.
uint totalBuffersCount =
serverHeader.SendBuffersCount +
serverHeader.ReceiveBuffersCount +
@@ -828,7 +828,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
offset += 3;
}
- //Copy raw data.
+ // Copy raw data.
if (serverHeader.RawDataSizeInWords != 0)
{
ulong copyDst = clientMsg.Address + offset * 4;
@@ -861,7 +861,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
}
}
- //Unmap buffers from server.
+ // Unmap buffers from server.
clientResult = request.BufferDescriptorTable.UnmapServerBuffers(serverProcess.MemoryManager);
if (clientResult != KernelResult.Success)
@@ -1125,9 +1125,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
continue;
}
- //Client sessions can only be disconnected on async requests (because
- //the client would be otherwise blocked waiting for the response), so
- //we only need to handle the async case here.
+ // Client sessions can only be disconnected on async requests (because
+ // the client would be otherwise blocked waiting for the response), so
+ // we only need to handle the async case here.
if (request.AsyncEvent != null)
{
SendResultToAsyncRequestClient(request, KernelResult.PortRemoteClosed);
@@ -1204,7 +1204,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
private void WakeClientThread(KSessionRequest request, KernelResult result)
{
- //Wait client thread waiting for a response for the given request.
+ // Wait client thread waiting for a response for the given request.
if (request.AsyncEvent != null)
{
SendResultToAsyncRequestClient(request, result);
@@ -1237,7 +1237,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
private void WakeServerThreads(KernelResult result)
{
- //Wake all server threads waiting for requests.
+ // Wake all server threads waiting for requests.
System.CriticalSection.Enter();
foreach (KThread thread in WaitingThreads)