mirror of
https://github.com/aaru-dps/Aaru.git
synced 2025-12-16 19:24:25 +00:00
[Fossil] Use new source generator based big endian marshaller
This commit is contained in:
@@ -53,7 +53,7 @@ public sealed partial class Fossil
|
|||||||
|
|
||||||
if(errno != ErrorNumber.NoError) return false;
|
if(errno != ErrorNumber.NoError) return false;
|
||||||
|
|
||||||
Header hdr = Marshal.ByteArrayToStructureBigEndian<Header>(sector);
|
Header hdr = Marshal.ByteArrayToStructureBigEndianGenerated<Header>(sector);
|
||||||
|
|
||||||
AaruLogging.Debug(MODULE_NAME, Localization.magic_at_0_expected_1, hdr.magic, FOSSIL_HDR_MAGIC);
|
AaruLogging.Debug(MODULE_NAME, Localization.magic_at_0_expected_1, hdr.magic, FOSSIL_HDR_MAGIC);
|
||||||
|
|
||||||
@@ -77,7 +77,7 @@ public sealed partial class Fossil
|
|||||||
|
|
||||||
if(errno != ErrorNumber.NoError) return;
|
if(errno != ErrorNumber.NoError) return;
|
||||||
|
|
||||||
Header hdr = Marshal.ByteArrayToStructureBigEndian<Header>(sector);
|
Header hdr = Marshal.ByteArrayToStructureBigEndianGenerated<Header>(sector);
|
||||||
|
|
||||||
AaruLogging.Debug(MODULE_NAME, Localization.magic_at_0_expected_1, hdr.magic, FOSSIL_HDR_MAGIC);
|
AaruLogging.Debug(MODULE_NAME, Localization.magic_at_0_expected_1, hdr.magic, FOSSIL_HDR_MAGIC);
|
||||||
|
|
||||||
@@ -103,7 +103,7 @@ public sealed partial class Fossil
|
|||||||
if(sbLocation <= partition.End)
|
if(sbLocation <= partition.End)
|
||||||
{
|
{
|
||||||
imagePlugin.ReadSector(sbLocation, out sector);
|
imagePlugin.ReadSector(sbLocation, out sector);
|
||||||
SuperBlock fsb = Marshal.ByteArrayToStructureBigEndian<SuperBlock>(sector);
|
SuperBlock fsb = Marshal.ByteArrayToStructureBigEndianGenerated<SuperBlock>(sector);
|
||||||
|
|
||||||
AaruLogging.Debug(MODULE_NAME, Localization.magic_0_expected_1, fsb.magic, FOSSIL_SB_MAGIC);
|
AaruLogging.Debug(MODULE_NAME, Localization.magic_0_expected_1, fsb.magic, FOSSIL_SB_MAGIC);
|
||||||
|
|
||||||
|
|||||||
@@ -27,6 +27,7 @@
|
|||||||
// ****************************************************************************/
|
// ****************************************************************************/
|
||||||
|
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
using Aaru.CommonTypes.Attributes;
|
||||||
|
|
||||||
namespace Aaru.Filesystems;
|
namespace Aaru.Filesystems;
|
||||||
|
|
||||||
@@ -37,22 +38,23 @@ public sealed partial class Fossil
|
|||||||
#region Nested type: Header
|
#region Nested type: Header
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Pack = 1)]
|
[StructLayout(LayoutKind.Sequential, Pack = 1)]
|
||||||
readonly struct Header
|
[SwapEndian]
|
||||||
|
partial struct Header
|
||||||
{
|
{
|
||||||
/// <summary>Magic number</summary>
|
/// <summary>Magic number</summary>
|
||||||
public readonly uint magic;
|
public uint magic;
|
||||||
/// <summary>Header version</summary>
|
/// <summary>Header version</summary>
|
||||||
public readonly ushort version;
|
public ushort version;
|
||||||
/// <summary>Block size</summary>
|
/// <summary>Block size</summary>
|
||||||
public readonly ushort blockSize;
|
public ushort blockSize;
|
||||||
/// <summary>Block containing superblock</summary>
|
/// <summary>Block containing superblock</summary>
|
||||||
public readonly uint super;
|
public uint super;
|
||||||
/// <summary>Block containing labels</summary>
|
/// <summary>Block containing labels</summary>
|
||||||
public readonly uint label;
|
public uint label;
|
||||||
/// <summary>Where do data blocks start</summary>
|
/// <summary>Where do data blocks start</summary>
|
||||||
public readonly uint data;
|
public uint data;
|
||||||
/// <summary>How many data blocks does it have</summary>
|
/// <summary>How many data blocks does it have</summary>
|
||||||
public readonly uint end;
|
public uint end;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
@@ -60,30 +62,31 @@ public sealed partial class Fossil
|
|||||||
#region Nested type: SuperBlock
|
#region Nested type: SuperBlock
|
||||||
|
|
||||||
[StructLayout(LayoutKind.Sequential, Pack = 1)]
|
[StructLayout(LayoutKind.Sequential, Pack = 1)]
|
||||||
readonly struct SuperBlock
|
[SwapEndian]
|
||||||
|
partial struct SuperBlock
|
||||||
{
|
{
|
||||||
/// <summary>Magic number</summary>
|
/// <summary>Magic number</summary>
|
||||||
public readonly uint magic;
|
public uint magic;
|
||||||
/// <summary>Header version</summary>
|
/// <summary>Header version</summary>
|
||||||
public readonly ushort version;
|
public ushort version;
|
||||||
/// <summary>file system low epoch</summary>
|
/// <summary>file system low epoch</summary>
|
||||||
public readonly uint epochLow;
|
public uint epochLow;
|
||||||
/// <summary>file system high(active) epoch</summary>
|
/// <summary>file system high(active) epoch</summary>
|
||||||
public readonly uint epochHigh;
|
public uint epochHigh;
|
||||||
/// <summary>next qid to allocate</summary>
|
/// <summary>next qid to allocate</summary>
|
||||||
public readonly ulong qid;
|
public ulong qid;
|
||||||
/// <summary>data block number: root of active file system</summary>
|
/// <summary>data block number: root of active file system</summary>
|
||||||
public readonly int active;
|
public int active;
|
||||||
/// <summary>data block number: root of next file system to archive</summary>
|
/// <summary>data block number: root of next file system to archive</summary>
|
||||||
public readonly int next;
|
public int next;
|
||||||
/// <summary>data block number: root of file system currently being archived</summary>
|
/// <summary>data block number: root of file system currently being archived</summary>
|
||||||
public readonly int current;
|
public int current;
|
||||||
/// <summary>Venti score of last successful archive</summary>
|
/// <summary>Venti score of last successful archive</summary>
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
|
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
|
||||||
public readonly byte[] last;
|
public byte[] last;
|
||||||
/// <summary>name of file system(just a comment)</summary>
|
/// <summary>name of file system(just a comment)</summary>
|
||||||
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
|
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
|
||||||
public readonly byte[] name;
|
public byte[] name;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
Reference in New Issue
Block a user