diff options
| author | Alex Barney <thealexbarney@gmail.com> | 2018-12-06 05:16:24 -0600 |
|---|---|---|
| committer | gdkchan <gab.dark.100@gmail.com> | 2018-12-06 09:16:24 -0200 |
| commit | fb1d9493a3d43f2b86c551682586905a1f0e9ea7 (patch) | |
| tree | d842685ff5bdd45d11d94bd1a45a002b9d532fe7 /Ryujinx.HLE/HOS/Ipc/IpcHandler.cs | |
| parent | 3615a70cae3f89197fe185dfc5d0a47fa42151d9 (diff) | |
Adjust naming conventions and general refactoring in HLE Project (#527)
* Rename enum fields
* Naming conventions
* Remove unneeded ".this"
* Remove unneeded semicolons
* Remove unused Usings
* Don't use var
* Remove unneeded enum underlying types
* Explicitly label class visibility
* Remove unneeded @ prefixes
* Remove unneeded commas
* Remove unneeded if expressions
* Method doesn't use unsafe code
* Remove unneeded casts
* Initialized objects don't need an empty constructor
* Remove settings from DotSettings
* Revert "Explicitly label class visibility"
This reverts commit ad5eb5787cc5b27a4631cd46ef5f551c4ae95e51.
* Small changes
* Revert external enum renaming
* Changes from feedback
* Apply previous refactorings to the merged code
Diffstat (limited to 'Ryujinx.HLE/HOS/Ipc/IpcHandler.cs')
| -rw-r--r-- | Ryujinx.HLE/HOS/Ipc/IpcHandler.cs | 112 |
1 files changed, 56 insertions, 56 deletions
diff --git a/Ryujinx.HLE/HOS/Ipc/IpcHandler.cs b/Ryujinx.HLE/HOS/Ipc/IpcHandler.cs index 860c8242..e5d19236 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; } } } |