aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.HLE/HOS/Ipc
diff options
context:
space:
mode:
Diffstat (limited to 'Ryujinx.HLE/HOS/Ipc')
-rw-r--r--Ryujinx.HLE/HOS/Ipc/IpcBuffDesc.cs26
-rw-r--r--Ryujinx.HLE/HOS/Ipc/IpcHandleDesc.cs70
-rw-r--r--Ryujinx.HLE/HOS/Ipc/IpcHandler.cs112
-rw-r--r--Ryujinx.HLE/HOS/Ipc/IpcMessage.cs182
-rw-r--r--Ryujinx.HLE/HOS/Ipc/IpcPtrBuffDesc.cs24
-rw-r--r--Ryujinx.HLE/HOS/Ipc/IpcRecvListBuffDesc.cs12
-rw-r--r--Ryujinx.HLE/HOS/Ipc/ServiceProcessRequest.cs2
7 files changed, 213 insertions, 215 deletions
diff --git a/Ryujinx.HLE/HOS/Ipc/IpcBuffDesc.cs b/Ryujinx.HLE/HOS/Ipc/IpcBuffDesc.cs
index 0907243d..346d696e 100644
--- a/Ryujinx.HLE/HOS/Ipc/IpcBuffDesc.cs
+++ b/Ryujinx.HLE/HOS/Ipc/IpcBuffDesc.cs
@@ -4,24 +4,24 @@ namespace Ryujinx.HLE.HOS.Ipc
{
struct IpcBuffDesc
{
- public long Position { get; }
- public long Size { get; }
- public int Flags { get; }
+ public long Position { get; private set; }
+ public long Size { get; private set; }
+ public int Flags { get; private set; }
- public IpcBuffDesc(BinaryReader reader)
+ public IpcBuffDesc(BinaryReader Reader)
{
- long word0 = reader.ReadUInt32();
- long word1 = reader.ReadUInt32();
- long word2 = reader.ReadUInt32();
+ long Word0 = Reader.ReadUInt32();
+ long Word1 = Reader.ReadUInt32();
+ long Word2 = Reader.ReadUInt32();
- Position = word1;
- Position |= (word2 << 4) & 0x0f00000000;
- Position |= (word2 << 34) & 0x7000000000;
+ Position = Word1;
+ Position |= (Word2 << 4) & 0x0f00000000;
+ Position |= (Word2 << 34) & 0x7000000000;
- Size = word0;
- Size |= (word2 << 8) & 0xf00000000;
+ Size = Word0;
+ Size |= (Word2 << 8) & 0xf00000000;
- Flags = (int)word2 & 3;
+ Flags = (int)Word2 & 3;
}
}
} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Ipc/IpcHandleDesc.cs b/Ryujinx.HLE/HOS/Ipc/IpcHandleDesc.cs
index 3360dff3..081b5695 100644
--- a/Ryujinx.HLE/HOS/Ipc/IpcHandleDesc.cs
+++ b/Ryujinx.HLE/HOS/Ipc/IpcHandleDesc.cs
@@ -5,87 +5,87 @@ namespace Ryujinx.HLE.HOS.Ipc
{
class IpcHandleDesc
{
- public bool HasPId { get; }
+ public bool HasPId { get; private set; }
- public long PId { get; }
+ public long PId { get; private set; }
- public int[] ToCopy { get; }
- public int[] ToMove { get; }
+ public int[] ToCopy { get; private set; }
+ public int[] ToMove { get; private set; }
- public IpcHandleDesc(BinaryReader reader)
+ public IpcHandleDesc(BinaryReader Reader)
{
- int word = reader.ReadInt32();
+ int Word = Reader.ReadInt32();
- HasPId = (word & 1) != 0;
+ HasPId = (Word & 1) != 0;
- ToCopy = new int[(word >> 1) & 0xf];
- ToMove = new int[(word >> 5) & 0xf];
+ ToCopy = new int[(Word >> 1) & 0xf];
+ ToMove = new int[(Word >> 5) & 0xf];
- PId = HasPId ? reader.ReadInt64() : 0;
+ PId = HasPId ? Reader.ReadInt64() : 0;
- for (int index = 0; index < ToCopy.Length; index++)
+ for (int Index = 0; Index < ToCopy.Length; Index++)
{
- ToCopy[index] = reader.ReadInt32();
+ ToCopy[Index] = Reader.ReadInt32();
}
- for (int index = 0; index < ToMove.Length; index++)
+ for (int Index = 0; Index < ToMove.Length; Index++)
{
- ToMove[index] = reader.ReadInt32();
+ ToMove[Index] = Reader.ReadInt32();
}
}
- public IpcHandleDesc(int[] copy, int[] move)
+ public IpcHandleDesc(int[] Copy, int[] Move)
{
- ToCopy = copy ?? throw new ArgumentNullException(nameof(copy));
- ToMove = move ?? throw new ArgumentNullException(nameof(move));
+ ToCopy = Copy ?? throw new ArgumentNullException(nameof(Copy));
+ ToMove = Move ?? throw new ArgumentNullException(nameof(Move));
}
- public IpcHandleDesc(int[] copy, int[] move, long pId) : this(copy, move)
+ public IpcHandleDesc(int[] Copy, int[] Move, long PId) : this(Copy, Move)
{
- PId = pId;
+ this.PId = PId;
HasPId = true;
}
- public static IpcHandleDesc MakeCopy(params int[] handles)
+ public static IpcHandleDesc MakeCopy(params int[] Handles)
{
- return new IpcHandleDesc(handles, new int[0]);
+ return new IpcHandleDesc(Handles, new int[0]);
}
- public static IpcHandleDesc MakeMove(params int[] handles)
+ public static IpcHandleDesc MakeMove(params int[] Handles)
{
- return new IpcHandleDesc(new int[0], handles);
+ return new IpcHandleDesc(new int[0], Handles);
}
public byte[] GetBytes()
{
- using (MemoryStream ms = new MemoryStream())
+ using (MemoryStream MS = new MemoryStream())
{
- BinaryWriter writer = new BinaryWriter(ms);
+ BinaryWriter Writer = new BinaryWriter(MS);
- int word = HasPId ? 1 : 0;
+ int Word = HasPId ? 1 : 0;
- word |= (ToCopy.Length & 0xf) << 1;
- word |= (ToMove.Length & 0xf) << 5;
+ Word |= (ToCopy.Length & 0xf) << 1;
+ Word |= (ToMove.Length & 0xf) << 5;
- writer.Write(word);
+ Writer.Write(Word);
if (HasPId)
{
- writer.Write(PId);
+ Writer.Write((long)PId);
}
- foreach (int handle in ToCopy)
+ foreach (int Handle in ToCopy)
{
- writer.Write(handle);
+ Writer.Write(Handle);
}
- foreach (int handle in ToMove)
+ foreach (int Handle in ToMove)
{
- writer.Write(handle);
+ Writer.Write(Handle);
}
- return ms.ToArray();
+ return MS.ToArray();
}
}
}
diff --git a/Ryujinx.HLE/HOS/Ipc/IpcHandler.cs b/Ryujinx.HLE/HOS/Ipc/IpcHandler.cs
index e5d19236..860c8242 100644
--- a/Ryujinx.HLE/HOS/Ipc/IpcHandler.cs
+++ b/Ryujinx.HLE/HOS/Ipc/IpcHandler.cs
@@ -8,61 +8,61 @@ namespace Ryujinx.HLE.HOS.Ipc
static class IpcHandler
{
public static long IpcCall(
- Switch device,
- KProcess process,
- MemoryManager memory,
- KSession session,
- IpcMessage request,
- long cmdPtr)
+ Switch Device,
+ KProcess Process,
+ MemoryManager Memory,
+ KSession Session,
+ IpcMessage Request,
+ long CmdPtr)
{
- IpcMessage response = new IpcMessage();
+ IpcMessage Response = new IpcMessage();
- using (MemoryStream raw = new MemoryStream(request.RawData))
+ using (MemoryStream Raw = new MemoryStream(Request.RawData))
{
- BinaryReader reqReader = new BinaryReader(raw);
+ BinaryReader ReqReader = new BinaryReader(Raw);
- if (request.Type == IpcMessageType.Request ||
- request.Type == IpcMessageType.RequestWithContext)
+ if (Request.Type == IpcMessageType.Request ||
+ Request.Type == IpcMessageType.RequestWithContext)
{
- response.Type = IpcMessageType.Response;
+ Response.Type = IpcMessageType.Response;
- using (MemoryStream resMs = new MemoryStream())
+ using (MemoryStream ResMS = new MemoryStream())
{
- BinaryWriter resWriter = new BinaryWriter(resMs);
+ BinaryWriter ResWriter = new BinaryWriter(ResMS);
- ServiceCtx context = new ServiceCtx(
- device,
- process,
- memory,
- session,
- request,
- response,
- reqReader,
- resWriter);
+ ServiceCtx Context = new ServiceCtx(
+ Device,
+ Process,
+ Memory,
+ Session,
+ Request,
+ Response,
+ ReqReader,
+ ResWriter);
- session.Service.CallMethod(context);
+ Session.Service.CallMethod(Context);
- response.RawData = resMs.ToArray();
+ Response.RawData = ResMS.ToArray();
}
}
- else if (request.Type == IpcMessageType.Control ||
- request.Type == IpcMessageType.ControlWithContext)
+ else if (Request.Type == IpcMessageType.Control ||
+ Request.Type == IpcMessageType.ControlWithContext)
{
- long magic = reqReader.ReadInt64();
- long cmdId = reqReader.ReadInt64();
+ long Magic = ReqReader.ReadInt64();
+ long CmdId = ReqReader.ReadInt64();
- switch (cmdId)
+ switch (CmdId)
{
case 0:
{
- request = FillResponse(response, 0, session.Service.ConvertToDomain());
+ Request = FillResponse(Response, 0, Session.Service.ConvertToDomain());
break;
}
case 3:
{
- request = FillResponse(response, 0, 0x500);
+ Request = FillResponse(Response, 0, 0x500);
break;
}
@@ -71,73 +71,73 @@ namespace Ryujinx.HLE.HOS.Ipc
case 2:
case 4:
{
- int unknown = reqReader.ReadInt32();
+ int Unknown = ReqReader.ReadInt32();
- if (process.HandleTable.GenerateHandle(session, out int handle) != KernelResult.Success)
+ if (Process.HandleTable.GenerateHandle(Session, out int Handle) != KernelResult.Success)
{
throw new InvalidOperationException("Out of handles!");
}
- response.HandleDesc = IpcHandleDesc.MakeMove(handle);
+ Response.HandleDesc = IpcHandleDesc.MakeMove(Handle);
- request = FillResponse(response, 0);
+ Request = FillResponse(Response, 0);
break;
}
- default: throw new NotImplementedException(cmdId.ToString());
+ default: throw new NotImplementedException(CmdId.ToString());
}
}
- else if (request.Type == IpcMessageType.CloseSession)
+ else if (Request.Type == IpcMessageType.CloseSession)
{
//TODO
}
else
{
- throw new NotImplementedException(request.Type.ToString());
+ throw new NotImplementedException(Request.Type.ToString());
}
- memory.WriteBytes(cmdPtr, response.GetBytes(cmdPtr));
+ Memory.WriteBytes(CmdPtr, Response.GetBytes(CmdPtr));
}
return 0;
}
- private static IpcMessage FillResponse(IpcMessage response, long result, params int[] values)
+ private static IpcMessage FillResponse(IpcMessage Response, long Result, params int[] Values)
{
- using (MemoryStream ms = new MemoryStream())
+ using (MemoryStream MS = new MemoryStream())
{
- BinaryWriter writer = new BinaryWriter(ms);
+ BinaryWriter Writer = new BinaryWriter(MS);
- foreach (int value in values)
+ foreach (int Value in Values)
{
- writer.Write(value);
+ Writer.Write(Value);
}
- return FillResponse(response, result, ms.ToArray());
+ return FillResponse(Response, Result, MS.ToArray());
}
}
- private static IpcMessage FillResponse(IpcMessage response, long result, byte[] data = null)
+ private static IpcMessage FillResponse(IpcMessage Response, long Result, byte[] Data = null)
{
- response.Type = IpcMessageType.Response;
+ Response.Type = IpcMessageType.Response;
- using (MemoryStream ms = new MemoryStream())
+ using (MemoryStream MS = new MemoryStream())
{
- BinaryWriter writer = new BinaryWriter(ms);
+ BinaryWriter Writer = new BinaryWriter(MS);
- writer.Write(IpcMagic.Sfco);
- writer.Write(result);
+ Writer.Write(IpcMagic.Sfco);
+ Writer.Write(Result);
- if (data != null)
+ if (Data != null)
{
- writer.Write(data);
+ Writer.Write(Data);
}
- response.RawData = ms.ToArray();
+ Response.RawData = MS.ToArray();
}
- return response;
+ return Response;
}
}
}
diff --git a/Ryujinx.HLE/HOS/Ipc/IpcMessage.cs b/Ryujinx.HLE/HOS/Ipc/IpcMessage.cs
index c19566cc..02900444 100644
--- a/Ryujinx.HLE/HOS/Ipc/IpcMessage.cs
+++ b/Ryujinx.HLE/HOS/Ipc/IpcMessage.cs
@@ -9,13 +9,13 @@ namespace Ryujinx.HLE.HOS.Ipc
public IpcHandleDesc HandleDesc { get; set; }
- public List<IpcPtrBuffDesc> PtrBuff { get; }
- public List<IpcBuffDesc> SendBuff { get; }
- public List<IpcBuffDesc> ReceiveBuff { get; }
- public List<IpcBuffDesc> ExchangeBuff { get; }
- public List<IpcRecvListBuffDesc> RecvListBuff { get; }
+ public List<IpcPtrBuffDesc> PtrBuff { get; private set; }
+ public List<IpcBuffDesc> SendBuff { get; private set; }
+ public List<IpcBuffDesc> ReceiveBuff { get; private set; }
+ public List<IpcBuffDesc> ExchangeBuff { get; private set; }
+ public List<IpcRecvListBuffDesc> RecvListBuff { get; private set; }
- public List<int> ObjectIds { get; }
+ public List<int> ObjectIds { get; private set; }
public byte[] RawData { get; set; }
@@ -30,185 +30,183 @@ namespace Ryujinx.HLE.HOS.Ipc
ObjectIds = new List<int>();
}
- public IpcMessage(byte[] data, long cmdPtr) : this()
+ public IpcMessage(byte[] Data, long CmdPtr) : this()
{
- using (MemoryStream ms = new MemoryStream(data))
+ using (MemoryStream MS = new MemoryStream(Data))
{
- BinaryReader reader = new BinaryReader(ms);
+ BinaryReader Reader = new BinaryReader(MS);
- Initialize(reader, cmdPtr);
+ Initialize(Reader, CmdPtr);
}
}
- private void Initialize(BinaryReader reader, long cmdPtr)
+ private void Initialize(BinaryReader Reader, long CmdPtr)
{
- int word0 = reader.ReadInt32();
- int word1 = reader.ReadInt32();
+ int Word0 = Reader.ReadInt32();
+ int Word1 = Reader.ReadInt32();
- Type = (IpcMessageType)(word0 & 0xffff);
+ Type = (IpcMessageType)(Word0 & 0xffff);
- int ptrBuffCount = (word0 >> 16) & 0xf;
- int sendBuffCount = (word0 >> 20) & 0xf;
- int recvBuffCount = (word0 >> 24) & 0xf;
- int xchgBuffCount = (word0 >> 28) & 0xf;
+ int PtrBuffCount = (Word0 >> 16) & 0xf;
+ int SendBuffCount = (Word0 >> 20) & 0xf;
+ int RecvBuffCount = (Word0 >> 24) & 0xf;
+ int XchgBuffCount = (Word0 >> 28) & 0xf;
- int rawDataSize = (word1 >> 0) & 0x3ff;
- int recvListFlags = (word1 >> 10) & 0xf;
- bool hndDescEnable = ((word1 >> 31) & 0x1) != 0;
+ int RawDataSize = (Word1 >> 0) & 0x3ff;
+ int RecvListFlags = (Word1 >> 10) & 0xf;
+ bool HndDescEnable = ((Word1 >> 31) & 0x1) != 0;
- if (hndDescEnable)
+ if (HndDescEnable)
{
- HandleDesc = new IpcHandleDesc(reader);
+ HandleDesc = new IpcHandleDesc(Reader);
}
- for (int index = 0; index < ptrBuffCount; index++)
+ for (int Index = 0; Index < PtrBuffCount; Index++)
{
- PtrBuff.Add(new IpcPtrBuffDesc(reader));
+ PtrBuff.Add(new IpcPtrBuffDesc(Reader));
}
- void ReadBuff(List<IpcBuffDesc> buff, int count)
+ void ReadBuff(List<IpcBuffDesc> Buff, int Count)
{
- for (int index = 0; index < count; index++)
+ for (int Index = 0; Index < Count; Index++)
{
- buff.Add(new IpcBuffDesc(reader));
+ Buff.Add(new IpcBuffDesc(Reader));
}
}
- ReadBuff(SendBuff, sendBuffCount);
- ReadBuff(ReceiveBuff, recvBuffCount);
- ReadBuff(ExchangeBuff, xchgBuffCount);
+ ReadBuff(SendBuff, SendBuffCount);
+ ReadBuff(ReceiveBuff, RecvBuffCount);
+ ReadBuff(ExchangeBuff, XchgBuffCount);
- rawDataSize *= 4;
+ RawDataSize *= 4;
- long recvListPos = reader.BaseStream.Position + rawDataSize;
+ long RecvListPos = Reader.BaseStream.Position + RawDataSize;
- long pad0 = GetPadSize16(reader.BaseStream.Position + cmdPtr);
+ long Pad0 = GetPadSize16(Reader.BaseStream.Position + CmdPtr);
- reader.BaseStream.Seek(pad0, SeekOrigin.Current);
+ Reader.BaseStream.Seek(Pad0, SeekOrigin.Current);
- int recvListCount = recvListFlags - 2;
+ int RecvListCount = RecvListFlags - 2;
- if (recvListCount == 0)
+ if (RecvListCount == 0)
{
- recvListCount = 1;
+ RecvListCount = 1;
}
- else if (recvListCount < 0)
+ else if (RecvListCount < 0)
{
- recvListCount = 0;
+ RecvListCount = 0;
}
- RawData = reader.ReadBytes(rawDataSize);
+ RawData = Reader.ReadBytes(RawDataSize);
- reader.BaseStream.Seek(recvListPos, SeekOrigin.Begin);
+ Reader.BaseStream.Seek(RecvListPos, SeekOrigin.Begin);
- for (int index = 0; index < recvListCount; index++)
+ for (int Index = 0; Index < RecvListCount; Index++)
{
- RecvListBuff.Add(new IpcRecvListBuffDesc(reader));
+ RecvListBuff.Add(new IpcRecvListBuffDesc(Reader));
}
}
- public byte[] GetBytes(long cmdPtr)
+ public byte[] GetBytes(long CmdPtr)
{
- using (MemoryStream ms = new MemoryStream())
+ using (MemoryStream MS = new MemoryStream())
{
- BinaryWriter writer = new BinaryWriter(ms);
+ BinaryWriter Writer = new BinaryWriter(MS);
- int word0;
- int word1;
+ int Word0;
+ int Word1;
- word0 = (int)Type;
- word0 |= (PtrBuff.Count & 0xf) << 16;
- word0 |= (SendBuff.Count & 0xf) << 20;
- word0 |= (ReceiveBuff.Count & 0xf) << 24;
- word0 |= (ExchangeBuff.Count & 0xf) << 28;
+ Word0 = (int)Type;
+ Word0 |= (PtrBuff.Count & 0xf) << 16;
+ Word0 |= (SendBuff.Count & 0xf) << 20;
+ Word0 |= (ReceiveBuff.Count & 0xf) << 24;
+ Word0 |= (ExchangeBuff.Count & 0xf) << 28;
- byte[] handleData = new byte[0];
+ byte[] HandleData = new byte[0];
if (HandleDesc != null)
{
- handleData = HandleDesc.GetBytes();
+ HandleData = HandleDesc.GetBytes();
}
- int dataLength = RawData?.Length ?? 0;
+ int DataLength = RawData?.Length ?? 0;
- int pad0 = (int)GetPadSize16(cmdPtr + 8 + handleData.Length);
+ int Pad0 = (int)GetPadSize16(CmdPtr + 8 + HandleData.Length);
//Apparently, padding after Raw Data is 16 bytes, however when there is
//padding before Raw Data too, we need to subtract the size of this padding.
//This is the weirdest padding I've seen so far...
- int pad1 = 0x10 - pad0;
+ int Pad1 = 0x10 - Pad0;
- dataLength = (dataLength + pad0 + pad1) / 4;
+ DataLength = (DataLength + Pad0 + Pad1) / 4;
- word1 = dataLength & 0x3ff;
+ Word1 = DataLength & 0x3ff;
if (HandleDesc != null)
{
- word1 |= 1 << 31;
+ Word1 |= 1 << 31;
}
- writer.Write(word0);
- writer.Write(word1);
- writer.Write(handleData);
+ Writer.Write(Word0);
+ Writer.Write(Word1);
+ Writer.Write(HandleData);
- ms.Seek(pad0, SeekOrigin.Current);
+ MS.Seek(Pad0, SeekOrigin.Current);
if (RawData != null)
{
- writer.Write(RawData);
+ Writer.Write(RawData);
}
- writer.Write(new byte[pad1]);
+ Writer.Write(new byte[Pad1]);
- return ms.ToArray();
+ return MS.ToArray();
}
}
- private long GetPadSize16(long position)
+ private long GetPadSize16(long Position)
{
- if ((position & 0xf) != 0)
+ if ((Position & 0xf) != 0)
{
- return 0x10 - (position & 0xf);
+ return 0x10 - (Position & 0xf);
}
return 0;
}
- // ReSharper disable once InconsistentNaming
- public (long Position, long Size) GetBufferType0x21(int index = 0)
+ public (long Position, long Size) GetBufferType0x21(int Index = 0)
{
- if (PtrBuff.Count > index &&
- PtrBuff[index].Position != 0 &&
- PtrBuff[index].Size != 0)
+ if (PtrBuff.Count > Index &&
+ PtrBuff[Index].Position != 0 &&
+ PtrBuff[Index].Size != 0)
{
- return (PtrBuff[index].Position, PtrBuff[index].Size);
+ return (PtrBuff[Index].Position, PtrBuff[Index].Size);
}
- if (SendBuff.Count > index &&
- SendBuff[index].Position != 0 &&
- SendBuff[index].Size != 0)
+ if (SendBuff.Count > Index &&
+ SendBuff[Index].Position != 0 &&
+ SendBuff[Index].Size != 0)
{
- return (SendBuff[index].Position, SendBuff[index].Size);
+ return (SendBuff[Index].Position, SendBuff[Index].Size);
}
return (0, 0);
}
- // ReSharper disable once InconsistentNaming
- public (long Position, long Size) GetBufferType0x22(int index = 0)
+ public (long Position, long Size) GetBufferType0x22(int Index = 0)
{
- if (RecvListBuff.Count > index &&
- RecvListBuff[index].Position != 0 &&
- RecvListBuff[index].Size != 0)
+ if (RecvListBuff.Count > Index &&
+ RecvListBuff[Index].Position != 0 &&
+ RecvListBuff[Index].Size != 0)
{
- return (RecvListBuff[index].Position, RecvListBuff[index].Size);
+ return (RecvListBuff[Index].Position, RecvListBuff[Index].Size);
}
- if (ReceiveBuff.Count > index &&
- ReceiveBuff[index].Position != 0 &&
- ReceiveBuff[index].Size != 0)
+ if (ReceiveBuff.Count > Index &&
+ ReceiveBuff[Index].Position != 0 &&
+ ReceiveBuff[Index].Size != 0)
{
- return (ReceiveBuff[index].Position, ReceiveBuff[index].Size);
+ return (ReceiveBuff[Index].Position, ReceiveBuff[Index].Size);
}
return (0, 0);
diff --git a/Ryujinx.HLE/HOS/Ipc/IpcPtrBuffDesc.cs b/Ryujinx.HLE/HOS/Ipc/IpcPtrBuffDesc.cs
index cecd3ab0..21f5d3bc 100644
--- a/Ryujinx.HLE/HOS/Ipc/IpcPtrBuffDesc.cs
+++ b/Ryujinx.HLE/HOS/Ipc/IpcPtrBuffDesc.cs
@@ -4,23 +4,23 @@ namespace Ryujinx.HLE.HOS.Ipc
{
struct IpcPtrBuffDesc
{
- public long Position { get; }
- public int Index { get; }
- public long Size { get; }
+ public long Position { get; private set; }
+ public int Index { get; private set; }
+ public long Size { get; private set; }
- public IpcPtrBuffDesc(BinaryReader reader)
+ public IpcPtrBuffDesc(BinaryReader Reader)
{
- long word0 = reader.ReadUInt32();
- long word1 = reader.ReadUInt32();
+ long Word0 = Reader.ReadUInt32();
+ long Word1 = Reader.ReadUInt32();
- Position = word1;
- Position |= (word0 << 20) & 0x0f00000000;
- Position |= (word0 << 30) & 0x7000000000;
+ Position = Word1;
+ Position |= (Word0 << 20) & 0x0f00000000;
+ Position |= (Word0 << 30) & 0x7000000000;
- Index = ((int)word0 >> 0) & 0x03f;
- Index |= ((int)word0 >> 3) & 0x1c0;
+ Index = ((int)Word0 >> 0) & 0x03f;
+ Index |= ((int)Word0 >> 3) & 0x1c0;
- Size = (ushort)(word0 >> 16);
+ Size = (ushort)(Word0 >> 16);
}
}
} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Ipc/IpcRecvListBuffDesc.cs b/Ryujinx.HLE/HOS/Ipc/IpcRecvListBuffDesc.cs
index 43152d78..1d0a8c80 100644
--- a/Ryujinx.HLE/HOS/Ipc/IpcRecvListBuffDesc.cs
+++ b/Ryujinx.HLE/HOS/Ipc/IpcRecvListBuffDesc.cs
@@ -4,16 +4,16 @@ namespace Ryujinx.HLE.HOS.Ipc
{
struct IpcRecvListBuffDesc
{
- public long Position { get; }
- public long Size { get; }
+ public long Position { get; private set; }
+ public long Size { get; private set; }
- public IpcRecvListBuffDesc(BinaryReader reader)
+ public IpcRecvListBuffDesc(BinaryReader Reader)
{
- long value = reader.ReadInt64();
+ long Value = Reader.ReadInt64();
- Position = value & 0xffffffffffff;
+ Position = Value & 0xffffffffffff;
- Size = (ushort)(value >> 48);
+ Size = (ushort)(Value >> 48);
}
}
} \ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Ipc/ServiceProcessRequest.cs b/Ryujinx.HLE/HOS/Ipc/ServiceProcessRequest.cs
index b3aaa219..da4a7e75 100644
--- a/Ryujinx.HLE/HOS/Ipc/ServiceProcessRequest.cs
+++ b/Ryujinx.HLE/HOS/Ipc/ServiceProcessRequest.cs
@@ -1,4 +1,4 @@
namespace Ryujinx.HLE.HOS.Ipc
{
- delegate long ServiceProcessRequest(ServiceCtx context);
+ delegate long ServiceProcessRequest(ServiceCtx Context);
} \ No newline at end of file