Refactor and code cleanup.

This commit is contained in:
2016-07-28 22:25:26 +01:00
parent c93d469da9
commit a63ba13b6b
199 changed files with 3614 additions and 3744 deletions

View File

@@ -38,11 +38,11 @@ namespace DiscImageChef.Filesystems.LisaFS
struct MDDF
{
/// <summary>0x00, Filesystem version</summary>
public UInt16 fsversion;
public ushort fsversion;
/// <summary>0x02, Volume ID</summary>
public UInt64 volid;
public ulong volid;
/// <summary>0x0A, Volume sequence number</summary>
public UInt16 volnum;
public ushort volnum;
/// <summary>0x0C, Pascal string, 32+1 bytes, volume name</summary>
public string volname;
/// <summary>0x2D, unknown, possible padding</summary>
@@ -52,9 +52,9 @@ namespace DiscImageChef.Filesystems.LisaFS
/// <summary>0x4F, unknown, possible padding</summary>
public byte unknown2;
/// <summary>0x50, Lisa serial number that init'ed this disk</summary>
public UInt32 machine_id;
public uint machine_id;
/// <summary>0x54, ID of the master copy ? no idea really</summary>
public UInt32 master_copy_id;
public uint master_copy_id;
/// <summary>0x58, Date of volume creation</summary>
public DateTime dtvc;
/// <summary>0x5C, Date...</summary>
@@ -64,127 +64,127 @@ namespace DiscImageChef.Filesystems.LisaFS
/// <summary>0x64, Date of volume scavenging</summary>
public DateTime dtvs;
/// <summary>0x68, unknown</summary>
public UInt32 unknown3;
public uint unknown3;
/// <summary>0x6C, block the MDDF is residing on</summary>
public UInt32 mddf_block;
public uint mddf_block;
/// <summary>0x70, volsize-1</summary>
public UInt32 volsize_minus_one;
public uint volsize_minus_one;
/// <summary>0x74, volsize-1-mddf_block</summary>
public UInt32 volsize_minus_mddf_minus_one;
public uint volsize_minus_mddf_minus_one;
/// <summary>0x78, Volume size in blocks</summary>
public UInt32 vol_size;
public uint vol_size;
/// <summary>0x7C, Blocks size of underlying drive (data+tags)</summary>
public UInt16 blocksize;
public ushort blocksize;
/// <summary>0x7E, Data only block size</summary>
public UInt16 datasize;
public ushort datasize;
/// <summary>0x80, unknown</summary>
public UInt16 unknown4;
public ushort unknown4;
/// <summary>0x82, unknown</summary>
public UInt32 unknown5;
public uint unknown5;
/// <summary>0x86, unknown</summary>
public UInt32 unknown6;
public uint unknown6;
/// <summary>0x8A, Size in sectors of filesystem clusters</summary>
public UInt16 clustersize;
public ushort clustersize;
/// <summary>0x8C, Filesystem size in blocks</summary>
public UInt32 fs_size;
public uint fs_size;
/// <summary>0x90, unknown</summary>
public UInt32 unknown7;
public uint unknown7;
/// <summary>0x94, Pointer to S-Records</summary>
public UInt32 srec_ptr;
public uint srec_ptr;
/// <summary>0x98, unknown</summary>
public UInt16 unknown9;
public ushort unknown9;
/// <summary>0x9A, S-Records length</summary>
public UInt16 srec_len;
public ushort srec_len;
/// <summary>0x9C, unknown</summary>
public UInt32 unknown10;
public uint unknown10;
/// <summary>0xA0, unknown</summary>
public UInt32 unknown11;
public uint unknown11;
/// <summary>0xA4, unknown</summary>
public UInt32 unknown12;
public uint unknown12;
/// <summary>0xA8, unknown</summary>
public UInt32 unknown13;
public uint unknown13;
/// <summary>0xAC, unknown</summary>
public UInt32 unknown14;
public uint unknown14;
/// <summary>0xB0, Files in volume</summary>
public UInt16 filecount;
public ushort filecount;
/// <summary>0xB2, unknown</summary>
public UInt32 unknown15;
public uint unknown15;
/// <summary>0xB6, unknown</summary>
public UInt32 unknown16;
public uint unknown16;
/// <summary>0xBA, Free blocks</summary>
public UInt32 freecount;
public uint freecount;
/// <summary>0xBE, unknown</summary>
public UInt16 unknown17;
public ushort unknown17;
/// <summary>0xC0, unknown</summary>
public UInt32 unknown18;
public uint unknown18;
/// <summary>0xC4, no idea</summary>
public UInt64 overmount_stamp;
public ulong overmount_stamp;
/// <summary>0xCC, serialization, lisa serial number authorized to use blocked software on this volume</summary>
public UInt32 serialization;
public uint serialization;
/// <summary>0xD0, unknown</summary>
public UInt32 unknown19;
public uint unknown19;
/// <summary>0xD4, unknown, possible timestamp</summary>
public UInt32 unknown_timestamp;
public uint unknown_timestamp;
/// <summary>0xD8, unknown</summary>
public UInt32 unknown20;
public uint unknown20;
/// <summary>0xDC, unknown</summary>
public UInt32 unknown21;
public uint unknown21;
/// <summary>0xE0, unknown</summary>
public UInt32 unknown22;
public uint unknown22;
/// <summary>0xE4, unknown</summary>
public UInt32 unknown23;
public uint unknown23;
/// <summary>0xE8, unknown</summary>
public UInt32 unknown24;
public uint unknown24;
/// <summary>0xEC, unknown</summary>
public UInt32 unknown25;
public uint unknown25;
/// <summary>0xF0, unknown</summary>
public UInt32 unknown26;
public uint unknown26;
/// <summary>0xF4, unknown</summary>
public UInt32 unknown27;
public uint unknown27;
/// <summary>0xF8, unknown</summary>
public UInt32 unknown28;
public uint unknown28;
/// <summary>0xFC, unknown</summary>
public UInt32 unknown29;
public uint unknown29;
/// <summary>0x100, unknown</summary>
public UInt32 unknown30;
public uint unknown30;
/// <summary>0x104, unknown</summary>
public UInt32 unknown31;
public uint unknown31;
/// <summary>0x108, unknown</summary>
public UInt32 unknown32;
public uint unknown32;
/// <summary>0x10C, unknown</summary>
public UInt32 unknown33;
public uint unknown33;
/// <summary>0x110, unknown</summary>
public UInt32 unknown34;
public uint unknown34;
/// <summary>0x114, unknown</summary>
public UInt32 unknown35;
public uint unknown35;
/// <summary>0x118, ID of volume where this volume was backed up</summary>
public UInt64 backup_volid;
public ulong backup_volid;
/// <summary>0x120, Size of LisaInfo label</summary>
public UInt16 label_size;
public ushort label_size;
/// <summary>0x122, not clear</summary>
public UInt16 fs_overhead;
public ushort fs_overhead;
/// <summary>0x124, Return code of Scavenger</summary>
public UInt16 result_scavenge;
public ushort result_scavenge;
/// <summary>0x126, No idea</summary>
public UInt16 boot_code;
public ushort boot_code;
/// <summary>0x128, No idea</summary>
public UInt16 boot_environ;
public ushort boot_environ;
/// <summary>0x12A, unknown</summary>
public UInt32 unknown36;
public uint unknown36;
/// <summary>0x12E, unknown</summary>
public UInt32 unknown37;
public uint unknown37;
/// <summary>0x132, unknown</summary>
public UInt32 unknown38;
public uint unknown38;
/// <summary>0x136, Total volumes in sequence</summary>
public UInt16 vol_sequence;
public ushort vol_sequence;
/// <summary>0x138, Volume is dirty?</summary>
public byte vol_left_mounted;
/// <summary>Is password present? (On-disk position unknown)</summary>
public byte passwd_present;
/// <summary>Opened files (memory-only?) (On-disk position unknown)</summary>
public UInt32 opencount;
public uint opencount;
/// <summary>No idea (On-disk position unknown)</summary>
public UInt32 copy_thread;
public uint copy_thread;
// Flags are boolean, but Pascal seems to use them as full unsigned 8 bit values
/// <summary>No idea (On-disk position unknown)</summary>
public byte privileged;
@@ -203,31 +203,31 @@ namespace DiscImageChef.Filesystems.LisaFS
struct Tag
{
/// <summary>0x00 version</summary>
public UInt16 version;
public ushort version;
/// <summary>0x02 unknown</summary>
public UInt16 unknown;
public ushort unknown;
/// <summary>0x04 File ID. Negative numbers are extents for the file with same absolute value number</summary>
public Int16 fileID;
public short fileID;
/// <summary>Only in 20 bytes tag at 0x06, mask 0x8000 if valid tag</summary>
public UInt16 usedBytes;
public ushort usedBytes;
/// <summary>Only in 20 bytes tag at 0x08, 3 bytes</summary>
public UInt32 absoluteBlock;
public uint absoluteBlock;
/// <summary>Only in 20 bytes tag at 0x0B, checksum byte</summary>
public byte checksum;
/// <summary>0x06 in 12 bytes tag, 0x0C in 20 bytes tag, relative block</summary>
public UInt16 relBlock;
public ushort relBlock;
/// <summary>
/// Next block for this file.
/// In 12 bytes tag at 0x08, 2 bytes, 0x8000 bit seems always set, 0x07FF means this is last block.
/// In 20 bytes tag at 0x0E, 3 bytes, 0xFFFFFF means this is last block.
/// </summary>
public UInt32 nextBlock;
public uint nextBlock;
/// <summary>
/// Previous block for this file.
/// In 12 bytes tag at 0x0A, 2 bytes, 0x07FF means this is first block.
/// In 20 bytes tag at 0x11, 3 bytes, 0xFFFFFF means this is first block.
/// </summary>
public UInt32 prevBlock;
public uint prevBlock;
/// <summary>On-memory value for easy first block search.</summary>
public bool isFirst;
@@ -256,23 +256,23 @@ namespace DiscImageChef.Filesystems.LisaFS
/// <summary>0x25, lot of values found here, unknown</summary>
public byte unknown;
/// <summary>0x26, file ID, must be positive and bigger than 4</summary>
public Int16 fileID;
public short fileID;
/// <summary>0x28, creation date</summary>
public UInt32 dtc;
public uint dtc;
/// <summary>0x2C, last modification date</summary>
public UInt32 dtm;
public uint dtm;
/// <summary>0x30, file length in bytes</summary>
public Int32 length;
public int length;
/// <summary>0x34, file length in bytes, including wasted block space</summary>
public Int32 wasted;
public int wasted;
/// <summary>0x38, unknown</summary>
public byte[] tail;
}
struct Extent
{
public Int32 start;
public Int16 length;
public int start;
public short length;
}
struct ExtentFile
@@ -284,7 +284,7 @@ namespace DiscImageChef.Filesystems.LisaFS
/// <summary>0x20, unknown</summary>
public ushort unknown1;
/// <summary>0x22, 8 bytes</summary>
public UInt64 file_uid;
public ulong file_uid;
/// <summary>0x2A, unknown</summary>
public byte unknown2;
/// <summary>0x2B, entry type? gets modified</summary>
@@ -294,17 +294,17 @@ namespace DiscImageChef.Filesystems.LisaFS
/// <summary>0x2D, unknown</summary>
public byte unknown3;
/// <summary>0x2E, creation time</summary>
public UInt32 dtc;
public uint dtc;
/// <summary>0x32, last access time</summary>
public UInt32 dta;
public uint dta;
/// <summary>0x36, modification time</summary>
public UInt32 dtm;
public uint dtm;
/// <summary>0x3A, backup time</summary>
public UInt32 dtb;
public uint dtb;
/// <summary>0x3E, scavenge time</summary>
public UInt32 dts;
public uint dts;
/// <summary>0x42, machine serial number</summary>
public UInt32 serial;
public uint serial;
/// <summary>0x46, unknown</summary>
public byte unknown4;
/// <summary>0x47, locked file</summary>
@@ -322,13 +322,13 @@ namespace DiscImageChef.Filesystems.LisaFS
/// <summary>0x4D, 11 bytes, unknown</summary>
public byte[] unknown5;
/// <summary>0x58, Release number</summary>
public UInt16 release;
public ushort release;
/// <summary>0x5A, Build number</summary>
public UInt16 build;
public ushort build;
/// <summary>0x5C, Compatibility level</summary>
public UInt16 compatibility;
public ushort compatibility;
/// <summary>0x5E, Revision level</summary>
public UInt16 revision;
public ushort revision;
/// <summary>0x60, unknown</summary>
public ushort unknown6;
/// <summary>0x62, 0x08 set if password is valid</summary>
@@ -342,9 +342,9 @@ namespace DiscImageChef.Filesystems.LisaFS
/// <summary>0x70, 16 bytes, unknown</summary>
public byte[] unknown8;
/// <summary>0x80, 0x200 in v1, file length in blocks</summary>
public Int32 length;
public int length;
/// <summary>0x84, 0x204 in v1, unknown</summary>
public Int32 unknown9;
public int unknown9;
/// <summary>0x88, 0x208 in v1, extents, can contain up to 41 extents (85 in v1), dunno LisaOS maximum (never seen more than 3)</summary>
public Extent[] extents;
/// <summary>0x17E, unknown, empty, padding?</summary>
@@ -356,13 +356,13 @@ namespace DiscImageChef.Filesystems.LisaFS
struct SRecord
{
/// <summary>0x00, block where ExtentsFile for this entry resides</summary>
public UInt32 extent_ptr;
public uint extent_ptr;
/// <summary>0x04, unknown</summary>
public UInt32 unknown;
public uint unknown;
/// <summary>0x08, filesize in bytes</summary>
public UInt32 filesize;
public uint filesize;
/// <summary>0x0C, some kind of flags, meaning unknown</summary>
public UInt16 flags;
public ushort flags;
}
struct CatalogEntryV2
@@ -378,7 +378,7 @@ namespace DiscImageChef.Filesystems.LisaFS
/// <summary>0x23, unknown</summary>
public byte unknown2;
/// <summary>0x24, unknown</summary>
public Int16 fileID;
public short fileID;
/// <summary>0x26, 16 bytes, unknown</summary>
public byte[] unknown3;
}