From a8a1cc4d1cb5e4e6e5dfd18a22ce958f286e7b7c Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Fri, 13 Oct 2017 22:19:04 +0100 Subject: [PATCH] Adjusted several parameters for CD-i file system. --- DiscImageChef.Filesystems/ISO9660/Consts/CDi.cs | 2 +- DiscImageChef.Filesystems/ISO9660/Info.cs | 6 +++--- DiscImageChef.Filesystems/ISO9660/Structs/CDi.cs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DiscImageChef.Filesystems/ISO9660/Consts/CDi.cs b/DiscImageChef.Filesystems/ISO9660/Consts/CDi.cs index 69ebbd8f7..97722fea8 100644 --- a/DiscImageChef.Filesystems/ISO9660/Consts/CDi.cs +++ b/DiscImageChef.Filesystems/ISO9660/Consts/CDi.cs @@ -38,7 +38,7 @@ namespace DiscImageChef.Filesystems.ISO9660 readonly string CdiMagic = "CD-I "; [Flags] - enum CdiVolumeFlags + enum CdiVolumeFlags : byte { // Escapes are not ISO 2375 but ISO 2022 NotISO2375 = 1, diff --git a/DiscImageChef.Filesystems/ISO9660/Info.cs b/DiscImageChef.Filesystems/ISO9660/Info.cs index e03c8e367..fe61b4349 100644 --- a/DiscImageChef.Filesystems/ISO9660/Info.cs +++ b/DiscImageChef.Filesystems/ISO9660/Info.cs @@ -526,9 +526,9 @@ namespace DiscImageChef.Filesystems.ISO9660 ISOMetadata.AppendLine("This is a Sega Dreamcast disc."); ISOMetadata.AppendLine(Decoders.Sega.Dreamcast.Prettify(Dreamcast)); } - ISOMetadata.AppendLine("------------------------------"); - ISOMetadata.AppendLine("VOLUME DESCRIPTOR INFORMATION:"); - ISOMetadata.AppendLine("------------------------------"); + ISOMetadata.AppendFormat("{0}------------------------------", CDi ? "---------------" : "").AppendLine(); + ISOMetadata.AppendFormat("{0}VOLUME DESCRIPTOR INFORMATION:", CDi ? "FILE STRUCTURE " : "").AppendLine(); + ISOMetadata.AppendFormat("{0}------------------------------", CDi ? "---------------" : "").AppendLine(); ISOMetadata.AppendFormat("System identifier: {0}", decodedVD.SystemIdentifier).AppendLine(); ISOMetadata.AppendFormat("Volume identifier: {0}", decodedVD.VolumeIdentifier).AppendLine(); ISOMetadata.AppendFormat("Volume set identifier: {0}", decodedVD.VolumeSetIdentifier).AppendLine(); diff --git a/DiscImageChef.Filesystems/ISO9660/Structs/CDi.cs b/DiscImageChef.Filesystems/ISO9660/Structs/CDi.cs index 5118199cd..976bb81e3 100644 --- a/DiscImageChef.Filesystems/ISO9660/Structs/CDi.cs +++ b/DiscImageChef.Filesystems/ISO9660/Structs/CDi.cs @@ -55,7 +55,7 @@ namespace DiscImageChef.Filesystems.ISO9660 [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)] public byte[] escape_sequences; public ushort reserved2; - public ushort volume_set_siz; + public ushort volume_set_size; public ushort reserved3; public ushort volume_sequence_number; public ushort reserved4; @@ -63,7 +63,7 @@ namespace DiscImageChef.Filesystems.ISO9660 public uint reserved5; public uint path_table_size; public ulong reserved6; - public uint type_m_path_table; + public uint path_table_addr; [MarshalAs(UnmanagedType.ByValArray, SizeConst = 38)] public byte[] reserved7; [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]