Revert "Adjust naming conventions and general refactoring in HLE Project (#490)" (#526)

This reverts commit 85dbb9559ad317a657dafd24da27fec4b3f5250f.

7 files changed, 139 insertions, 139 deletions

diff --git a/Ryujinx.HLE/Loaders/Npdm/ACI0.cs b/Ryujinx.HLE/Loaders/Npdm/ACI0.cs
index 28e11a48..4bec93e4 100644
--- a/Ryujinx.HLE/Loaders/Npdm/ACI0.cs
+++ b/Ryujinx.HLE/Loaders/Npdm/ACI0.cs
@@ -3,51 +3,51 @@ using System.IO;
 
 namespace Ryujinx.HLE.Loaders.Npdm
 {
-    class Aci0
+    class ACI0
     {
-        private const int Aci0Magic = 'A' << 0 | 'C' << 8 | 'I' << 16 | '0' << 24;
+        private const int ACI0Magic = 'A' << 0 | 'C' << 8 | 'I' << 16 | '0' << 24;
 
-        public long TitleId { get; }
+        public long TitleId { get; private set; }
 
-        public int   FsVersion            { get; }
-        public ulong FsPermissionsBitmask { get; }
+        public int   FsVersion            { get; private set; }
+        public ulong FsPermissionsBitmask { get; private set; }
 
-        public ServiceAccessControl ServiceAccessControl { get; }
-        public KernelAccessControl  KernelAccessControl  { get; }
+        public ServiceAccessControl ServiceAccessControl { get; private set; }
+        public KernelAccessControl  KernelAccessControl  { get; private set; }
 
-        public Aci0(Stream stream, int offset)
+        public ACI0(Stream Stream, int Offset)
         {
-            stream.Seek(offset, SeekOrigin.Begin);
+            Stream.Seek(Offset, SeekOrigin.Begin);
 
-            BinaryReader reader = new BinaryReader(stream);
+            BinaryReader Reader = new BinaryReader(Stream);
 
-            if (reader.ReadInt32() != Aci0Magic)
+            if (Reader.ReadInt32() != ACI0Magic)
             {
                 throw new InvalidNpdmException("ACI0 Stream doesn't contain ACI0 section!");
             }
 
-            stream.Seek(0xc, SeekOrigin.Current);
+            Stream.Seek(0xc, SeekOrigin.Current);
 
-            TitleId = reader.ReadInt64();
+            TitleId = Reader.ReadInt64();
 
             //Reserved.
-            stream.Seek(8, SeekOrigin.Current);
+            Stream.Seek(8, SeekOrigin.Current);
 
-            int fsAccessHeaderOffset       = reader.ReadInt32();
-            int fsAccessHeaderSize         = reader.ReadInt32();
-            int serviceAccessControlOffset = reader.ReadInt32();
-            int serviceAccessControlSize   = reader.ReadInt32();
-            int kernelAccessControlOffset  = reader.ReadInt32();
-            int kernelAccessControlSize    = reader.ReadInt32();
+            int FsAccessHeaderOffset       = Reader.ReadInt32();
+            int FsAccessHeaderSize         = Reader.ReadInt32();
+            int ServiceAccessControlOffset = Reader.ReadInt32();
+            int ServiceAccessControlSize   = Reader.ReadInt32();
+            int KernelAccessControlOffset  = Reader.ReadInt32();
+            int KernelAccessControlSize    = Reader.ReadInt32();
 
-            FsAccessHeader fsAccessHeader = new FsAccessHeader(stream, offset + fsAccessHeaderOffset, fsAccessHeaderSize);
+            FsAccessHeader FsAccessHeader = new FsAccessHeader(Stream, Offset + FsAccessHeaderOffset, FsAccessHeaderSize);
 
-            FsVersion            = fsAccessHeader.Version;
-            FsPermissionsBitmask = fsAccessHeader.PermissionsBitmask;
+            FsVersion            = FsAccessHeader.Version;
+            FsPermissionsBitmask = FsAccessHeader.PermissionsBitmask;
 
-            ServiceAccessControl = new ServiceAccessControl(stream, offset + serviceAccessControlOffset, serviceAccessControlSize);
+            ServiceAccessControl = new ServiceAccessControl(Stream, Offset + ServiceAccessControlOffset, ServiceAccessControlSize);
 
-            KernelAccessControl = new KernelAccessControl(stream, offset + kernelAccessControlOffset, kernelAccessControlSize);
+            KernelAccessControl = new KernelAccessControl(Stream, Offset + KernelAccessControlOffset, KernelAccessControlSize);
         }
     }
 }
diff --git a/Ryujinx.HLE/Loaders/Npdm/ACID.cs b/Ryujinx.HLE/Loaders/Npdm/ACID.cs
index 3ff87357..9206ee7b 100644
--- a/Ryujinx.HLE/Loaders/Npdm/ACID.cs
+++ b/Ryujinx.HLE/Loaders/Npdm/ACID.cs
@@ -3,59 +3,59 @@ using System.IO;
 
 namespace Ryujinx.HLE.Loaders.Npdm
 {
-    class Acid
+    class ACID
     {
-        private const int AcidMagic = 'A' << 0 | 'C' << 8 | 'I' << 16 | 'D' << 24;
+        private const int ACIDMagic = 'A' << 0 | 'C' << 8 | 'I' << 16 | 'D' << 24;
 
-        public byte[] Rsa2048Signature { get; }
-        public byte[] Rsa2048Modulus   { get; }
-        public int    Unknown1         { get; }
-        public int    Flags            { get; }
+        public byte[] RSA2048Signature { get; private set; }
+        public byte[] RSA2048Modulus   { get; private set; }
+        public int    Unknown1         { get; private set; }
+        public int    Flags            { get; private set; }
 
-        public long TitleIdRangeMin { get; }
-        public long TitleIdRangeMax { get; }
+        public long TitleIdRangeMin { get; private set; }
+        public long TitleIdRangeMax { get; private set; }
 
-        public FsAccessControl      FsAccessControl      { get; }
-        public ServiceAccessControl ServiceAccessControl { get; }
-        public KernelAccessControl  KernelAccessControl  { get; }
+        public FsAccessControl      FsAccessControl      { get; private set; }
+        public ServiceAccessControl ServiceAccessControl { get; private set; }
+        public KernelAccessControl  KernelAccessControl  { get; private set; }
 
-        public Acid(Stream stream, int offset)
+        public ACID(Stream Stream, int Offset)
         {
-            stream.Seek(offset, SeekOrigin.Begin);
+            Stream.Seek(Offset, SeekOrigin.Begin);
 
-            BinaryReader reader = new BinaryReader(stream);
+            BinaryReader Reader = new BinaryReader(Stream);
 
-            Rsa2048Signature = reader.ReadBytes(0x100);
-            Rsa2048Modulus   = reader.ReadBytes(0x100);
+            RSA2048Signature = Reader.ReadBytes(0x100);
+            RSA2048Modulus   = Reader.ReadBytes(0x100);
 
-            if (reader.ReadInt32() != AcidMagic)
+            if (Reader.ReadInt32() != ACIDMagic)
             {
                 throw new InvalidNpdmException("ACID Stream doesn't contain ACID section!");
             }
 
             //Size field used with the above signature (?).
-            Unknown1 = reader.ReadInt32();
+            Unknown1 = Reader.ReadInt32();
 
-            reader.ReadInt32();
+            Reader.ReadInt32();
 
             //Bit0 must be 1 on retail, on devunit 0 is also allowed. Bit1 is unknown.
-            Flags = reader.ReadInt32();
+            Flags = Reader.ReadInt32();
 
-            TitleIdRangeMin = reader.ReadInt64();
-            TitleIdRangeMax = reader.ReadInt64();
+            TitleIdRangeMin = Reader.ReadInt64();
+            TitleIdRangeMax = Reader.ReadInt64();
 
-            int fsAccessControlOffset      = reader.ReadInt32();
-            int fsAccessControlSize        = reader.ReadInt32();
-            int serviceAccessControlOffset = reader.ReadInt32();
-            int serviceAccessControlSize   = reader.ReadInt32();
-            int kernelAccessControlOffset  = reader.ReadInt32();
-            int kernelAccessControlSize    = reader.ReadInt32();
+            int FsAccessControlOffset      = Reader.ReadInt32();
+            int FsAccessControlSize        = Reader.ReadInt32();
+            int ServiceAccessControlOffset = Reader.ReadInt32();
+            int ServiceAccessControlSize   = Reader.ReadInt32();
+            int KernelAccessControlOffset  = Reader.ReadInt32();
+            int KernelAccessControlSize    = Reader.ReadInt32();
 
-            FsAccessControl = new FsAccessControl(stream, offset + fsAccessControlOffset, fsAccessControlSize);
+            FsAccessControl = new FsAccessControl(Stream, Offset + FsAccessControlOffset, FsAccessControlSize);
 
-            ServiceAccessControl = new ServiceAccessControl(stream, offset + serviceAccessControlOffset, serviceAccessControlSize);
+            ServiceAccessControl = new ServiceAccessControl(Stream, Offset + ServiceAccessControlOffset, ServiceAccessControlSize);
 
-            KernelAccessControl = new KernelAccessControl(stream, offset + kernelAccessControlOffset, kernelAccessControlSize);
+            KernelAccessControl = new KernelAccessControl(Stream, Offset + KernelAccessControlOffset, KernelAccessControlSize);
         }
     }
 }
diff --git a/Ryujinx.HLE/Loaders/Npdm/FsAccessControl.cs b/Ryujinx.HLE/Loaders/Npdm/FsAccessControl.cs
index e246f026..00faf321 100644
--- a/Ryujinx.HLE/Loaders/Npdm/FsAccessControl.cs
+++ b/Ryujinx.HLE/Loaders/Npdm/FsAccessControl.cs
@@ -4,25 +4,25 @@ namespace Ryujinx.HLE.Loaders.Npdm
 {
     class FsAccessControl
     {
-        public int   Version            { get; }
-        public ulong PermissionsBitmask { get; }
-        public int   Unknown1           { get; }
-        public int   Unknown2           { get; }
-        public int   Unknown3           { get; }
-        public int   Unknown4           { get; }
+        public int   Version            { get; private set; }
+        public ulong PermissionsBitmask { get; private set; }
+        public int   Unknown1           { get; private set; }
+        public int   Unknown2           { get; private set; }
+        public int   Unknown3           { get; private set; }
+        public int   Unknown4           { get; private set; }
 
-        public FsAccessControl(Stream stream, int offset, int size)
+        public FsAccessControl(Stream Stream, int Offset, int Size)
         {
-            stream.Seek(offset, SeekOrigin.Begin);
+            Stream.Seek(Offset, SeekOrigin.Begin);
 
-            BinaryReader reader = new BinaryReader(stream);
+            BinaryReader Reader = new BinaryReader(Stream);
 
-            Version            = reader.ReadInt32();
-            PermissionsBitmask = reader.ReadUInt64();
-            Unknown1           = reader.ReadInt32();
-            Unknown2           = reader.ReadInt32();
-            Unknown3           = reader.ReadInt32();
-            Unknown4           = reader.ReadInt32();
+            Version            = Reader.ReadInt32();
+            PermissionsBitmask = Reader.ReadUInt64();
+            Unknown1           = Reader.ReadInt32();
+            Unknown2           = Reader.ReadInt32();
+            Unknown3           = Reader.ReadInt32();
+            Unknown4           = Reader.ReadInt32();
         }
     }
 }
diff --git a/Ryujinx.HLE/Loaders/Npdm/FsAccessHeader.cs b/Ryujinx.HLE/Loaders/Npdm/FsAccessHeader.cs
index 97fb3b14..50e82309 100644
--- a/Ryujinx.HLE/Loaders/Npdm/FsAccessHeader.cs
+++ b/Ryujinx.HLE/Loaders/Npdm/FsAccessHeader.cs
@@ -6,29 +6,29 @@ namespace Ryujinx.HLE.Loaders.Npdm
 {
     class FsAccessHeader
     {
-        public int   Version            { get; }
-        public ulong PermissionsBitmask { get; }
+        public int   Version            { get; private set; }
+        public ulong PermissionsBitmask { get; private set; }
 
-        public FsAccessHeader(Stream stream, int offset, int size)
+        public FsAccessHeader(Stream Stream, int Offset, int Size)
         {
-            stream.Seek(offset, SeekOrigin.Begin);
+            Stream.Seek(Offset, SeekOrigin.Begin);
 
-            BinaryReader reader = new BinaryReader(stream);
+            BinaryReader Reader = new BinaryReader(Stream);
 
-            Version            = reader.ReadInt32();
-            PermissionsBitmask = reader.ReadUInt64();
+            Version            = Reader.ReadInt32();
+            PermissionsBitmask = Reader.ReadUInt64();
 
-            int dataSize = reader.ReadInt32();
+            int DataSize = Reader.ReadInt32();
 
-            if (dataSize != 0x1c)
+            if (DataSize != 0x1c)
             {
                 throw new InvalidNpdmException("FsAccessHeader is corrupted!");
             }
 
-            int contentOwnerIdSize        = reader.ReadInt32();
-            int dataAndContentOwnerIdSize = reader.ReadInt32();
+            int ContentOwnerIdSize        = Reader.ReadInt32();
+            int DataAndContentOwnerIdSize = Reader.ReadInt32();
 
-            if (dataAndContentOwnerIdSize != 0x1c)
+            if (DataAndContentOwnerIdSize != 0x1c)
             {
                 throw new NotImplementedException("ContentOwnerId section is not implemented!");
             }
diff --git a/Ryujinx.HLE/Loaders/Npdm/KernelAccessControl.cs b/Ryujinx.HLE/Loaders/Npdm/KernelAccessControl.cs
index a2f525f7..611eda39 100644
--- a/Ryujinx.HLE/Loaders/Npdm/KernelAccessControl.cs
+++ b/Ryujinx.HLE/Loaders/Npdm/KernelAccessControl.cs
@@ -4,19 +4,19 @@ namespace Ryujinx.HLE.Loaders.Npdm
 {
     class KernelAccessControl
     {
-        public int[] Capabilities { get; }
+        public int[] Capabilities { get; private set; }
 
-        public KernelAccessControl(Stream stream, int offset, int size)
+        public KernelAccessControl(Stream Stream, int Offset, int Size)
         {
-            stream.Seek(offset, SeekOrigin.Begin);
+            Stream.Seek(Offset, SeekOrigin.Begin);
 
-            Capabilities = new int[size / 4];
+            Capabilities = new int[Size / 4];
 
-            BinaryReader reader = new BinaryReader(stream);
+            BinaryReader Reader = new BinaryReader(Stream);
 
-            for (int index = 0; index < Capabilities.Length; index++)
+            for (int Index = 0; Index < Capabilities.Length; Index++)
             {
-                Capabilities[index] = reader.ReadInt32();
+                Capabilities[Index] = Reader.ReadInt32();
             }
         }
     }
diff --git a/Ryujinx.HLE/Loaders/Npdm/Npdm.cs b/Ryujinx.HLE/Loaders/Npdm/Npdm.cs
index 2ffef327..6d74668a 100644
--- a/Ryujinx.HLE/Loaders/Npdm/Npdm.cs
+++ b/Ryujinx.HLE/Loaders/Npdm/Npdm.cs
@@ -11,62 +11,62 @@ namespace Ryujinx.HLE.Loaders.Npdm
     {
         private const int MetaMagic = 'M' << 0 | 'E' << 8 | 'T' << 16 | 'A' << 24;
 
-        public byte   MmuFlags            { get; }
-        public bool   Is64Bits            { get; }
-        public byte   MainThreadPriority  { get; }
-        public byte   DefaultCpuId        { get; }
-        public int    PersonalMmHeapSize  { get; }
-        public int    ProcessCategory     { get; }
-        public int    MainThreadStackSize { get; }
-        public string TitleName           { get; }
-        public byte[] ProductCode         { get; }
-
-        public Aci0 Aci0 { get; }
-        public Acid Acid { get; }
-
-        public Npdm(Stream stream)
+        public byte   MmuFlags            { get; private set; }
+        public bool   Is64Bits            { get; private set; }
+        public byte   MainThreadPriority  { get; private set; }
+        public byte   DefaultCpuId        { get; private set; }
+        public int    PersonalMmHeapSize  { get; private set; }
+        public int    ProcessCategory     { get; private set; }
+        public int    MainThreadStackSize { get; private set; }
+        public string TitleName           { get; private set; }
+        public byte[] ProductCode         { get; private set; }
+
+        public ACI0 ACI0 { get; private set; }
+        public ACID ACID { get; private set; }
+
+        public Npdm(Stream Stream)
         {
-            BinaryReader reader = new BinaryReader(stream);
+            BinaryReader Reader = new BinaryReader(Stream);
 
-            if (reader.ReadInt32() != MetaMagic)
+            if (Reader.ReadInt32() != MetaMagic)
             {
                 throw new InvalidNpdmException("NPDM Stream doesn't contain NPDM file!");
             }
 
-            reader.ReadInt64();
+            Reader.ReadInt64();
 
-            MmuFlags = reader.ReadByte();
+            MmuFlags = Reader.ReadByte();
 
             Is64Bits = (MmuFlags & 1) != 0;
 
-            reader.ReadByte();
+            Reader.ReadByte();
 
-            MainThreadPriority = reader.ReadByte();
-            DefaultCpuId       = reader.ReadByte();
+            MainThreadPriority = Reader.ReadByte();
+            DefaultCpuId       = Reader.ReadByte();
 
-            reader.ReadInt32();
+            Reader.ReadInt32();
 
-            PersonalMmHeapSize = reader.ReadInt32();
+            PersonalMmHeapSize = Reader.ReadInt32();
 
-            ProcessCategory = reader.ReadInt32();
+            ProcessCategory = Reader.ReadInt32();
 
-            MainThreadStackSize = reader.ReadInt32();
+            MainThreadStackSize = Reader.ReadInt32();
 
-            byte[] tempTitleName = reader.ReadBytes(0x10);
+            byte[] TempTitleName = Reader.ReadBytes(0x10);
 
-            TitleName = Encoding.UTF8.GetString(tempTitleName, 0, tempTitleName.Length).Trim('\0');
+            TitleName = Encoding.UTF8.GetString(TempTitleName, 0, TempTitleName.Length).Trim('\0');
 
-            ProductCode = reader.ReadBytes(0x10);
+            ProductCode = Reader.ReadBytes(0x10);
 
-            stream.Seek(0x30, SeekOrigin.Current);
+            Stream.Seek(0x30, SeekOrigin.Current);
 
-            int aci0Offset = reader.ReadInt32();
-            int aci0Size   = reader.ReadInt32();
-            int acidOffset = reader.ReadInt32();
-            int acidSize   = reader.ReadInt32();
+            int ACI0Offset = Reader.ReadInt32();
+            int ACI0Size   = Reader.ReadInt32();
+            int ACIDOffset = Reader.ReadInt32();
+            int ACIDSize   = Reader.ReadInt32();
 
-            Aci0 = new Aci0(stream, aci0Offset);
-            Acid = new Acid(stream, acidOffset);
+            ACI0 = new ACI0(Stream, ACI0Offset);
+            ACID = new ACID(Stream, ACIDOffset);
         }
     }
 }
diff --git a/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs b/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs
index d349f26b..707be603 100644
--- a/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs
+++ b/Ryujinx.HLE/Loaders/Npdm/ServiceAccessControl.cs
@@ -7,36 +7,36 @@ namespace Ryujinx.HLE.Loaders.Npdm
 {
     class ServiceAccessControl
     {
-        public IReadOnlyDictionary<string, bool> Services { get; }
+        public IReadOnlyDictionary<string, bool> Services { get; private set; }
 
-        public ServiceAccessControl(Stream stream, int offset, int size)
+        public ServiceAccessControl(Stream Stream, int Offset, int Size)
         {
-            stream.Seek(offset, SeekOrigin.Begin);
+            Stream.Seek(Offset, SeekOrigin.Begin);
 
-            BinaryReader reader = new BinaryReader(stream);
+            BinaryReader Reader = new BinaryReader(Stream);
 
-            int byteReaded = 0;
+            int ByteReaded = 0;
 
-            Dictionary<string, bool> services = new Dictionary<string, bool>();
+            Dictionary<string, bool> Services = new Dictionary<string, bool>();
 
-            while (byteReaded != size)
+            while (ByteReaded != Size)
             {
-                byte controlByte = reader.ReadByte();
+                byte ControlByte = Reader.ReadByte();
 
-                if (controlByte == 0)
+                if (ControlByte == 0)
                 {
                     break;
                 }
 
-                int  length          = (controlByte & 0x07) + 1;
-                bool registerAllowed = (controlByte & 0x80) != 0;
+                int  Length          = (ControlByte & 0x07) + 1;
+                bool RegisterAllowed = (ControlByte & 0x80) != 0;
 
-                services.Add(Encoding.ASCII.GetString(reader.ReadBytes(length), 0, length), registerAllowed);
+                Services.Add(Encoding.ASCII.GetString(Reader.ReadBytes(Length), 0, Length), RegisterAllowed);
 
-                byteReaded += length + 1;
+                ByteReaded += Length + 1;
             }
 
-            Services = new ReadOnlyDictionary<string, bool>(services);
+            this.Services = new ReadOnlyDictionary<string, bool>(Services);
         }
     }
 }