diff --git a/DiscImageChef.Core/Media/Info/ScsiInfo.cs b/DiscImageChef.Core/Media/Info/ScsiInfo.cs index 2c18d1059..3a366dabf 100644 --- a/DiscImageChef.Core/Media/Info/ScsiInfo.cs +++ b/DiscImageChef.Core/Media/Info/ScsiInfo.cs @@ -50,8 +50,6 @@ namespace DiscImageChef.Core.Media.Info { public class ScsiInfo { - public byte[] MediaSerialNumber; - public ScsiInfo(Device dev) { if(dev.Type != DeviceType.SCSI && dev.Type != DeviceType.ATAPI) return; @@ -1074,9 +1072,9 @@ namespace DiscImageChef.Core.Media.Info if(sense) DicConsole.DebugWriteLine("Media-Info command", "KREON EXTRACT SS:\n{0}", Sense.PrettifySense(senseBuf)); - else XboxSecuritySectors = cmdBuf; + else XboxSecuritySector = cmdBuf; - DecodedXboxSecuritySectors = SS.Decode(cmdBuf); + DecodedXboxSecuritySector = SS.Decode(cmdBuf); // Get video partition size DicConsole.DebugWriteLine("Dump-media command", "Getting video partition size"); @@ -1192,8 +1190,9 @@ namespace DiscImageChef.Core.Media.Info // TODO: Identify discs that require reading tracks (PC-FX, PlayStation, Sega, etc) } - public byte[] XboxSecuritySectors { get; } - public SS.SecuritySector? DecodedXboxSecuritySectors { get; } + public byte[] MediaSerialNumber { get; } + public byte[] XboxSecuritySector { get; } + public SS.SecuritySector? DecodedXboxSecuritySector { get; } public XgdInfo XgdInfo { get; } public byte[] MmcConfiguration { get; } public byte[] RecognizedFormatLayers { get; } diff --git a/DiscImageChef/Commands/MediaInfo.cs b/DiscImageChef/Commands/MediaInfo.cs index af74df99a..5d08b60ad 100644 --- a/DiscImageChef/Commands/MediaInfo.cs +++ b/DiscImageChef/Commands/MediaInfo.cs @@ -418,13 +418,12 @@ namespace DiscImageChef.Commands foreach(KeyValuePair isrc in scsiInfo.Isrcs) DicConsole.WriteLine("Track's {0} ISRC: {1}", isrc.Key, isrc.Value); - if(scsiInfo.XboxSecuritySectors != null) + if(scsiInfo.XboxSecuritySector != null) DataFile.WriteTo("Media-Info command", outputPrefix, "_xbox_ss.bin", "KREON EXTRACT SS", - scsiInfo.XboxSecuritySectors); + scsiInfo.XboxSecuritySector); - if(scsiInfo.DecodedXboxSecuritySectors.HasValue) - DicConsole.WriteLine("Xbox Security Sector:\n{0}", - SS.Prettify(scsiInfo.DecodedXboxSecuritySectors)); + if(scsiInfo.DecodedXboxSecuritySector.HasValue) + DicConsole.WriteLine("Xbox Security Sector:\n{0}", SS.Prettify(scsiInfo.DecodedXboxSecuritySector)); if(scsiInfo.XgdInfo != null) {