* DiscImageChef.Devices/Enums.cs:

* DiscImageChef.Devices/DiscImageChef.Devices.csproj:
	* DiscImageChef.Devices/Device/ScsiCommands/Plasmon.cs:
	  Added Plasmon vendor commands.

	* DiscImageChef.Devices/Device/ScsiCommands/Pioneer.cs:
	  Added Pioner READ CD-XA vendor command.
This commit is contained in:
2016-01-14 02:46:36 +00:00
parent e45a783fa4
commit 5828d60f15
5 changed files with 193 additions and 4 deletions

View File

@@ -1,3 +1,13 @@
2016-01-14 Natalia Portillo <claunia@claunia.com>
* Enums.cs:
* DiscImageChef.Devices.csproj:
* Device/ScsiCommands/Plasmon.cs:
Added Plasmon vendor commands.
* Device/ScsiCommands/Pioneer.cs:
Added Pioner READ CD-XA vendor command.
2016-01-13 Natalia Portillo <claunia@claunia.com> 2016-01-13 Natalia Portillo <claunia@claunia.com>
* Enums.cs: * Enums.cs:

View File

@@ -54,7 +54,7 @@ namespace DiscImageChef.Devices
/// <param name="transferLength">How many blocks to read.</param> /// <param name="transferLength">How many blocks to read.</param>
/// <param name="blockSize">Block size.</param> /// <param name="blockSize">Block size.</param>
/// <param name="subchannel">Subchannel selection.</param> /// <param name="subchannel">Subchannel selection.</param>
public bool ReadCdDa(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize, uint transferLength, PioneerSubchannel subchannel, uint timeout, out double duration) public bool PioneerReadCdDa(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize, uint transferLength, PioneerSubchannel subchannel, uint timeout, out double duration)
{ {
senseBuffer = new byte[32]; senseBuffer = new byte[32];
byte[] cdb = new byte[12]; byte[] cdb = new byte[12];
@@ -75,7 +75,7 @@ namespace DiscImageChef.Devices
lastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out sense); lastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out sense);
error = lastError != 0; error = lastError != 0;
DicConsole.DebugWriteLine("SCSI Device", "READ CD-DA took {0} ms.", duration); DicConsole.DebugWriteLine("SCSI Device", "PIONEER READ CD-DA took {0} ms.", duration);
return sense; return sense;
} }
@@ -92,7 +92,7 @@ namespace DiscImageChef.Devices
/// <param name="endMsf">End MM:SS:FF of read encoded as 0x00MMSSFF.</param> /// <param name="endMsf">End MM:SS:FF of read encoded as 0x00MMSSFF.</param>
/// <param name="blockSize">Block size.</param> /// <param name="blockSize">Block size.</param>
/// <param name="subchannel">Subchannel selection.</param> /// <param name="subchannel">Subchannel selection.</param>
public bool ReadCdDaMsf(out byte[] buffer, out byte[] senseBuffer, uint startMsf, uint endMsf, uint blockSize, PioneerSubchannel subchannel, uint timeout, out double duration) public bool PioneerReadCdDaMsf(out byte[] buffer, out byte[] senseBuffer, uint startMsf, uint endMsf, uint blockSize, PioneerSubchannel subchannel, uint timeout, out double duration)
{ {
senseBuffer = new byte[32]; senseBuffer = new byte[32];
byte[] cdb = new byte[12]; byte[] cdb = new byte[12];
@@ -114,7 +114,58 @@ namespace DiscImageChef.Devices
lastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out sense); lastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out sense);
error = lastError != 0; error = lastError != 0;
DicConsole.DebugWriteLine("SCSI Device", "READ CD-DA MSF took {0} ms.", duration); DicConsole.DebugWriteLine("SCSI Device", "PIONEER READ CD-DA MSF took {0} ms.", duration);
return sense;
}
/// <summary>
/// Sends the Pioneer READ CD-XA command
/// </summary>
/// <returns><c>true</c> if the command failed and <paramref name="senseBuffer"/> contains the sense buffer.</returns>
/// <param name="buffer">Buffer where the Pioneer READ CD-XA response will be stored</param>
/// <param name="senseBuffer">Sense buffer.</param>
/// <param name="timeout">Timeout in seconds.</param>
/// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
/// <param name="errorFlags">If set to <c>true</c>, returns all sector data with 294 bytes of error flags. Superseedes <paramref name="wholeSector"/></param>
/// <param name="wholeSector">If set to <c>true</c>, returns all 2352 bytes of sector data.</param>
/// <param name="lba">Start block address.</param>
/// <param name="transferLength">How many blocks to read.</param>
public bool PioneerReadCdXa(out byte[] buffer, out byte[] senseBuffer, uint lba, uint transferLength, bool errorFlags, bool wholeSector, uint timeout, out double duration)
{
senseBuffer = new byte[32];
byte[] cdb = new byte[12];
bool sense;
cdb[0] = (byte)ScsiCommands.ReadCdXa;
cdb[2] = (byte)((lba & 0xFF000000) >> 24);
cdb[3] = (byte)((lba & 0xFF0000) >> 16);
cdb[4] = (byte)((lba & 0xFF00) >> 8);
cdb[5] = (byte)(lba & 0xFF);
cdb[7] = (byte)((transferLength & 0xFF0000) >> 16);
cdb[8] = (byte)((transferLength & 0xFF00) >> 8);
cdb[9] = (byte)(transferLength & 0xFF);
if (errorFlags)
{
buffer = new byte[2646 * transferLength];
cdb[6] = 0x1F;
}
else if (wholeSector)
{
buffer = new byte[2352 * transferLength];
cdb[6] = 0x0F;
}
else
{
buffer = new byte[2048 * transferLength];
cdb[6] = 0x00;
}
lastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out sense);
error = lastError != 0;
DicConsole.DebugWriteLine("SCSI Device", "PIONEER READ CD-XA took {0} ms.", duration);
return sense; return sense;
} }

