aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DiscFerret] Use new source generator based big endian marshaller

Browse Source
This commit is contained in:
Natalia Portillo
2025-10-21 10:34:36 +01:00
parent 08c1a7f102
commit 35123c6c06
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Aaru.Images/DiscFerret/Read.cs
View File

@@ -47,10 +47,10 @@ public sealed partial class DiscFerret
/// <inheritdoc />
public ErrorNumber Open(IFilter imageFilter)
{
byte[] magicB = new byte[4];
var magicB = new byte[4];
Stream stream = imageFilter.GetDataForkStream();
stream.EnsureRead(magicB, 0, 4);
uint magic = BitConverter.ToUInt32(magicB, 0);
var magic = BitConverter.ToUInt32(magicB, 0);
if(magic != DFI_MAGIC && magic != DFI_MAGIC2) return ErrorNumber.InvalidArgument;
@@ -64,9 +64,9 @@ public sealed partial class DiscFerret
{
long thisOffset = stream.Position;
byte[] blk = new byte[Marshal.SizeOf<BlockHeader>()];
var blk = new byte[Marshal.SizeOf<BlockHeader>()];
stream.EnsureRead(blk, 0, Marshal.SizeOf<BlockHeader>());
BlockHeader blockHeader = Marshal.ByteArrayToStructureBigEndian<BlockHeader>(blk);
BlockHeader blockHeader = Marshal.ByteArrayToStructureBigEndianGenerated<BlockHeader>(blk);
AaruLogging.Debug(MODULE_NAME, "block@{0}.cylinder = {1}", thisOffset, blockHeader.cylinder);

12
Aaru.Images/DiscFerret/Structs.cs
View File

@@ -31,6 +31,7 @@
// ****************************************************************************/
using System.Runtime.InteropServices;
using Aaru.CommonTypes.Attributes;
namespace Aaru.Images;
@@ -39,12 +40,13 @@ public sealed partial class DiscFerret
#region Nested type: BlockHeader
[StructLayout(LayoutKind.Sequential, Pack = 1)]
readonly struct BlockHeader
[SwapEndian]
partial struct BlockHeader
{
public readonly ushort cylinder;
public readonly ushort head;
public readonly ushort sector;
public readonly uint length;
public ushort cylinder;
public ushort head;
public ushort sector;
public uint length;
}
#endregion