Update ACID.cs

This commit is contained in:
Ac_K 2018-06-17 18:47:00 +02:00 committed by GitHub
commit d78445504b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -4,7 +4,7 @@ using System.IO;
namespace Ryujinx.HLE.Loaders.Npdm namespace Ryujinx.HLE.Loaders.Npdm
{ {
public class ACID class ACID
{ {
public byte[] RSA2048Signature; public byte[] RSA2048Signature;
public byte[] RSA2048Modulus; public byte[] RSA2048Modulus;
@ -14,16 +14,18 @@ namespace Ryujinx.HLE.Loaders.Npdm
public string TitleIdRangeMin; public string TitleIdRangeMin;
public string TitleIdRangeMax; public string TitleIdRangeMax;
private int FSAccessControlOffset; private int FSAccessControlOffset;
private int FSAccessControlSize; private int FSAccessControlSize;
private int ServiceAccessControlOffset; private int ServiceAccessControlOffset;
private int ServiceAccessControlSize; private int ServiceAccessControlSize;
private int KernelAccessControlOffset; private int KernelAccessControlOffset;
private int KernelAccessControlSize; private int KernelAccessControlSize;
public FSAccessControl FSAccessControl; public FSAccessControl FSAccessControl;
public ServiceAccessControl ServiceAccessControl; public ServiceAccessControl ServiceAccessControl;
public KernelAccessControl KernelAccessControl; public KernelAccessControl KernelAccessControl;
public const long ACIDMagic = 'A' << 0 | 'C' << 8 | 'I' << 16 | 'D' << 24;
public ACID(Stream ACIDStream, int Offset) public ACID(Stream ACIDStream, int Offset)
{ {
@ -34,7 +36,7 @@ namespace Ryujinx.HLE.Loaders.Npdm
RSA2048Signature = Reader.ReadBytes(0x100); RSA2048Signature = Reader.ReadBytes(0x100);
RSA2048Modulus = Reader.ReadBytes(0x100); RSA2048Modulus = Reader.ReadBytes(0x100);
if (EndianSwap.Swap32(Reader.ReadInt32()) != 0x41434944) // ACID if (Reader.ReadInt32() != ACIDMagic)
{ {
throw new InvalidNpdmException("ACID Stream doesn't contain ACID section!"); throw new InvalidNpdmException("ACID Stream doesn't contain ACID section!");
} }