Mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adjust naming conventions and general refactoring in HLE Project (#527)

Browse source 
* 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 ad5eb5787c.

* Small changes

* Revert external enum renaming

* Changes from feedback

* Apply previous refactorings to the merged code
This commit is contained in:
Alex Barney 2018-12-06 05:16:24 -06:00 • committed by gdkchan
parent 3615a70cae
commit fb1d9493a3
298 changed files with 12034 additions and 12037 deletions
Download patch file Download diff file Expand all files Collapse all files

68
Ryujinx.HLE/HOS/Services/FspSrv/IFile.cs
View file

@ -7,19 +7,19 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
{
class IFile : IpcService, IDisposable
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
private Dictionary<int, ServiceProcessRequest> _commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => _commands;
private Stream BaseStream;
private Stream _baseStream;
public event EventHandler<EventArgs> Disposed;
public string HostPath { get; private set; }
public IFile(Stream BaseStream, string HostPath)
public IFile(Stream baseStream, string hostPath)
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
_commands = new Dictionary<int, ServiceProcessRequest>
{
{ 0, Read },
{ 1, Write },
@ -28,71 +28,71 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
{ 4, GetSize }
};
this.BaseStream = BaseStream;
this.HostPath = HostPath;
_baseStream = baseStream;
HostPath = hostPath;
}
// Read(u32, u64 offset, u64 size) -> (u64 out_size, buffer<u8, 0x46, 0> out_buf)
public long Read(ServiceCtx Context)
public long Read(ServiceCtx context)
{
long Position = Context.Request.ReceiveBuff[0].Position;
long position = context.Request.ReceiveBuff[0].Position;
long Zero = Context.RequestData.ReadInt64();
long Offset = Context.RequestData.ReadInt64();
long Size = Context.RequestData.ReadInt64();
long zero = context.RequestData.ReadInt64();
long offset = context.RequestData.ReadInt64();
long size = context.RequestData.ReadInt64();
byte[] Data = new byte[Size];
byte[] data = new byte[size];
BaseStream.Seek(Offset, SeekOrigin.Begin);
_baseStream.Seek(offset, SeekOrigin.Begin);
int ReadSize = BaseStream.Read(Data, 0, (int)Size);
int readSize = _baseStream.Read(data, 0, (int)size);
Context.Memory.WriteBytes(Position, Data);
context.Memory.WriteBytes(position, data);
Context.ResponseData.Write((long)ReadSize);
context.ResponseData.Write((long)readSize);
return 0;
}
// Write(u32, u64 offset, u64 size, buffer<u8, 0x45, 0>)
public long Write(ServiceCtx Context)
public long Write(ServiceCtx context)
{
long Position = Context.Request.SendBuff[0].Position;
long position = context.Request.SendBuff[0].Position;
long Zero = Context.RequestData.ReadInt64();
long Offset = Context.RequestData.ReadInt64();
long Size = Context.RequestData.ReadInt64();
long zero = context.RequestData.ReadInt64();
long offset = context.RequestData.ReadInt64();
long size = context.RequestData.ReadInt64();
byte[] Data = Context.Memory.ReadBytes(Position, Size);
byte[] data = context.Memory.ReadBytes(position, size);
BaseStream.Seek(Offset, SeekOrigin.Begin);
BaseStream.Write(Data, 0, (int)Size);
_baseStream.Seek(offset, SeekOrigin.Begin);
_baseStream.Write(data, 0, (int)size);
return 0;
}
// Flush()
public long Flush(ServiceCtx Context)
public long Flush(ServiceCtx context)
{
BaseStream.Flush();
_baseStream.Flush();
return 0;
}
// SetSize(u64 size)
public long SetSize(ServiceCtx Context)
public long SetSize(ServiceCtx context)
{
long Size = Context.RequestData.ReadInt64();
long size = context.RequestData.ReadInt64();
BaseStream.SetLength(Size);
_baseStream.SetLength(size);
return 0;
}
// GetSize() -> u64 fileSize
public long GetSize(ServiceCtx Context)
public long GetSize(ServiceCtx context)
{
Context.ResponseData.Write(BaseStream.Length);
context.ResponseData.Write(_baseStream.Length);
return 0;
}
@ -104,9 +104,9 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
protected virtual void Dispose(bool disposing)
{
if (disposing && BaseStream != null)
if (disposing && _baseStream != null)
{
BaseStream.Dispose();
_baseStream.Dispose();
Disposed?.Invoke(this, EventArgs.Empty);
}