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

[MINIX] Use new source generator based big endian marshaller

Browse Source
This commit is contained in:
Natalia Portillo
2025-10-21 03:38:05 +01:00
parent 82889ee735
commit aa940f19b5
2 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Aaru.Filesystems/MinixFS/Info.cs
View File

@@ -224,7 +224,7 @@ public sealed partial class MinixFS
{
SuperBlock3 mnxSb = littleEndian
? Marshal.ByteArrayToStructureLittleEndian<SuperBlock3>(minixSbSector)
: Marshal.ByteArrayToStructureBigEndian<SuperBlock3>(minixSbSector);
: Marshal.ByteArrayToStructureBigEndianGenerated<SuperBlock3>(minixSbSector);
if(magic != MINIX3_MAGIC && magic != MINIX3_CIGAM) mnxSb.s_blocksize = 1024;
@@ -268,7 +268,7 @@ public sealed partial class MinixFS
{
SuperBlock mnxSb = littleEndian
? Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(minixSbSector)
: Marshal.ByteArrayToStructureBigEndian<SuperBlock>(minixSbSector);
: Marshal.ByteArrayToStructureBigEndianGenerated<SuperBlock>(minixSbSector);
sb.AppendLine(minixVersion);
sb.AppendFormat(Localization._0_chars_in_filename, filenamesize).AppendLine();

51
Aaru.Filesystems/MinixFS/Structs.cs
View File

@@ -27,6 +27,7 @@
// ****************************************************************************/
using System.Runtime.InteropServices;
using Aaru.CommonTypes.Attributes;
namespace Aaru.Filesystems;
@@ -39,28 +40,29 @@ public sealed partial class MinixFS
/// <summary>Superblock for Minix v1 and V2 filesystems</summary>
[StructLayout(LayoutKind.Sequential, Pack = 1)]
readonly struct SuperBlock
[SwapEndian]
partial struct SuperBlock
{
/// <summary>0x00, inodes on volume</summary>
public readonly ushort s_ninodes;
public ushort s_ninodes;
/// <summary>0x02, zones on volume</summary>
public readonly ushort s_nzones;
public ushort s_nzones;
/// <summary>0x04, blocks on inode map</summary>
public readonly short s_imap_blocks;
public short s_imap_blocks;
/// <summary>0x06, blocks on zone map</summary>
public readonly short s_zmap_blocks;
public short s_zmap_blocks;
/// <summary>0x08, first data zone</summary>
public readonly ushort s_firstdatazone;
public ushort s_firstdatazone;
/// <summary>0x0A, log2 of blocks/zone</summary>
public readonly short s_log_zone_size;
public short s_log_zone_size;
/// <summary>0x0C, max file size</summary>
public readonly uint s_max_size;
public uint s_max_size;
/// <summary>0x10, magic</summary>
public readonly ushort s_magic;
public ushort s_magic;
/// <summary>0x12, filesystem state</summary>
public readonly ushort s_state;
public ushort s_state;
/// <summary>0x14, number of zones</summary>
public readonly uint s_zones;
public uint s_zones;
}
#endregion
@@ -69,34 +71,35 @@ public sealed partial class MinixFS
/// <summary>Superblock for Minix v3 filesystems</summary>
[StructLayout(LayoutKind.Sequential, Pack = 1)]
struct SuperBlock3
[SwapEndian]
partial struct SuperBlock3
{
/// <summary>0x00, inodes on volume</summary>
public readonly uint s_ninodes;
public uint s_ninodes;
/// <summary>0x02, old zones on volume</summary>
public readonly ushort s_nzones;
public ushort s_nzones;
/// <summary>0x06, blocks on inode map</summary>
public readonly ushort s_imap_blocks;
public ushort s_imap_blocks;
/// <summary>0x08, blocks on zone map</summary>
public readonly ushort s_zmap_blocks;
public ushort s_zmap_blocks;
/// <summary>0x0A, first data zone</summary>
public readonly ushort s_firstdatazone;
public ushort s_firstdatazone;
/// <summary>0x0C, log2 of blocks/zone</summary>
public readonly ushort s_log_zone_size;
public ushort s_log_zone_size;
/// <summary>0x0E, padding</summary>
public readonly ushort s_pad1;
public ushort s_pad1;
/// <summary>0x10, max file size</summary>
public readonly uint s_max_size;
public uint s_max_size;
/// <summary>0x14, number of zones</summary>
public readonly uint s_zones;
public uint s_zones;
/// <summary>0x18, magic</summary>
public readonly ushort s_magic;
public ushort s_magic;
/// <summary>0x1A, padding</summary>
public readonly ushort s_pad2;
public ushort s_pad2;
/// <summary>0x1C, bytes in a block</summary>
public ushort s_blocksize;
/// <summary>0x1E, on-disk structures version</summary>
public readonly byte s_disk_version;
public byte s_disk_version;
}
#endregion