* DiscImageChef.Devices/Enums.cs:

* DiscImageChef.Helpers/ArrayFill.cs:
	* DiscImageChef.Helpers/ArrayIsEmpty.cs:
	* DiscImageChef.Devices/DiscImageChef.Devices.csproj:
	* DiscImageChef.Helpers/DiscImageChef.Helpers.csproj:
	  Implemented Certance, Fujitsu and Hewlett-Packard vendor
	  commands.

	* DiscImageChef.Devices/Device/ScsiCommands/Certance.cs:
	  Implemented Certance vendor commands.

	* DiscImageChef.Devices/Device/ScsiCommands/Fujitsu.cs:
	  Implemented Fujitsu vendor commands.

	* DiscImageChef.Devices/Device/ScsiCommands/HP.cs:
	  Implemented Hewlett-Packard vendor commands.
This commit is contained in:
2016-01-13 19:59:44 +00:00
parent 6d2b9089eb
commit fcf4c56f0e
10 changed files with 468 additions and 2 deletions

View File

@@ -1,3 +1,19 @@
2016-01-13 Natalia Portillo <claunia@claunia.com>
* Enums.cs:
* DiscImageChef.Devices.csproj:
Implemented Certance, Fujitsu and Hewlett-Packard vendor
commands.
* Device/ScsiCommands/Certance.cs:
Implemented Certance vendor commands.
* Device/ScsiCommands/Fujitsu.cs:
Implemented Fujitsu vendor commands.
* Device/ScsiCommands/HP.cs:
Implemented Hewlett-Packard vendor commands.
2016-01-13 Natalia Portillo <claunia@claunia.com>
* Enums.cs:

View File

@@ -0,0 +1,94 @@
// /***************************************************************************
// The Disc Image Chef
// ----------------------------------------------------------------------------
//
// Filename : Certance.cs
// Version : 1.0
// Author(s) : Natalia Portillo
//
// Component : Certance 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 System;
using DiscImageChef.Console;
namespace DiscImageChef.Devices
{
public partial class Device
{
/// <summary>
/// Parks the load arm in preparation for transport
/// </summary>
/// <param name="senseBuffer">Sense buffer.</param>
/// <param name="timeout">Timeout.</param>
/// <param name="duration">Duration.</param>
public bool CertancePark(out byte[] senseBuffer, uint timeout, out double duration)
{
return CertanceParkUnpark(out senseBuffer, true, timeout, out duration);
}
/// <summary>
/// Unparks the load arm prior to operation
/// </summary>
/// <param name="senseBuffer">Sense buffer.</param>
/// <param name="timeout">Timeout.</param>
/// <param name="duration">Duration.</param>
public bool CertanceUnpark(out byte[] senseBuffer, uint timeout, out double duration)
{
return CertanceParkUnpark(out senseBuffer, false, timeout, out duration);
}
/// <summary>
/// Parks the load arm in preparation for transport or unparks it prior to operation
/// </summary>
/// <param name="senseBuffer">Sense buffer.</param>
/// <param name="park">If set to <c>true</c>, parks the load arm</param>
/// <param name="timeout">Timeout.</param>
/// <param name="duration">Duration.</param>
public bool CertanceParkUnpark(out byte[] senseBuffer, bool park, uint timeout, out double duration)
{
byte[] buffer = new byte[0];
byte[] cdb = new byte[6];
senseBuffer = new byte[32];
bool sense;
cdb[0] = (byte)ScsiCommands.Certance_ParkUnpark;
if(park)
cdb[4] = 1;
lastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration, out sense);
error = lastError != 0;
DicConsole.DebugWriteLine("SCSI Device", "CERTANCE PARK UNPARK took {0} ms.", duration);
return sense;
}
}
}

View File

