From 2a8b5d3cc5a51e8e4dd72ef065661ab56516c930 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Fri, 15 Jan 2016 07:00:43 +0000 Subject: [PATCH] * DiscImageChef/Commands/MediaInfo.cs: * DiscImageChef/Commands/DeviceInfo.cs: Added support for SCSI sequential devices. * DiscImageChef.Decoders/SCSI/SSC/BlockLimits.cs: * DiscImageChef.Decoders/SCSI/SSC/DensitySupport.cs: * DiscImageChef.Decoders/DiscImageChef.Decoders.csproj: Added decoders for SCSI SSC READ BLOCK LIMITS and REPORT DENSITY SUPPORT. * DiscImageChef.Devices/Device/ScsiCommands/SSC.cs: Corrected ReportDensitySupport. * DiscImageChef.Decoders/SCSI/Modes.cs: Corrected mode size. --- DiscImageChef.Decoders/ChangeLog | 11 + .../DiscImageChef.Decoders.csproj | 3 + DiscImageChef.Decoders/SCSI/Modes.cs | 2 +- .../SCSI/SSC/BlockLimits.cs | 108 +++++++ .../SCSI/SSC/DensitySupport.cs | 278 ++++++++++++++++++ DiscImageChef.Devices/ChangeLog | 5 + .../Device/ScsiCommands/SSC.cs | 4 +- DiscImageChef/ChangeLog | 6 + DiscImageChef/Commands/DeviceInfo.cs | 44 +++ DiscImageChef/Commands/MediaInfo.cs | 276 ++++++++++------- 10 files changed, 621 insertions(+), 116 deletions(-) create mode 100644 DiscImageChef.Decoders/SCSI/SSC/BlockLimits.cs create mode 100644 DiscImageChef.Decoders/SCSI/SSC/DensitySupport.cs diff --git a/DiscImageChef.Decoders/ChangeLog b/DiscImageChef.Decoders/ChangeLog index 0efc4273..ceb94dbe 100644 --- a/DiscImageChef.Decoders/ChangeLog +++ b/DiscImageChef.Decoders/ChangeLog @@ -1,3 +1,14 @@ +2016-01-15 Natalia Portillo + + * SCSI/SSC/BlockLimits.cs: + * SCSI/SSC/DensitySupport.cs: + * DiscImageChef.Decoders.csproj: + Added decoders for SCSI SSC READ BLOCK LIMITS and REPORT + DENSITY SUPPORT. + + * SCSI/Modes.cs: + Corrected mode size. + 2015-12-30 Natalia Portillo * SCSI/Inquiry.cs: diff --git a/DiscImageChef.Decoders/DiscImageChef.Decoders.csproj b/DiscImageChef.Decoders/DiscImageChef.Decoders.csproj index 9040f9c2..d7ff9390 100644 --- a/DiscImageChef.Decoders/DiscImageChef.Decoders.csproj +++ b/DiscImageChef.Decoders/DiscImageChef.Decoders.csproj @@ -87,6 +87,8 @@ + + @@ -108,6 +110,7 @@ + diff --git a/DiscImageChef.Decoders/SCSI/Modes.cs b/DiscImageChef.Decoders/SCSI/Modes.cs index 9548f240..6d0c8675 100644 --- a/DiscImageChef.Decoders/SCSI/Modes.cs +++ b/DiscImageChef.Decoders/SCSI/Modes.cs @@ -5362,7 +5362,7 @@ namespace DiscImageChef.Decoders.SCSI if (pageResponse[1] + 2 != pageResponse.Length) return null; - if (pageResponse.Length < 24) + if (pageResponse.Length < 16) return null; ModePage_0F decoded = new ModePage_0F(); diff --git a/DiscImageChef.Decoders/SCSI/SSC/BlockLimits.cs b/DiscImageChef.Decoders/SCSI/SSC/BlockLimits.cs new file mode 100644 index 00000000..d9c45a7f --- /dev/null +++ b/DiscImageChef.Decoders/SCSI/SSC/BlockLimits.cs @@ -0,0 +1,108 @@ +// /*************************************************************************** +// The Disc Image Chef +// ---------------------------------------------------------------------------- +// +// Filename : BlockLimits.cs +// Version : 1.0 +// Author(s) : Natalia Portillo +// +// Component : Component +// +// Revision : $Revision$ +// Last change by : $Author$ +// Date : $Date$ +// +// --[ Description ] ---------------------------------------------------------- +// +// Description +// +// --[ License ] -------------------------------------------------------------- +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// ---------------------------------------------------------------------------- +// Copyright (C) 2011-2015 Claunia.com +// ****************************************************************************/ +// //$Id$ +using System; +using System.Text; + +namespace DiscImageChef.Decoders.SCSI.SSC +{ + public static class BlockLimits + { + public struct BlockLimitsData + { + /// + /// All blocks size must be multiple of 2^ + /// + public byte granularity; + /// + /// Maximum block length in bytes + /// + public uint maxBlockLen; + /// + /// Minimum block length in bytes + /// + public ushort minBlockLen; + } + + public static BlockLimitsData? Decode(byte[] response) + { + if (response == null) + return null; + + if (response.Length != 6) + return null; + + BlockLimitsData dec = new BlockLimitsData(); + + dec.granularity = (byte)(response[0] & 0x1F); + dec.maxBlockLen = (uint)((response[1] << 16) + (response[2] << 8) + response[3]); + dec.minBlockLen = (ushort)((response[4] << 8) + response[5]); + + return dec; + } + + public static string Prettify(BlockLimitsData? decoded) + { + if (decoded == null) + return null; + + StringBuilder sb = new StringBuilder(); + + if (decoded.Value.maxBlockLen == decoded.Value.minBlockLen) + sb.AppendFormat("Device's block size is fixed at {0} bytes", decoded.Value.minBlockLen).AppendLine(); + else + { + if (decoded.Value.maxBlockLen > 0) + sb.AppendFormat("Device's maximum block size is {0} bytes", decoded.Value.maxBlockLen).AppendLine(); + else + sb.AppendLine("Device does not specify a maximum block size"); + sb.AppendFormat("Device's minimum block size is {0} bytes", decoded.Value.minBlockLen).AppendLine(); + + if (decoded.Value.granularity > 0) + sb.AppendFormat("Device's needs a block size granularity of 2^{0} ({1}) bytes", decoded.Value.granularity, Math.Pow(2, (double)decoded.Value.granularity)).AppendLine(); + } + + return sb.ToString(); + } + + public static string Prettify(byte[] response) + { + return Prettify(Decode(response)); + } + } +} + diff --git a/DiscImageChef.Decoders/SCSI/SSC/DensitySupport.cs b/DiscImageChef.Decoders/SCSI/SSC/DensitySupport.cs new file mode 100644 index 00000000..a8e821b9 --- /dev/null +++ b/DiscImageChef.Decoders/SCSI/SSC/DensitySupport.cs @@ -0,0 +1,278 @@ +// /*************************************************************************** +// The Disc Image Chef +// ---------------------------------------------------------------------------- +// +// Filename : DensitySupport.cs +// Version : 1.0 +// Author(s) : Natalia Portillo +// +// Component : Component +// +// Revision : $Revision$ +// Last change by : $Author$ +// Date : $Date$ +// +// --[ Description ] ---------------------------------------------------------- +// +// Description +// +// --[ License ] -------------------------------------------------------------- +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// ---------------------------------------------------------------------------- +// Copyright (C) 2011-2015 Claunia.com +// ****************************************************************************/ +// //$Id$ +using System; +using System.Collections.Generic; +using System.Text; + +namespace DiscImageChef.Decoders.SCSI.SSC +{ + public static class DensitySupport + { + public struct DensitySupportHeader + { + public ushort length; + public ushort reserved; + public DensitySupportDescriptor[] descriptors; + } + + public struct MediaTypeSupportHeader + { + public ushort length; + public ushort reserved; + public MediaTypeSupportDescriptor[] descriptors; + } + + public struct DensitySupportDescriptor + { + public byte primaryCode; + public byte secondaryCode; + public bool writable; + public bool duplicate; + public bool defaultDensity; + public byte reserved; + public bool lenvalid; + public ushort len; + public uint bpmm; + public ushort width; + public ushort tracks; + public uint capacity; + public string organization; + public string name; + public string description; + } + + public struct MediaTypeSupportDescriptor + { + public byte mediumType; + public byte reserved1; + public ushort len; + public byte numberOfCodes; + public byte[] densityCodes; + public ushort width; + public ushort length; + public byte reserved2; + public byte reserved3; + public string organization; + public string name; + public string description; + } + + public static DensitySupportHeader? DecodeDensity(byte[] response) + { + if (response == null) + return null; + + if (response.Length <= 56) + return null; + + ushort responseLen = (ushort)((response[0] << 8) + response[1] + 2); + + if (response.Length != responseLen) + return null; + + List descriptors = new List(); + int offset = 4; + byte[] tmp; + + while (offset < response.Length) + { + DensitySupportDescriptor descriptor = new DensitySupportDescriptor(); + descriptor.primaryCode = response[offset + 0]; + descriptor.secondaryCode = response[offset + 1]; + descriptor.writable |= (response[offset + 2] & 0x80) == 0x80; + descriptor.duplicate |= (response[offset + 2] & 0x40) == 0x40; + descriptor.defaultDensity |= (response[offset + 2] & 0x20) == 0x20; + descriptor.reserved = (byte)((response[offset + 2] & 0x1E) >> 1); + descriptor.lenvalid |= (response[offset + 2] & 0x01) == 0x01; + descriptor.len = (ushort)((response[offset + 3] << 8) + response[offset + 4]); + descriptor.bpmm = (uint)((response[offset + 5] << 16) + (response[offset + 6] << 8) + response[offset + 7]); + descriptor.width = (ushort)((response[offset + 8] << 8) + response[offset + 9]); + descriptor.tracks = (ushort)((response[offset + 10] << 8) + response[offset + 11]); + descriptor.capacity = (uint)((response[offset + 12] << 24) + (response[offset + 13] << 16) + (response[offset + 14] << 8) + response[offset + 15]); + tmp = new byte[8]; + Array.Copy(response, offset + 16, tmp, 0, 8); + descriptor.organization = StringHandlers.CToString(tmp).Trim(); + tmp = new byte[8]; + Array.Copy(response, offset + 24, tmp, 0, 8); + descriptor.name = StringHandlers.CToString(tmp).Trim(); + tmp = new byte[20]; + Array.Copy(response, offset + 32, tmp, 0, 20); + descriptor.description = StringHandlers.CToString(tmp).Trim(); + + if (descriptor.lenvalid) + offset += descriptor.len + 5; + else + offset += 52; + + descriptors.Add(descriptor); + } + + DensitySupportHeader decoded = new DensitySupportHeader(); + decoded.length = responseLen; + decoded.reserved = (ushort)((response[2] << 8) + response[3] + 2); + decoded.descriptors = descriptors.ToArray(); + + return decoded; + } + + public static string PrettifyDensity(DensitySupportHeader? density) + { + if (density == null) + return null; + + DensitySupportHeader decoded = density.Value; + StringBuilder sb = new StringBuilder(); + + foreach (DensitySupportDescriptor descriptor in decoded.descriptors) + { + sb.AppendFormat("Density \"{0}\" defined by \"{1}\".", descriptor.name, descriptor.organization).AppendLine(); + sb.AppendFormat("\tPrimary code: {0:X2}h", descriptor.primaryCode).AppendLine(); + if(descriptor.primaryCode != descriptor.secondaryCode) + sb.AppendFormat("\tSecondary code: {0:X2}h", descriptor.secondaryCode).AppendLine(); + if (descriptor.writable) + sb.AppendLine("\tDrive can write this density"); + if (descriptor.duplicate) + sb.AppendLine("\tThis descriptor is duplicated"); + if (descriptor.defaultDensity) + sb.AppendLine("\tThis is the default density on the drive"); + sb.AppendFormat("\tDensity has {0} bits per mm, with {1} tracks in a {2} mm width tape", + descriptor.bpmm, descriptor.tracks, (double)((double)descriptor.width / (double)10)).AppendLine(); + sb.AppendFormat("\tDensity maximum capacity is {0} megabytes", descriptor.capacity).AppendLine(); + sb.AppendFormat("\tDensity description: {0}", descriptor.description).AppendLine(); + sb.AppendLine(); + } + + return sb.ToString(); + } + + public static string PrettifyDensity(byte[] response) + { + return PrettifyDensity(DecodeDensity(response)); + } + + public static MediaTypeSupportHeader? DecodeMediumType(byte[] response) + { + if (response == null) + return null; + + if (response.Length <= 60) + return null; + + ushort responseLen = (ushort)((response[0] << 8) + response[1] + 2); + + if (response.Length != responseLen) + return null; + + List descriptors = new List(); + int offset = 4; + byte[] tmp; + + while (offset < response.Length) + { + MediaTypeSupportDescriptor descriptor = new MediaTypeSupportDescriptor(); + descriptor.mediumType = response[offset + 0]; + descriptor.reserved1 = response[offset + 1]; + descriptor.len = (ushort)((response[offset + 2] << 8) + response[offset + 3]); + if (descriptor.len != 52) + return null; + descriptor.numberOfCodes = response[offset + 4]; + descriptor.densityCodes = new byte[9]; + Array.Copy(response, offset + 5, descriptor.densityCodes, 0, 9); + descriptor.width = (ushort)((response[offset + 14] << 8) + response[offset + 15]); + descriptor.length = (ushort)((response[offset + 16] << 8) + response[offset + 17]); + descriptor.reserved1 = response[offset + 18]; + descriptor.reserved1 = response[offset + 19]; + tmp = new byte[8]; + Array.Copy(response, offset + 20, tmp, 0, 8); + descriptor.organization = StringHandlers.CToString(tmp).Trim(); + tmp = new byte[8]; + Array.Copy(response, offset + 28, tmp, 0, 8); + descriptor.name = StringHandlers.CToString(tmp).Trim(); + tmp = new byte[20]; + Array.Copy(response, offset + 36, tmp, 0, 20); + descriptor.description = StringHandlers.CToString(tmp).Trim(); + + offset += 56; + + descriptors.Add(descriptor); + } + + MediaTypeSupportHeader decoded = new MediaTypeSupportHeader(); + decoded.length = responseLen; + decoded.reserved = (ushort)((response[2] << 8) + response[3] + 2); + decoded.descriptors = descriptors.ToArray(); + + return decoded; + } + + public static string PrettifyMediumType(MediaTypeSupportHeader? mediumType) + { + if (mediumType == null) + return null; + + MediaTypeSupportHeader decoded = mediumType.Value; + StringBuilder sb = new StringBuilder(); + + foreach (MediaTypeSupportDescriptor descriptor in decoded.descriptors) + { + sb.AppendFormat("Medium type \"{0}\" defined by \"{1}\".", descriptor.name, descriptor.organization).AppendLine(); + sb.AppendFormat("\tMedium type code: {0:X2}h", descriptor.mediumType).AppendLine(); + if (descriptor.numberOfCodes > 0) + { + sb.AppendFormat("\tMedium supports following density codes:"); + for (int i = 0; i < descriptor.numberOfCodes; i++) + sb.AppendFormat(" {0:X2}h", descriptor.densityCodes[i]); + sb.AppendLine(); + } + + sb.AppendFormat("\tMedium has a nominal length of {0} m in a {1} mm width tape", + descriptor.length, (double)((double)descriptor.width / (double)10)).AppendLine(); + sb.AppendFormat("\tMedium description: {0}", descriptor.description).AppendLine(); + sb.AppendLine(); + } + + return sb.ToString(); + } + + public static string PrettifyMediumType(byte[] response) + { + return PrettifyMediumType(DecodeMediumType(response)); + } + } +} + diff --git a/DiscImageChef.Devices/ChangeLog b/DiscImageChef.Devices/ChangeLog index d6e6aa08..9081362f 100644 --- a/DiscImageChef.Devices/ChangeLog +++ b/DiscImageChef.Devices/ChangeLog @@ -1,3 +1,8 @@ +2016-01-15 Natalia Portillo + + * Device/ScsiCommands/SSC.cs: + Corrected ReportDensitySupport. + 2016-01-14 Natalia Portillo * Device/ScsiCommands/SyQuest.cs: diff --git a/DiscImageChef.Devices/Device/ScsiCommands/SSC.cs b/DiscImageChef.Devices/Device/ScsiCommands/SSC.cs index 680e5076..ffb45a54 100644 --- a/DiscImageChef.Devices/Device/ScsiCommands/SSC.cs +++ b/DiscImageChef.Devices/Device/ScsiCommands/SSC.cs @@ -892,9 +892,9 @@ namespace DiscImageChef.Devices bool sense; cdb[0] = (byte)ScsiCommands.ReportDensitySupport; - if (mediumType) - cdb[1] += 0x01; if (currentMedia) + cdb[1] += 0x01; + if (mediumType) cdb[1] += 0x02; cdb[7] = (byte)((buffer.Length & 0xFF00) >> 8); cdb[8] = (byte)(buffer.Length & 0xFF); diff --git a/DiscImageChef/ChangeLog b/DiscImageChef/ChangeLog index 673ee0c0..348594dc 100644 --- a/DiscImageChef/ChangeLog +++ b/DiscImageChef/ChangeLog @@ -1,3 +1,9 @@ +2016-01-15 Natalia Portillo + + * Commands/MediaInfo.cs: + * Commands/DeviceInfo.cs: + Added support for SCSI sequential devices. + 2016-01-14 Natalia Portillo * Commands/DeviceInfo.cs: diff --git a/DiscImageChef/Commands/DeviceInfo.cs b/DiscImageChef/Commands/DeviceInfo.cs index cc5f1f4c..01137b17 100644 --- a/DiscImageChef/Commands/DeviceInfo.cs +++ b/DiscImageChef/Commands/DeviceInfo.cs @@ -943,6 +943,50 @@ namespace DiscImageChef.Commands #endregion Plextor } + if (devType == DiscImageChef.Decoders.SCSI.PeripheralDeviceTypes.SequentialAccess) + { + byte[] seqBuf; + + sense = dev.ReadBlockLimits(out seqBuf, out senseBuf, dev.Timeout, out duration); + if (sense) + DicConsole.ErrorWriteLine("READ BLOCK LIMITS:\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); + else + { + doWriteFile(options.OutputPrefix, "_ssc_readblocklimits.bin", "SSC READ BLOCK LIMITS", seqBuf); + DicConsole.WriteLine("Block limits for device:"); + DicConsole.WriteLine(Decoders.SCSI.SSC.BlockLimits.Prettify(seqBuf)); + } + + sense = dev.ReportDensitySupport(out seqBuf, out senseBuf, dev.Timeout, out duration); + if (sense) + DicConsole.ErrorWriteLine("REPORT DENSITY SUPPORT:\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); + else + { + doWriteFile(options.OutputPrefix, "_ssc_reportdensitysupport.bin", "SSC REPORT DENSITY SUPPORT", seqBuf); + Decoders.SCSI.SSC.DensitySupport.DensitySupportHeader? dens = Decoders.SCSI.SSC.DensitySupport.DecodeDensity(seqBuf); + if (dens.HasValue) + { + DicConsole.WriteLine("Densities supported by device:"); + DicConsole.WriteLine(Decoders.SCSI.SSC.DensitySupport.PrettifyDensity(dens)); + } + } + + sense = dev.ReportDensitySupport(out seqBuf, out senseBuf, true, false, dev.Timeout, out duration); + if (sense) + DicConsole.ErrorWriteLine("REPORT DENSITY SUPPORT (MEDIUM):\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); + else + { + doWriteFile(options.OutputPrefix, "_ssc_reportdensitysupport_medium.bin", "SSC REPORT DENSITY SUPPORT (MEDIUM)", seqBuf); + Decoders.SCSI.SSC.DensitySupport.MediaTypeSupportHeader? meds = Decoders.SCSI.SSC.DensitySupport.DecodeMediumType(seqBuf); + if (meds.HasValue) + { + DicConsole.WriteLine("Medium types supported by device:"); + DicConsole.WriteLine(Decoders.SCSI.SSC.DensitySupport.PrettifyMediumType(meds)); + } + DicConsole.WriteLine(Decoders.SCSI.SSC.DensitySupport.PrettifyMediumType(seqBuf)); + } + } + break; } default: diff --git a/DiscImageChef/Commands/MediaInfo.cs b/DiscImageChef/Commands/MediaInfo.cs index 83fee1c1..08b0f325 100644 --- a/DiscImageChef/Commands/MediaInfo.cs +++ b/DiscImageChef/Commands/MediaInfo.cs @@ -40,6 +40,7 @@ using DiscImageChef.Console; using System.IO; using DiscImageChef.Devices; using DiscImageChef.CommonTypes; +using System.Linq; namespace DiscImageChef.Commands { @@ -175,11 +176,11 @@ namespace DiscImageChef.Commands } if (dev.SCSIType == DiscImageChef.Decoders.SCSI.PeripheralDeviceTypes.DirectAccess || - dev.SCSIType == DiscImageChef.Decoders.SCSI.PeripheralDeviceTypes.MultiMediaDevice || - dev.SCSIType == DiscImageChef.Decoders.SCSI.PeripheralDeviceTypes.OCRWDevice || - dev.SCSIType == DiscImageChef.Decoders.SCSI.PeripheralDeviceTypes.OpticalDevice || - dev.SCSIType == DiscImageChef.Decoders.SCSI.PeripheralDeviceTypes.SimplifiedDevice || - dev.SCSIType == DiscImageChef.Decoders.SCSI.PeripheralDeviceTypes.WriteOnceDevice) + dev.SCSIType == DiscImageChef.Decoders.SCSI.PeripheralDeviceTypes.MultiMediaDevice || + dev.SCSIType == DiscImageChef.Decoders.SCSI.PeripheralDeviceTypes.OCRWDevice || + dev.SCSIType == DiscImageChef.Decoders.SCSI.PeripheralDeviceTypes.OpticalDevice || + dev.SCSIType == DiscImageChef.Decoders.SCSI.PeripheralDeviceTypes.SimplifiedDevice || + dev.SCSIType == DiscImageChef.Decoders.SCSI.PeripheralDeviceTypes.WriteOnceDevice) { sense = dev.ReadCapacity(out cmdBuf, out senseBuf, dev.Timeout, out duration); if (!sense) @@ -224,7 +225,56 @@ namespace DiscImageChef.Commands } if (dev.SCSIType == DiscImageChef.Decoders.SCSI.PeripheralDeviceTypes.SequentialAccess) - throw new NotImplementedException("SCSI Streaming Devices not yet implemented"); + { + byte[] seqBuf; + byte[] medBuf; + + sense = dev.ReportDensitySupport(out seqBuf, out senseBuf, false, dev.Timeout, out duration); + if (!sense) + { + sense = dev.ReportDensitySupport(out medBuf, out senseBuf, true, dev.Timeout, out duration); + + if (!sense && !seqBuf.SequenceEqual(medBuf)) + { + doWriteFile(outputPrefix, "_ssc_reportdensitysupport_media.bin", "SSC REPORT DENSITY SUPPORT (MEDIA)", seqBuf); + Decoders.SCSI.SSC.DensitySupport.DensitySupportHeader? dens = Decoders.SCSI.SSC.DensitySupport.DecodeDensity(seqBuf); + if (dens.HasValue) + { + DicConsole.WriteLine("Densities supported by currently inserted media:"); + DicConsole.WriteLine(Decoders.SCSI.SSC.DensitySupport.PrettifyDensity(dens)); + } + } + } + + sense = dev.ReportDensitySupport(out seqBuf, out senseBuf, true, false, dev.Timeout, out duration); + if (!sense) + { + sense = dev.ReportDensitySupport(out medBuf, out senseBuf, true, true, dev.Timeout, out duration); + + if (!sense && !seqBuf.SequenceEqual(medBuf)) + { + doWriteFile(outputPrefix, "_ssc_reportdensitysupport_medium_media.bin", "SSC REPORT DENSITY SUPPORT (MEDIUM & MEDIA)", seqBuf); + Decoders.SCSI.SSC.DensitySupport.MediaTypeSupportHeader? meds = Decoders.SCSI.SSC.DensitySupport.DecodeMediumType(seqBuf); + if (meds.HasValue) + { + DicConsole.WriteLine("Medium types currently inserted in device:"); + DicConsole.WriteLine(Decoders.SCSI.SSC.DensitySupport.PrettifyMediumType(meds)); + } + DicConsole.WriteLine(Decoders.SCSI.SSC.DensitySupport.PrettifyMediumType(seqBuf)); + } + } + + // TODO: Get a machine where 16-byte CDBs don't get DID_ABORT + /* + sense = dev.ReadAttribute(out seqBuf, out senseBuf, ScsiAttributeAction.List, 0, dev.Timeout, out duration); + if (sense) + DicConsole.ErrorWriteLine("SCSI READ ATTRIBUTE:\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); + else + { + doWriteFile(outputPrefix, "_scsi_readattribute.bin", "SCSI READ ATTRIBUTE", seqBuf); + } + */ + } if (dev.SCSIType == DiscImageChef.Decoders.SCSI.PeripheralDeviceTypes.MultiMediaDevice) { @@ -332,12 +382,12 @@ namespace DiscImageChef.Commands } sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.RecognizedFormatLayers, 0, dev.Timeout, out duration); - if(sense) + if (sense) DicConsole.ErrorWriteLine("READ DISC STRUCTURE: Recognized Format Layers\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else doWriteFile(outputPrefix, "_readdiscstructure_formatlayers.bin", "SCSI READ DISC STRUCTURE", cmdBuf); sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.WriteProtectionStatus, 0, dev.Timeout, out duration); - if(sense) + if (sense) DicConsole.ErrorWriteLine("READ DISC STRUCTURE: Write Protection Status\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else doWriteFile(outputPrefix, "_readdiscstructure_writeprotection.bin", "SCSI READ DISC STRUCTURE", cmdBuf); @@ -353,10 +403,10 @@ namespace DiscImageChef.Commands #region All DVD and HD DVD types if (dskType == DiskType.DVDDownload || dskType == DiskType.DVDPR || - dskType == DiskType.DVDPRDL || dskType == DiskType.DVDPRW || - dskType == DiskType.DVDPRWDL || dskType == DiskType.DVDR || - dskType == DiskType.DVDRAM || dskType == DiskType.DVDRDL || - dskType == DiskType.DVDROM || dskType == DiskType.DVDRW || + dskType == DiskType.DVDPRDL || dskType == DiskType.DVDPRW || + dskType == DiskType.DVDPRWDL || dskType == DiskType.DVDR || + dskType == DiskType.DVDRAM || dskType == DiskType.DVDRDL || + dskType == DiskType.DVDROM || dskType == DiskType.DVDRW || dskType == DiskType.DVDRWDL || dskType == DiskType.HDDVDR || dskType == DiskType.HDDVDRAM || dskType == DiskType.HDDVDRDL || dskType == DiskType.HDDVDROM || dskType == DiskType.HDDVDRW || @@ -372,7 +422,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine("PFI:\n{0}", Decoders.DVD.PFI.Prettify(cmdBuf)); } sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.DiscManufacturingInformation, 0, dev.Timeout, out duration); - if(sense) + if (sense) DicConsole.ErrorWriteLine("READ DISC STRUCTURE: DMI\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else { @@ -380,7 +430,7 @@ namespace DiscImageChef.Commands //if(Decoders.Xbox.DMI.IsXbox(cmdBuf)) // Nop(); //else if - if(Decoders.Xbox.DMI.IsXbox360(cmdBuf)) + if (Decoders.Xbox.DMI.IsXbox360(cmdBuf)) { // TODO: Detect XGD3 from XGD2... dskType = DiskType.XGD2; @@ -394,7 +444,7 @@ namespace DiscImageChef.Commands if (dskType == DiskType.DVDDownload || dskType == DiskType.DVDROM) { sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.CopyrightInformation, 0, dev.Timeout, out duration); - if(sense) + if (sense) DicConsole.ErrorWriteLine("READ DISC STRUCTURE: CMI\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else { @@ -409,12 +459,12 @@ namespace DiscImageChef.Commands dskType == DiskType.HDDVDROM) { sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.BurstCuttingArea, 0, dev.Timeout, out duration); - if(sense) + if (sense) DicConsole.ErrorWriteLine("READ DISC STRUCTURE: BCA\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else doWriteFile(outputPrefix, "_readdiscstructure_dvd_bca.bin", "SCSI READ DISC STRUCTURE", cmdBuf); sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.DVD_AACS, 0, dev.Timeout, out duration); - if(sense) + if (sense) DicConsole.ErrorWriteLine("READ DISC STRUCTURE: DVD AACS\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else doWriteFile(outputPrefix, "_readdiscstructure_dvd_aacs.bin", "SCSI READ DISC STRUCTURE", cmdBuf); @@ -482,10 +532,10 @@ namespace DiscImageChef.Commands #endregion Require drive authentication, won't work #region DVD-RAM and HD DVD-RAM - if(dskType == DiskType.DVDRAM || dskType == DiskType.HDDVDRAM) + if (dskType == DiskType.DVDRAM || dskType == DiskType.HDDVDRAM) { sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.DVDRAM_DDS, 0, dev.Timeout, out duration); - if(sense) + if (sense) DicConsole.ErrorWriteLine("READ DISC STRUCTURE: DDS\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else { @@ -493,7 +543,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine("Disc Definition Structure:\n{0}", Decoders.DVD.DDS.Prettify(cmdBuf)); } sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.DVDRAM_MediumStatus, 0, dev.Timeout, out duration); - if(sense) + if (sense) DicConsole.ErrorWriteLine("READ DISC STRUCTURE: Medium Status\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else { @@ -501,7 +551,7 @@ namespace DiscImageChef.Commands DicConsole.WriteLine("Medium Status:\n{0}", Decoders.DVD.Cartridge.Prettify(cmdBuf)); } sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.DVDRAM_SpareAreaInformation, 0, dev.Timeout, out duration); - if(sense) + if (sense) DicConsole.ErrorWriteLine("READ DISC STRUCTURE: SAI\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else { @@ -512,21 +562,21 @@ namespace DiscImageChef.Commands #endregion DVD-RAM and HD DVD-RAM #region DVD-R and HD DVD-R - if(dskType == DiskType.DVDR || dskType == DiskType.HDDVDR) + if (dskType == DiskType.DVDR || dskType == DiskType.HDDVDR) { - sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.LastBorderOutRMD, 0, dev.Timeout, out duration); - if(sense) - DicConsole.ErrorWriteLine("READ DISC STRUCTURE: Last-Out Border RMD\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); - else - doWriteFile(outputPrefix, "_readdiscstructure_dvd_lastrmd.bin", "SCSI READ DISC STRUCTURE", cmdBuf); + sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.LastBorderOutRMD, 0, dev.Timeout, out duration); + if (sense) + DicConsole.ErrorWriteLine("READ DISC STRUCTURE: Last-Out Border RMD\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); + else + doWriteFile(outputPrefix, "_readdiscstructure_dvd_lastrmd.bin", "SCSI READ DISC STRUCTURE", cmdBuf); } #endregion DVD-R and HD DVD-R #region DVD-R and DVD-RW - if(dskType == DiskType.DVDR || dskType == DiskType.DVDRW) + if (dskType == DiskType.DVDR || dskType == DiskType.DVDRW) { sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.PreRecordedInfo, 0, dev.Timeout, out duration); - if(sense) + if (sense) DicConsole.ErrorWriteLine("READ DISC STRUCTURE: Pre-Recorded Info\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else doWriteFile(outputPrefix, "_readdiscstructure_dvd_pri.bin", "SCSI READ DISC STRUCTURE", cmdBuf); @@ -534,24 +584,24 @@ namespace DiscImageChef.Commands #endregion DVD-R and DVD-RW #region DVD-R, DVD-RW and HD DVD-R - if(dskType == DiskType.DVDR || dskType == DiskType.DVDRW || dskType == DiskType.HDDVDR) + if (dskType == DiskType.DVDR || dskType == DiskType.DVDRW || dskType == DiskType.HDDVDR) { - sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.DVDR_MediaIdentifier, 0, dev.Timeout, out duration); - if(sense) - DicConsole.ErrorWriteLine("READ DISC STRUCTURE: DVD-R Media ID\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); - else - doWriteFile(outputPrefix, "_readdiscstructure_dvdr_mediaid.bin", "SCSI READ DISC STRUCTURE", cmdBuf); - sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.DVDR_PhysicalInformation, 0, dev.Timeout, out duration); - if(sense) - DicConsole.ErrorWriteLine("READ DISC STRUCTURE: DVD-R PFI\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); - else - doWriteFile(outputPrefix, "_readdiscstructure_dvdr_pfi.bin", "SCSI READ DISC STRUCTURE", cmdBuf); + sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.DVDR_MediaIdentifier, 0, dev.Timeout, out duration); + if (sense) + DicConsole.ErrorWriteLine("READ DISC STRUCTURE: DVD-R Media ID\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); + else + doWriteFile(outputPrefix, "_readdiscstructure_dvdr_mediaid.bin", "SCSI READ DISC STRUCTURE", cmdBuf); + sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.DVDR_PhysicalInformation, 0, dev.Timeout, out duration); + if (sense) + DicConsole.ErrorWriteLine("READ DISC STRUCTURE: DVD-R PFI\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); + else + doWriteFile(outputPrefix, "_readdiscstructure_dvdr_pfi.bin", "SCSI READ DISC STRUCTURE", cmdBuf); } #endregion DVD-R, DVD-RW and HD DVD-R #region All DVD+ - if(dskType == DiskType.DVDPR || dskType == DiskType.DVDPRDL || - dskType == DiskType.DVDPRW || dskType == DiskType.DVDPRWDL) + if (dskType == DiskType.DVDPR || dskType == DiskType.DVDPRDL || + dskType == DiskType.DVDPRW || dskType == DiskType.DVDPRWDL) { // TODO: None of my test discs return an ADIP. Also, it just seems to contain pre-recorded PFI, and drive is returning it on blank media using standard PFI command /* @@ -563,7 +613,7 @@ namespace DiscImageChef.Commands */ sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.DCB, 0, dev.Timeout, out duration); - if(sense) + if (sense) DicConsole.ErrorWriteLine("READ DISC STRUCTURE: DCB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else doWriteFile(outputPrefix, "_readdiscstructure_dvd+_dcb.bin", "SCSI READ DISC STRUCTURE", cmdBuf); @@ -571,10 +621,10 @@ namespace DiscImageChef.Commands #endregion All DVD+ #region HD DVD-ROM - if(dskType == DiskType.HDDVDROM) + if (dskType == DiskType.HDDVDROM) { sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.HDDVD_CopyrightInformation, 0, dev.Timeout, out duration); - if(sense) + if (sense) DicConsole.ErrorWriteLine("READ DISC STRUCTURE: HDDVD CMI\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else doWriteFile(outputPrefix, "_readdiscstructure_hddvd_cmi.bin", "SCSI READ DISC STRUCTURE", cmdBuf); @@ -582,15 +632,15 @@ namespace DiscImageChef.Commands #endregion HD DVD-ROM #region HD DVD-R - if(dskType == DiskType.HDDVDR) + if (dskType == DiskType.HDDVDR) { sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.HDDVDR_MediumStatus, 0, dev.Timeout, out duration); - if(sense) + if (sense) DicConsole.ErrorWriteLine("READ DISC STRUCTURE: HDDVD-R Medium Status\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else doWriteFile(outputPrefix, "_readdiscstructure_hddvdr_status.bin", "SCSI READ DISC STRUCTURE", cmdBuf); sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.HDDVDR_LastRMD, 0, dev.Timeout, out duration); - if(sense) + if (sense) DicConsole.ErrorWriteLine("READ DISC STRUCTURE: Last RMD\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else doWriteFile(outputPrefix, "_readdiscstructure_hddvdr_lastrmd.bin", "SCSI READ DISC STRUCTURE", cmdBuf); @@ -598,46 +648,46 @@ namespace DiscImageChef.Commands #endregion HD DVD-R #region DVD-R DL, DVD-RW DL, DVD+R DL, DVD+RW DL - if(dskType == DiskType.DVDPRDL || dskType == DiskType.DVDRDL || - dskType == DiskType.DVDRWDL || dskType == DiskType.DVDPRWDL) + if (dskType == DiskType.DVDPRDL || dskType == DiskType.DVDRDL || + dskType == DiskType.DVDRWDL || dskType == DiskType.DVDPRWDL) { - sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.DVDR_LayerCapacity, 0, dev.Timeout, out duration); - if(sense) - DicConsole.ErrorWriteLine("READ DISC STRUCTURE: Layer Capacity\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); - else - doWriteFile(outputPrefix, "_readdiscstructure_dvdr_layercap.bin", "SCSI READ DISC STRUCTURE", cmdBuf); + sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.DVDR_LayerCapacity, 0, dev.Timeout, out duration); + if (sense) + DicConsole.ErrorWriteLine("READ DISC STRUCTURE: Layer Capacity\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); + else + doWriteFile(outputPrefix, "_readdiscstructure_dvdr_layercap.bin", "SCSI READ DISC STRUCTURE", cmdBuf); } #endregion DVD-R DL, DVD-RW DL, DVD+R DL, DVD+RW DL #region DVD-R DL - if(dskType == DiskType.DVDRDL) + if (dskType == DiskType.DVDRDL) { - sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.MiddleZoneStart, 0, dev.Timeout, out duration); - if(sense) - DicConsole.ErrorWriteLine("READ DISC STRUCTURE: Middle Zone Start\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); - else - doWriteFile(outputPrefix, "_readdiscstructure_dvd_mzs.bin", "SCSI READ DISC STRUCTURE", cmdBuf); - sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.JumpIntervalSize, 0, dev.Timeout, out duration); - if(sense) - DicConsole.ErrorWriteLine("READ DISC STRUCTURE: Jump Interval Size\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); - else - doWriteFile(outputPrefix, "_readdiscstructure_dvd_jis.bin", "SCSI READ DISC STRUCTURE", cmdBuf); - sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.ManualLayerJumpStartLBA, 0, dev.Timeout, out duration); - if(sense) - DicConsole.ErrorWriteLine("READ DISC STRUCTURE: Manual Layer Jump Start LBA\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); - else - doWriteFile(outputPrefix, "_readdiscstructure_dvd_manuallj.bin", "SCSI READ DISC STRUCTURE", cmdBuf); - sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.RemapAnchorPoint, 0, dev.Timeout, out duration); - if(sense) - DicConsole.ErrorWriteLine("READ DISC STRUCTURE: Remap Anchor Point\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); - else - doWriteFile(outputPrefix, "_readdiscstructure_dvd_remapanchor.bin", "SCSI READ DISC STRUCTURE", cmdBuf); + sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.MiddleZoneStart, 0, dev.Timeout, out duration); + if (sense) + DicConsole.ErrorWriteLine("READ DISC STRUCTURE: Middle Zone Start\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); + else + doWriteFile(outputPrefix, "_readdiscstructure_dvd_mzs.bin", "SCSI READ DISC STRUCTURE", cmdBuf); + sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.JumpIntervalSize, 0, dev.Timeout, out duration); + if (sense) + DicConsole.ErrorWriteLine("READ DISC STRUCTURE: Jump Interval Size\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); + else + doWriteFile(outputPrefix, "_readdiscstructure_dvd_jis.bin", "SCSI READ DISC STRUCTURE", cmdBuf); + sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.ManualLayerJumpStartLBA, 0, dev.Timeout, out duration); + if (sense) + DicConsole.ErrorWriteLine("READ DISC STRUCTURE: Manual Layer Jump Start LBA\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); + else + doWriteFile(outputPrefix, "_readdiscstructure_dvd_manuallj.bin", "SCSI READ DISC STRUCTURE", cmdBuf); + sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.RemapAnchorPoint, 0, dev.Timeout, out duration); + if (sense) + DicConsole.ErrorWriteLine("READ DISC STRUCTURE: Remap Anchor Point\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); + else + doWriteFile(outputPrefix, "_readdiscstructure_dvd_remapanchor.bin", "SCSI READ DISC STRUCTURE", cmdBuf); } #endregion DVD-R DL #region All Blu-ray if (dskType == DiskType.BDR || dskType == DiskType.BDRE || dskType == DiskType.BDROM || - dskType == DiskType.BDRXL || dskType == DiskType.BDREXL) + dskType == DiskType.BDRXL || dskType == DiskType.BDREXL) { sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.BD, 0, 0, MmcDiscStructureFormat.DiscInformation, 0, dev.Timeout, out duration); if (sense) @@ -656,7 +706,7 @@ namespace DiscImageChef.Commands #endregion All Blu-ray #region BD-ROM only - if(dskType == DiskType.BDROM) + if (dskType == DiskType.BDROM) { sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.BD, 0, 0, MmcDiscStructureFormat.BD_BurstCuttingArea, 0, dev.Timeout, out duration); if (sense) @@ -722,11 +772,11 @@ namespace DiscImageChef.Commands #endregion Writable Blu-ray only #region CDs - if(dskType == DiskType.CD || - dskType == DiskType.CDR || - dskType == DiskType.CDROM || - dskType == DiskType.CDRW || - dskType == DiskType.Unknown) + if (dskType == DiskType.CD || + dskType == DiskType.CDR || + dskType == DiskType.CDROM || + dskType == DiskType.CDRW || + dskType == DiskType.Unknown) { Decoders.CD.TOC.CDTOC? toc = null; @@ -742,7 +792,7 @@ namespace DiscImageChef.Commands doWriteFile(outputPrefix, "_toc.bin", "SCSI READ TOC/PMA/ATIP", cmdBuf); // As we have a TOC we know it is a CD - if(dskType == DiskType.Unknown) + if (dskType == DiskType.Unknown) dskType = DiskType.CD; } @@ -754,7 +804,7 @@ namespace DiscImageChef.Commands { doWriteFile(outputPrefix, "_atip.bin", "SCSI READ TOC/PMA/ATIP", cmdBuf); Decoders.CD.ATIP.CDATIP? atip = Decoders.CD.ATIP.Decode(cmdBuf); - if(atip.HasValue) + if (atip.HasValue) { DicConsole.WriteLine("ATIP:\n{0}", Decoders.CD.ATIP.Prettify(atip)); // Only CD-R and CD-RW have ATIP @@ -763,7 +813,7 @@ namespace DiscImageChef.Commands } // We got a TOC, get information about a recorded/mastered CD - if(!tocSense) + if (!tocSense) { sense = dev.ReadDiscInformation(out cmdBuf, out senseBuf, MmcDiscInformationDataTypes.DiscInformation, dev.Timeout, out duration); if (sense) @@ -771,15 +821,15 @@ namespace DiscImageChef.Commands else { Decoders.SCSI.MMC.DiscInformation.StandardDiscInformation? discInfo = Decoders.SCSI.MMC.DiscInformation.Decode000b(cmdBuf); - if(discInfo.HasValue) + if (discInfo.HasValue) { DicConsole.WriteLine("Standard Disc Information:\n{0}", Decoders.SCSI.MMC.DiscInformation.Prettify000b(discInfo)); doWriteFile(outputPrefix, "_readdiscinformation_000b.bin", "SCSI READ DISC INFORMATION", cmdBuf); // If it is a read-only CD, check CD type if available - if(dskType == DiskType.CD) + if (dskType == DiskType.CD) { - switch(discInfo.Value.DiscType) + switch (discInfo.Value.DiscType) { case 0x10: dskType = DiskType.CDI; @@ -803,33 +853,33 @@ namespace DiscImageChef.Commands doWriteFile(outputPrefix, "_session.bin", "SCSI READ TOC/PMA/ATIP", cmdBuf); Decoders.CD.Session.CDSessionInfo? session = Decoders.CD.Session.Decode(cmdBuf); DicConsole.WriteLine("Session information:\n{0}", Decoders.CD.Session.Prettify(session)); - if(session.HasValue) + if (session.HasValue) { sessions = session.Value.LastCompleteSession; firstTrackLastSession = session.Value.TrackDescriptors[0].TrackNumber; } } - if(dskType == DiskType.CD) + if (dskType == DiskType.CD) { bool hasDataTrack = false; bool hasAudioTrack = false; bool allFirstSessionTracksAreAudio = true; bool hasVideoTrack = false; - if(toc.HasValue) + if (toc.HasValue) { - foreach(Decoders.CD.TOC.CDTOCTrackDataDescriptor track in toc.Value.TrackDescriptors) + foreach (Decoders.CD.TOC.CDTOCTrackDataDescriptor track in toc.Value.TrackDescriptors) { - if(track.TrackNumber == 1 && - ((Decoders.CD.TOC_CONTROL)(track.CONTROL & 0x0D) == Decoders.CD.TOC_CONTROL.DataTrack || - (Decoders.CD.TOC_CONTROL)(track.CONTROL & 0x0D) == Decoders.CD.TOC_CONTROL.DataTrackIncremental)) + if (track.TrackNumber == 1 && + ((Decoders.CD.TOC_CONTROL)(track.CONTROL & 0x0D) == Decoders.CD.TOC_CONTROL.DataTrack || + (Decoders.CD.TOC_CONTROL)(track.CONTROL & 0x0D) == Decoders.CD.TOC_CONTROL.DataTrackIncremental)) { allFirstSessionTracksAreAudio &= firstTrackLastSession != 1; } - if((Decoders.CD.TOC_CONTROL)(track.CONTROL & 0x0D) == Decoders.CD.TOC_CONTROL.DataTrack || - (Decoders.CD.TOC_CONTROL)(track.CONTROL & 0x0D) == Decoders.CD.TOC_CONTROL.DataTrackIncremental) + if ((Decoders.CD.TOC_CONTROL)(track.CONTROL & 0x0D) == Decoders.CD.TOC_CONTROL.DataTrack || + (Decoders.CD.TOC_CONTROL)(track.CONTROL & 0x0D) == Decoders.CD.TOC_CONTROL.DataTrackIncremental) { hasDataTrack = true; allFirstSessionTracksAreAudio &= track.TrackNumber >= firstTrackLastSession; @@ -837,18 +887,18 @@ namespace DiscImageChef.Commands else hasAudioTrack = true; - if(track.ADR == 4) + if (track.ADR == 4) hasVideoTrack = true; } } - if(hasDataTrack && hasAudioTrack && allFirstSessionTracksAreAudio && sessions == 2) + if (hasDataTrack && hasAudioTrack && allFirstSessionTracksAreAudio && sessions == 2) dskType = DiskType.CDPLUS; - if(!hasDataTrack && hasAudioTrack && sessions == 1) + if (!hasDataTrack && hasAudioTrack && sessions == 1) dskType = DiskType.CDDA; - if(hasDataTrack && !hasAudioTrack && sessions == 1) + if (hasDataTrack && !hasAudioTrack && sessions == 1) dskType = DiskType.CDROM; - if(hasVideoTrack && !hasDataTrack && sessions == 1) + if (hasVideoTrack && !hasDataTrack && sessions == 1) dskType = DiskType.CDV; } @@ -875,7 +925,7 @@ namespace DiscImageChef.Commands else { doWriteFile(outputPrefix, "_cdtext.bin", "SCSI READ TOC/PMA/ATIP", cmdBuf); - if(Decoders.CD.CDTextOnLeadIn.Decode(cmdBuf).HasValue) + if (Decoders.CD.CDTextOnLeadIn.Decode(cmdBuf).HasValue) DicConsole.WriteLine("CD-TEXT on Lead-In:\n{0}", Decoders.CD.CDTextOnLeadIn.Prettify(cmdBuf)); } } @@ -883,7 +933,7 @@ namespace DiscImageChef.Commands #endregion CDs #region Nintendo - if(dskType == DiskType.Unknown && blocks > 0) + if (dskType == DiskType.Unknown && blocks > 0) { sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.PhysicalInformation, 0, dev.Timeout, out duration); if (sense) @@ -892,21 +942,21 @@ namespace DiscImageChef.Commands { doWriteFile(outputPrefix, "_readdiscstructure_dvd_pfi.bin", "SCSI READ DISC STRUCTURE", cmdBuf); Decoders.DVD.PFI.PhysicalFormatInformation? nintendoPfi = Decoders.DVD.PFI.Decode(cmdBuf); - if(nintendoPfi != null) + if (nintendoPfi != null) { DicConsole.WriteLine("PFI:\n{0}", Decoders.DVD.PFI.Prettify(cmdBuf)); - if(nintendoPfi.Value.DiskCategory == DiscImageChef.Decoders.DVD.DiskCategory.Nintendo && - nintendoPfi.Value.PartVersion == 15) + if (nintendoPfi.Value.DiskCategory == DiscImageChef.Decoders.DVD.DiskCategory.Nintendo && + nintendoPfi.Value.PartVersion == 15) { - if(nintendoPfi.Value.DiscSize == DiscImageChef.Decoders.DVD.DVDSize.Eighty) + if (nintendoPfi.Value.DiscSize == DiscImageChef.Decoders.DVD.DVDSize.Eighty) dskType = DiskType.GOD; - else if(nintendoPfi.Value.DiscSize == DiscImageChef.Decoders.DVD.DVDSize.OneTwenty) + else if (nintendoPfi.Value.DiscSize == DiscImageChef.Decoders.DVD.DVDSize.OneTwenty) dskType = DiskType.WOD; } } } sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.DiscManufacturingInformation, 0, dev.Timeout, out duration); - if(sense) + if (sense) DicConsole.ErrorWriteLine("READ DISC STRUCTURE: DMI\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); else doWriteFile(outputPrefix, "_readdiscstructure_dvd_dmi.bin", "SCSI READ DISC STRUCTURE", cmdBuf); @@ -934,7 +984,7 @@ namespace DiscImageChef.Commands static void doWriteFile(string outputPrefix, string outputSuffix, string whatWriting, byte[] data) { - if(!string.IsNullOrEmpty(outputPrefix)) + if (!string.IsNullOrEmpty(outputPrefix)) { if (!File.Exists(outputPrefix + outputSuffix)) { @@ -951,7 +1001,7 @@ namespace DiscImageChef.Commands } } else - DicConsole.ErrorWriteLine("Not overwriting file {0}{1}", outputPrefix, outputSuffix); + DicConsole.ErrorWriteLine("Not overwriting file {0}{1}", outputPrefix, outputSuffix); } } }