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

* DiscImageChef/Commands/MediaInfo.cs:

Browse Source 
* 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.
This commit is contained in:
Natalia Portillo
2016-01-15 07:00:43 +00:00
parent 14b7be1172
commit 2a8b5d3cc5
10 changed files with 621 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
DiscImageChef.Decoders/ChangeLog
View File

@@ -1,3 +1,14 @@
2016-01-15 Natalia Portillo <claunia@claunia.com>
* 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 <claunia@claunia.com> 2015-12-30 Natalia Portillo <claunia@claunia.com>
* SCSI/Inquiry.cs: * SCSI/Inquiry.cs:

3
DiscImageChef.Decoders/DiscImageChef.Decoders.csproj
View File

@@ -87,6 +87,8 @@
<Compile Include="Blu-ray\Spare.cs" /> <Compile Include="Blu-ray\Spare.cs" />
<Compile Include="Blu-ray\Cartridge.cs" /> <Compile Include="Blu-ray\Cartridge.cs" />
<Compile Include="Xbox\DMI.cs" /> <Compile Include="Xbox\DMI.cs" />
<Compile Include="SCSI\SSC\BlockLimits.cs" />
<Compile Include="SCSI\SSC\DensitySupport.cs" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup> <ItemGroup>
@@ -108,6 +110,7 @@
<Folder Include="CD\" /> <Folder Include="CD\" />
<Folder Include="Floppy\" /> <Folder Include="Floppy\" />
<Folder Include="Xbox\" /> <Folder Include="Xbox\" />
<Folder Include="SCSI\SSC\" />
</ItemGroup> </ItemGroup>
<ProjectExtensions> <ProjectExtensions>
<MonoDevelop> <MonoDevelop>

2
DiscImageChef.Decoders/SCSI/Modes.cs
View File

@@ -5362,7 +5362,7 @@ namespace DiscImageChef.Decoders.SCSI
if (pageResponse[1] + 2 != pageResponse.Length) if (pageResponse[1] + 2 != pageResponse.Length)
return null; return null;
if (pageResponse.Length < 24) if (pageResponse.Length < 16)
return null; return null;
ModePage_0F decoded = new ModePage_0F(); ModePage_0F decoded = new ModePage_0F();

108
DiscImageChef.Decoders/SCSI/SSC/BlockLimits.cs Normal file
View File

@@ -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 <http://www.gnu.org/licenses/>.
//
// ----------------------------------------------------------------------------
// Copyright (C) 2011-2015 Claunia.com
// ****************************************************************************/
// //$Id$
using System;
using System.Text;
namespace DiscImageChef.Decoders.SCSI.SSC
{
public static class BlockLimits
{
public struct BlockLimitsData
{
/// <summary>
/// All blocks size must be multiple of 2^<cref name="granularity"/>
/// </summary>
public byte granularity;
/// <summary>
/// Maximum block length in bytes
/// </summary>
public uint maxBlockLen;
/// <summary>
/// Minimum block length in bytes
/// </summary>
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));
}
}
}

278
DiscImageChef.Decoders/SCSI/SSC/DensitySupport.cs Normal file
View File

@@ -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 <http://www.gnu.org/licenses/>.
//
// ----------------------------------------------------------------------------
// 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<DensitySupportDescriptor> descriptors = new List<DensitySupportDescriptor>();
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<MediaTypeSupportDescriptor> descriptors = new List<MediaTypeSupportDescriptor>();
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));
}
}
}

5
DiscImageChef.Devices/ChangeLog
View File

@@ -1,3 +1,8 @@
2016-01-15 Natalia Portillo <claunia@claunia.com>
* Device/ScsiCommands/SSC.cs:
Corrected ReportDensitySupport.
2016-01-14 Natalia Portillo <claunia@claunia.com> 2016-01-14 Natalia Portillo <claunia@claunia.com>
* Device/ScsiCommands/SyQuest.cs: * Device/ScsiCommands/SyQuest.cs:

4
DiscImageChef.Devices/Device/ScsiCommands/SSC.cs
View File

@@ -892,9 +892,9 @@ namespace DiscImageChef.Devices
bool sense; bool sense;
cdb[0] = (byte)ScsiCommands.ReportDensitySupport; cdb[0] = (byte)ScsiCommands.ReportDensitySupport;
if (mediumType)
cdb[1] += 0x01;
if (currentMedia) if (currentMedia)
cdb[1] += 0x01;
if (mediumType)
cdb[1] += 0x02; cdb[1] += 0x02;
cdb[7] = (byte)((buffer.Length & 0xFF00) >> 8); cdb[7] = (byte)((buffer.Length & 0xFF00) >> 8);
cdb[8] = (byte)(buffer.Length & 0xFF); cdb[8] = (byte)(buffer.Length & 0xFF);

6
DiscImageChef/ChangeLog
View File

@@ -1,3 +1,9 @@
2016-01-15 Natalia Portillo <claunia@claunia.com>
* Commands/MediaInfo.cs:
* Commands/DeviceInfo.cs:
Added support for SCSI sequential devices.
2016-01-14 Natalia Portillo <claunia@claunia.com> 2016-01-14 Natalia Portillo <claunia@claunia.com>
* Commands/DeviceInfo.cs: * Commands/DeviceInfo.cs:

44
DiscImageChef/Commands/DeviceInfo.cs
View File

@@ -943,6 +943,50 @@ namespace DiscImageChef.Commands
#endregion Plextor #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; break;
} }
default: default:

52
DiscImageChef/Commands/MediaInfo.cs
View File

@@ -40,6 +40,7 @@ using DiscImageChef.Console;
using System.IO; using System.IO;
using DiscImageChef.Devices; using DiscImageChef.Devices;
using DiscImageChef.CommonTypes; using DiscImageChef.CommonTypes;
using System.Linq;
namespace DiscImageChef.Commands namespace DiscImageChef.Commands
{ {
@@ -224,7 +225,56 @@ namespace DiscImageChef.Commands
} }
if (dev.SCSIType == DiscImageChef.Decoders.SCSI.PeripheralDeviceTypes.SequentialAccess) 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) if (dev.SCSIType == DiscImageChef.Decoders.SCSI.PeripheralDeviceTypes.MultiMediaDevice)
{ {