diff --git a/Ryujinx.Common/Memory/StructByteArrayHelpers.cs b/Ryujinx.Common/Memory/StructByteArrayHelpers.cs deleted file mode 100644 index 8693f5b84..000000000 --- a/Ryujinx.Common/Memory/StructByteArrayHelpers.cs +++ /dev/null @@ -1,77 +0,0 @@ -using System; -using System.Runtime.InteropServices; - -namespace Ryujinx.Common.Memory -{ - [StructLayout(LayoutKind.Sequential, Size = Size, Pack = 1)] - public struct ByteArray128 : IArray - { - private const int Size = 128; - - byte _element; - - public int Length => Size; - public ref byte this[int index] => ref AsSpan()[index]; - public Span AsSpan() => MemoryMarshal.CreateSpan(ref _element, Size); - } - - [StructLayout(LayoutKind.Sequential, Size = Size, Pack = 1)] - public struct ByteArray256 : IArray - { - private const int Size = 256; - - byte _element; - - public int Length => Size; - public ref byte this[int index] => ref AsSpan()[index]; - public Span AsSpan() => MemoryMarshal.CreateSpan(ref _element, Size); - } - - [StructLayout(LayoutKind.Sequential, Size = Size, Pack = 1)] - public struct ByteArray512 : IArray - { - private const int Size = 512; - - byte _element; - - public int Length => Size; - public ref byte this[int index] => ref AsSpan()[index]; - public Span AsSpan() => MemoryMarshal.CreateSpan(ref _element, Size); - } - - [StructLayout(LayoutKind.Sequential, Size = Size, Pack = 1)] - public struct ByteArray1024 : IArray - { - private const int Size = 1024; - - byte _element; - - public int Length => Size; - public ref byte this[int index] => ref AsSpan()[index]; - public Span AsSpan() => MemoryMarshal.CreateSpan(ref _element, Size); - } - - [StructLayout(LayoutKind.Sequential, Size = Size, Pack = 1)] - public struct ByteArray2048 : IArray - { - private const int Size = 2048; - - byte _element; - - public int Length => Size; - public ref byte this[int index] => ref AsSpan()[index]; - public Span AsSpan() => MemoryMarshal.CreateSpan(ref _element, Size); - } - - [StructLayout(LayoutKind.Sequential, Size = Size, Pack = 1)] - public struct ByteArray4096 : IArray - { - private const int Size = 4096; - - byte _element; - - public int Length => Size; - public ref byte this[int index] => ref AsSpan()[index]; - public Span AsSpan() => MemoryMarshal.CreateSpan(ref _element, Size); - } -} diff --git a/Ryujinx.HLE/HOS/Applets/Browser/WebCommonReturnValue.cs b/Ryujinx.HLE/HOS/Applets/Browser/WebCommonReturnValue.cs index 9f7eae700..94a80688d 100644 --- a/Ryujinx.HLE/HOS/Applets/Browser/WebCommonReturnValue.cs +++ b/Ryujinx.HLE/HOS/Applets/Browser/WebCommonReturnValue.cs @@ -6,7 +6,7 @@ namespace Ryujinx.HLE.HOS.Applets.Browser { public WebExitReason ExitReason; public uint Padding; - public ByteArray4096 LastUrl; + public Array4096 LastUrl; public ulong LastUrlSize; } -} +} \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Applets/Error/ApplicationErrorArg.cs b/Ryujinx.HLE/HOS/Applets/Error/ApplicationErrorArg.cs index f40d54112..f24926a80 100644 --- a/Ryujinx.HLE/HOS/Applets/Error/ApplicationErrorArg.cs +++ b/Ryujinx.HLE/HOS/Applets/Error/ApplicationErrorArg.cs @@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Applets.Error { public uint ErrorNumber; public ulong LanguageCode; - public ByteArray2048 MessageText; - public ByteArray2048 DetailsText; + public Array2048 MessageText; + public Array2048 DetailsText; } } \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Services/Ro/Types/NRRCertification.cs b/Ryujinx.HLE/HOS/Services/Ro/Types/NRRCertification.cs index 8c56adb9f..52e9822d0 100644 --- a/Ryujinx.HLE/HOS/Services/Ro/Types/NRRCertification.cs +++ b/Ryujinx.HLE/HOS/Services/Ro/Types/NRRCertification.cs @@ -9,7 +9,7 @@ namespace Ryujinx.HLE.HOS.Services.Ro public ulong ApplicationIdMask; public ulong ApplicationIdPattern; private Array16 _reserved; - public ByteArray256 Modulus; - public ByteArray256 Signature; + public Array256 Modulus; + public Array256 Signature; } -} +} \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Services/Ro/Types/NrrHeader.cs b/Ryujinx.HLE/HOS/Services/Ro/Types/NrrHeader.cs index dbbcb1511..8a28159e9 100644 --- a/Ryujinx.HLE/HOS/Services/Ro/Types/NrrHeader.cs +++ b/Ryujinx.HLE/HOS/Services/Ro/Types/NrrHeader.cs @@ -10,7 +10,7 @@ namespace Ryujinx.HLE.HOS.Services.Ro public uint KeyGeneration; // 9.0.0+ private Array8 _reserved; public NRRCertification Certification; - public ByteArray256 Signature; + public Array256 Signature; public ulong TitleId; public uint Size; public byte Kind; // 7.0.0+ @@ -19,4 +19,4 @@ namespace Ryujinx.HLE.HOS.Services.Ro public uint HashesCount; private Array8 _reserved3; } -} +} \ No newline at end of file