View File

@@ -0,0 +1,115 @@
// /***************************************************************************
// The Disc Image Chef
// ----------------------------------------------------------------------------
//
// Filename : Plasmon.cs
// Version : 1.0
// Author(s) : Natalia Portillo
//
// Component : Plasmon vendor commands
//
// 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 DiscImageChef.Console;
namespace DiscImageChef.Devices
{
public partial class Device
{
/// <summary>
/// Sends the Plasmon READ LONG vendor command
/// </summary>
/// <returns><c>true</c> if the command failed and <paramref name="senseBuffer"/> contains the sense buffer.</returns>
/// <param name="buffer">Buffer where the Plasmon READ LONG response will be stored</param>
/// <param name="senseBuffer">Sense buffer.</param>
/// <param name="relAddr">If set to <c>true</c> address contain two's complement offset from last read address.</param>
/// <param name="address">PBA/LBA to read.</param>
/// <param name="blockBytes">How many bytes per block.</param>
/// <param name="pba">If set to <c>true</c> address contain physical block address.</param>
/// <param name="timeout">Timeout in seconds.</param>
/// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
public bool PlasmonReadLong(out byte[] buffer, out byte[] senseBuffer, bool relAddr, uint address, ushort blockBytes, bool pba, uint timeout, out double duration)
{
return HPReadLong(out buffer, out senseBuffer, relAddr, address, 0, blockBytes, pba, false, timeout, out duration);
}
/// <summary>
/// Sends the Plasmon READ LONG vendor command
/// </summary>
/// <returns><c>true</c> if the command failed and <paramref name="senseBuffer"/> contains the sense buffer.</returns>
/// <param name="buffer">Buffer where the Plasmon READ LONG response will be stored</param>
/// <param name="senseBuffer">Sense buffer.</param>
/// <param name="relAddr">If set to <c>true</c> address contain two's complement offset from last read address.</param>
/// <param name="address">PBA/LBA to read.</param>
/// <param name="transferLen">How many blocks/bytes to read.</param>
/// <param name="blockBytes">How many bytes per block.</param>
/// <param name="pba">If set to <c>true</c> address contain physical block address.</param>
/// <param name="sectorCount">If set to <c>true</c> <paramref name="transferLen"/> is a count of secors to read. Otherwise it will be ignored</param>
/// <param name="timeout">Timeout in seconds.</param>
/// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
public bool PlasmonReadLong(out byte[] buffer, out byte[] senseBuffer, bool relAddr, uint address, ushort transferLen, ushort blockBytes, bool pba, bool sectorCount, uint timeout, out double duration)
{
return HPReadLong(out buffer, out senseBuffer, relAddr, address, transferLen, blockBytes, pba, sectorCount, timeout, out duration);
}
/// <summary>
/// Retrieves the logical or physical block address for the specified <paramref name="address"/>
/// </summary>
/// <returns><c>true</c> if the command failed and <paramref name="senseBuffer"/> contains the sense buffer.</returns>
/// <param name="buffer">Buffer where the block address will be stored</param>
/// <param name="senseBuffer">Sense buffer.</param>
/// <param name="address">PBA/LBA to read.</param>
/// <param name="pba">If set to <c>true</c> address contain a physical block address.</param>
/// <param name="timeout">Timeout in seconds.</param>
/// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
public bool PlasmonReadSectorLocation(out byte[] buffer, out byte[] senseBuffer, uint address, bool pba, uint timeout, out double duration)
{
senseBuffer = new byte[32];
byte[] cdb = new byte[10];
bool sense;
cdb[0] = (byte)ScsiCommands.Plasmon_ReadSectorLocation;
cdb[2] = (byte)((address & 0xFF000000) >> 24);
cdb[3] = (byte)((address & 0xFF0000) >> 16);
cdb[4] = (byte)((address & 0xFF00) >> 8);
cdb[5] = (byte)(address & 0xFF);
if (pba)
cdb[9] += 0x80;
buffer = new byte[8];
lastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out sense);
error = lastError != 0;
DicConsole.DebugWriteLine("SCSI Device", "PLASMON READ SECTOR LOCATION took {0} ms.", duration);
return sense;
}
}
}