@@ -0,0 +1,118 @@
// /***************************************************************************
// The Disc Image Chef
// ----------------------------------------------------------------------------
//
// Filename : Fujitsu.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 DiscImageChef.Console;
namespace DiscImageChef.Devices
{
public partial class Device
{
public bool FujitsuDisplay(out byte[] senseBuffer, bool flash, FujitsuDisplayModes mode, string firstHalf, string secondHalf, uint timeout, out double duration)
{
byte[] tmp;
byte[] firstHalfBytes = new byte[8];
byte[] secondHalfBytes = new byte[8];
byte[] buffer = new byte[17];
bool displayLen = false;
bool halfMsg = false;
byte[] cdb = new byte[10];
bool sense;
if(!string.IsNullOrWhiteSpace(firstHalf))
{
tmp = System.Text.Encoding.ASCII.GetBytes(firstHalf);
Array.Copy(tmp, 0, firstHalfBytes, 0, 8);
}
if(!string.IsNullOrWhiteSpace(secondHalf))
{
tmp = System.Text.Encoding.ASCII.GetBytes(secondHalf);
Array.Copy(tmp, 0, secondHalfBytes, 0, 8);
}
if (mode != FujitsuDisplayModes.Half)
{
if (!ArrayHelpers.ArrayIsNullOrWhiteSpace(firstHalfBytes) &&
!ArrayHelpers.ArrayIsNullOrWhiteSpace(secondHalfBytes))
{
displayLen = true;
halfMsg = false;
}
else if (ArrayHelpers.ArrayIsNullOrWhiteSpace(firstHalfBytes) &&
!ArrayHelpers.ArrayIsNullOrWhiteSpace(secondHalfBytes))
{
displayLen = false;
halfMsg = false;
}
else if (!ArrayHelpers.ArrayIsNullOrWhiteSpace(firstHalfBytes) &&
ArrayHelpers.ArrayIsNullOrWhiteSpace(secondHalfBytes))
{
displayLen = false;
halfMsg = true;
}
else
{
displayLen = false;
halfMsg = false;
}
}
buffer[0] = (byte)((byte)mode << 5);
if (displayLen)
buffer[0] += 0x10;
if (flash)
buffer[0] += 0x08;
if (halfMsg)
buffer[0] += 0x04;
buffer[0] += 0x01; // Always ASCII
Array.Copy(firstHalfBytes, 0, buffer, 1, 8);
Array.Copy(secondHalfBytes, 0, buffer, 9, 8);
cdb[0] = (byte)ScsiCommands.Fujitsu_Display;
cdb[6] = (byte)buffer.Length;
lastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.Out, out duration, out sense);
error = lastError != 0;
DicConsole.DebugWriteLine("SCSI Device", "FUJITSU DISPLAY took {0} ms.", duration);
return sense;
}
}
}

View File

@@ -0,0 +1,109 @@
// /***************************************************************************
// The Disc Image Chef
// ----------------------------------------------------------------------------
//
// Filename : HP.cs
// Version : 1.0
// Author(s) : Natalia Portillo
//
// Component : Hewlett-Packard 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 HP 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 SCSI 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 HPReadLong(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 HP 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 SCSI 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 HPReadLong(out byte[] buffer, out byte[] senseBuffer, bool relAddr, uint address, ushort transferLen, ushort blockBytes, bool pba, bool sectorCount, uint timeout, out double duration)
{
senseBuffer = new byte[32];
byte[] cdb = new byte[10];
bool sense;
cdb[0] = (byte)ScsiCommands.ReadLong;
if(relAddr)
cdb[1] += 0x01;
cdb[2] = (byte)((address & 0xFF000000) >> 24);
cdb[3] = (byte)((address & 0xFF0000) >> 16);
cdb[4] = (byte)((address & 0xFF00) >> 8);
cdb[5] = (byte)(address & 0xFF);
cdb[7] = (byte)((transferLen & 0xFF00) >> 8);
cdb[8] = (byte)(transferLen & 0xFF);
if (pba)
cdb[9] += 0x80;
if (sectorCount)
cdb[9] += 0x40;
if(sectorCount)
buffer = new byte[blockBytes * transferLen];
else
buffer = new byte[transferLen];
lastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration, out sense);
error = lastError != 0;
DicConsole.DebugWriteLine("SCSI Device", "HP READ LONG took {0} ms.", duration);
return sense;
}
}
}