View File

@@ -64,6 +64,7 @@
<Compile Include="Device\ScsiCommands\Certance.cs" /> <Compile Include="Device\ScsiCommands\Certance.cs" />
<Compile Include="Device\ScsiCommands\Fujitsu.cs" /> <Compile Include="Device\ScsiCommands\Fujitsu.cs" />
<Compile Include="Device\ScsiCommands\HP.cs" /> <Compile Include="Device\ScsiCommands\HP.cs" />
<Compile Include="Device\ScsiCommands\Plasmon.cs" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup> <ItemGroup>

View File

@@ -2434,6 +2434,7 @@ namespace DiscImageChef.Devices
/// Sets the spindle speed to be used while reading/writing data to a CD /// Sets the spindle speed to be used while reading/writing data to a CD
/// </summary> /// </summary>
SetCdSpeed = 0xDA, SetCdSpeed = 0xDA,
WriteCdp = 0xE3,
#endregion #endregion
#region ATA Command Pass-Through #region ATA Command Pass-Through
@@ -2668,6 +2669,17 @@ namespace DiscImageChef.Devices
/// </summary> /// </summary>
MSystems_SecurityEraseOld = 0xDF, MSystems_SecurityEraseOld = 0xDF,
#endregion M-Systems vendor commands #endregion M-Systems vendor commands
#region Plasmon vendor commands
/// <summary>
/// Retrieves sector address
/// </summary>
Plasmon_ReadSectorLocation = 0xE6,
/// <summary>
/// Makes a Compliant WORM block completely unreadable
/// </summary>
Plasmon_Shred = 0xEE,
#endregion Plasmon vendor commands
} }
#endregion SCSI Commands #endregion SCSI Commands