View File

@@ -61,6 +61,9 @@
<Compile Include="Device\ScsiCommands\SMC.cs" />
<Compile Include="Device\ScsiCommands\Adaptec.cs" />
<Compile Include="Device\ScsiCommands\ArchiveCorp.cs" />
<Compile Include="Device\ScsiCommands\Certance.cs" />
<Compile Include="Device\ScsiCommands\Fujitsu.cs" />
<Compile Include="Device\ScsiCommands\HP.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>

View File

@@ -2630,9 +2630,33 @@ namespace DiscImageChef.Devices
#endregion Adaptec vendor commands
#region Archive Corp. vendor commands
/// <summary>
/// Gets current position's block address
/// </summary>
Archive_RequestBlockAddress = 0x02,
Archive_SeekBlock = 0x0C
/// <summary>
/// Seeks to specified block address
/// </summary>
Archive_SeekBlock = 0x0C,
#endregion Archive Corp. vendor commands
#region Certance vendor commands
/// <summary>
/// Parks the load arm in preparation for transport
/// </summary>
Certance_ParkUnpark = 0x06,
#endregion Certance vendor commands
#region Fujitsu vendor commands
/// <summary>
/// Used to check the controller's data and control path
/// </summary>
Fujitsu_LoopWriteToRead = 0xC1,
/// <summary>
/// Used to display a message on the operator panel
/// </summary>
Fujitsu_Display = 0xCF
#endregion Fujitsu vendor commands
}
#endregion SCSI Commands
@@ -3363,5 +3387,29 @@ namespace DiscImageChef.Devices
/// </summary>
Supported = 5
}
public enum FujitsuDisplayModes : byte
{
/// <summary>
/// Message is displayed until next tape operation starts
/// </summary>
Idle = 0,
/// <summary>
/// Message is displayed only if a cartridge is inserted, until its removal
/// </summary>
Cart = 1,
/// <summary>
/// Message is only displayed when drive is ready
/// </summary>
Ready = 2,
/// <summary>
/// Cancels current display
/// </summary>
Cancel = 3,
/// <summary>
/// Message is displayed only if a cartridge is inserted. When removed, only second half of the message is displayed.
/// </summary>
Half = 7
}
}

View File

@@ -32,7 +32,7 @@ using System;
namespace DiscImageChef
{
public static class ArrayHelpers
public static partial class ArrayHelpers
{
public static void ArrayFill<T>(T[] destinationArray, T value)
{

View File

@@ -0,0 +1,69 @@
// /***************************************************************************
// The Disc Image Chef
// ----------------------------------------------------------------------------
//
// Filename : ArrayIsEmpty.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;
namespace DiscImageChef
{
public static partial class ArrayHelpers
{
public static bool ArrayIsNullOrWhiteSpace(byte[] array)
{
if (array == null)
return true;
foreach (byte b in array)
if (b != 0x00 && b != 0x20)
return false;
return true;
}
public static bool ArrayIsNullOrEmpty(byte[] array)
{
if (array == null)
return true;
foreach (byte b in array)
if (b != 0x00)
return false;
return true;
}
}
}

View File

@@ -1,3 +1,11 @@
2016-01-13 Natalia Portillo <claunia@claunia.com>
* ArrayFill.cs:
* ArrayIsEmpty.cs:
* DiscImageChef.Helpers.csproj:
Implemented Certance, Fujitsu and Hewlett-Packard vendor
commands.
2015-12-30 Natalia Portillo <claunia@claunia.com>
* StringHandlers.cs:

View File

@@ -41,6 +41,7 @@
<Compile Include="PrintHex.cs" />
<Compile Include="StringHandlers.cs" />
<Compile Include="Swapping.cs" />
<Compile Include="ArrayIsEmpty.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>