* DiscImageChef.Devices/Command.cs:

Add skeleton for send SCSI command method.

	* DiscImageChef.Devices/Linux/Command.cs:
	* DiscImageChef.Devices/Windows/Command.cs:
	  Added per-platform send SCSI command method.

	* DiscImageChef.sln:
	* DiscImageChef.Interop/DetectOS.cs:
	* DiscImageChef.Interop/PlatformID.cs:
	* DiscImageChef.Interop/Properties/AssemblyInfo.cs:
	* DiscImageChef.Interop/DiscImageChef.Interop.csproj:
	  Added code to detect OS.

	* DiscImageChef.Devices/DiscImageChef.Devices.csproj:
	  Added per-platform send SCSI command method.
	Add skeleton for send SCSI command method.

	* DiscImageChef.Devices/Linux/Extern.cs:
	* DiscImageChef.Devices/Windows/Extern.cs:
	  Enhanced externs.

	* DiscImageChef.Devices/Linux/Structs.cs:
	  Typo.
This commit is contained in:
2015-10-12 06:25:49 +01:00
parent 7fa4c3fbeb
commit 115bf5030f
15 changed files with 612 additions and 11 deletions

View File

@@ -1,3 +1,23 @@
2015-10-12 Natalia Portillo <claunia@claunia.com>
* Command.cs:
Add skeleton for send SCSI command method.
* Linux/Command.cs:
* Windows/Command.cs:
Added per-platform send SCSI command method.
* DiscImageChef.Devices.csproj:
Added per-platform send SCSI command method.
Add skeleton for send SCSI command method.
* Linux/Extern.cs:
* Windows/Extern.cs:
Enhanced externs.
* Linux/Structs.cs:
Typo.
2015-10-07 Natalia Portillo <claunia@claunia.com>
* Linux/Enums.cs:

View File

@@ -0,0 +1,12 @@
using System;
namespace DiscImageChef.Devices
{
public class Command
{
public Command()
{
}
}
}

View File

@@ -42,6 +42,9 @@
<Compile Include="Windows\Extern.cs" />
<Compile Include="Windows\Structs.cs" />
<Compile Include="Windows\Enums.cs" />
<Compile Include="Windows\Command.cs" />
<Compile Include="Linux\Command.cs" />
<Compile Include="Command.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
@@ -57,4 +60,10 @@
</Properties>
</MonoDevelop>
</ProjectExtensions>
<ItemGroup>
<ProjectReference Include="..\DiscImageChef.Interop\DiscImageChef.Interop.csproj">
<Project>{9183F2E0-A879-4F23-9EE3-C6908F1332B2}</Project>
<Name>DiscImageChef.Interop</Name>
</ProjectReference>
</ItemGroup>
</Project>

View File

@@ -0,0 +1,52 @@
using System;
using System.Runtime.InteropServices;
namespace DiscImageChef.Devices.Linux
{
static class Command
{
internal static int SendScsiCommand(int fd, byte[] cdb, ref byte[] buffer, out byte[] senseBuffer, uint timeout, ScsiIoctlDirection direction, out double duration, out bool sense)
{
senseBuffer = null;
duration = 0;
sense = false;
if (buffer == null)
return -1;
sg_io_hdr_t io_hdr = new sg_io_hdr_t();
senseBuffer = new byte[32];
io_hdr.interface_id = 'S';
io_hdr.cmd_len = (byte)cdb.Length;
io_hdr.mx_sb_len = (byte)senseBuffer.Length;
io_hdr.dxfer_direction = direction;
io_hdr.dxfer_len = (uint)buffer.Length;
io_hdr.dxferp = Marshal.AllocHGlobal(buffer.Length);
io_hdr.cmdp = Marshal.AllocHGlobal(cdb.Length);
io_hdr.sbp = Marshal.AllocHGlobal(senseBuffer.Length);
io_hdr.timeout = timeout * 1000;
Marshal.Copy(buffer, 0, io_hdr.dxferp, buffer.Length);
Marshal.Copy(cdb, 0, io_hdr.cmdp, cdb.Length);
Marshal.Copy(senseBuffer, 0, io_hdr.sbp, senseBuffer.Length);
int error = Extern.ioctlSg(fd, LinuxIoctl.SG_IO, ref io_hdr);
if (error < 0)
error = Marshal.GetLastWin32Error();
Marshal.Copy(io_hdr.dxferp, buffer, 0, buffer.Length);
Marshal.Copy(io_hdr.cmdp, cdb, 0, cdb.Length);
Marshal.Copy(io_hdr.sbp, senseBuffer, 0, senseBuffer.Length);
sense |= (io_hdr.info & SgInfo.OkMask) != SgInfo.Ok;
duration = (double)io_hdr.duration;
return error;
}
}
}

View File

@@ -14,16 +14,16 @@ namespace DiscImageChef.Devices.Linux
internal static extern int close(int fd);
[DllImport("libc", EntryPoint="ioctl", SetLastError = true)]
internal static extern int ioctlInt(int fd, ulong request, out int value);
internal static extern int ioctlInt(int fd, LinuxIoctl request, out int value);
[DllImport("libc", EntryPoint="ioctl", SetLastError = true)]
internal static extern int ioctlSg(int fd, ulong request, ref sg_io_hdr_t value);
internal static extern int ioctlSg(int fd, LinuxIoctl request, ref sg_io_hdr_t value);
[DllImport("libc", EntryPoint="ioctl", SetLastError = true)]
internal static extern int ioctlHdTaskfile(int fd, ulong request, ref hd_drive_task_hdr value);
internal static extern int ioctlHdTaskfile(int fd, LinuxIoctl request, ref hd_drive_task_hdr value);
[DllImport("libc", EntryPoint="ioctl", SetLastError = true)]
internal static extern int ioctlHdTask(int fd, ulong request, ref byte[] value);
internal static extern int ioctlHdTask(int fd, LinuxIoctl request, ref byte[] value);
}
}

View File

@@ -10,11 +10,11 @@ namespace DiscImageChef.Devices.Linux
/// Always 'S' for SG v3
/// </summary>
public int interface_id; /* [i] 'S' (required) */
public int dxfer_direction; /* [i] */
public ScsiIoctlDirection dxfer_direction; /* [i] */
public byte cmd_len; /* [i] */
public byte mx_sb_len; /* [i] */
public ushort iovec_count; /* [i] */
public ScsiIoctlDirection dxfer_len; /* [i] */
public uint dxfer_len; /* [i] */
public IntPtr dxferp; /* [i], [*io] */
public IntPtr cmdp; /* [i], [*i] */
public IntPtr sbp; /* [i], [*o] */

View File

@@ -0,0 +1,56 @@
using System;
using Microsoft.Win32.SafeHandles;
using System.Runtime.InteropServices;
namespace DiscImageChef.Devices.Windows
{
static class Command
{
internal static int SendScsiCommand(SafeFileHandle fd, byte[] cdb, ref byte[] buffer, out byte[] senseBuffer, uint timeout, ScsiIoctlDirection direction, out double duration, out bool sense)
{
senseBuffer = null;
duration = 0;
sense = false;
if (buffer == null)
return -1;
ScsiPassThroughDirectAndSenseBuffer sptd_sb = new ScsiPassThroughDirectAndSenseBuffer();
sptd_sb.sptd = new ScsiPassThroughDirect();
sptd_sb.SenseBuf = new byte[32];
sptd_sb.sptd.Cdb = new byte[16];
Array.Copy(cdb, sptd_sb.sptd.Cdb, cdb.Length);
sptd_sb.sptd.Length = (ushort)Marshal.SizeOf(sptd_sb.sptd);
sptd_sb.sptd.CdbLength = (byte)cdb.Length;
sptd_sb.sptd.SenseInfoLength = (byte)sptd_sb.SenseBuf.Length;
sptd_sb.sptd.DataIn = direction;
sptd_sb.sptd.DataTransferLength = (uint)buffer.Length;
sptd_sb.sptd.TimeOutValue = timeout;
sptd_sb.sptd.DataBuffer = Marshal.AllocHGlobal(buffer.Length);
sptd_sb.sptd.SenseInfoOffset = (uint)Marshal.SizeOf(sptd_sb.sptd);
uint k = 0;
int error = 0;
DateTime start = DateTime.Now;
bool hasError = Extern.DeviceIoControlScsi(fd, WindowsIoctl.IOCTL_SCSI_PASS_THROUGH_DIRECT, ref sptd_sb, (uint)Marshal.SizeOf(sptd_sb), ref sptd_sb,
(uint)Marshal.SizeOf(sptd_sb), ref k, IntPtr.Zero);
DateTime end = DateTime.Now;
if (hasError)
error = Marshal.GetLastWin32Error();
Marshal.Copy(sptd_sb.sptd.DataBuffer, buffer, 0, buffer.Length);
sense |= sptd_sb.sptd.ScsiStatus != 0;
senseBuffer = new byte[32];
Array.Copy(sptd_sb.SenseBuf, senseBuffer, 32);
duration = (end - start).TotalMilliseconds;
return error;
}
}
}

View File

@@ -17,9 +17,9 @@ namespace DiscImageChef.Devices.Windows
IntPtr templateFile);
[DllImport("Kernel32.dll", SetLastError = true, EntryPoint="ioctl", CharSet = CharSet.Auto)]
public static extern bool DeviceIoControlScsi(
internal static extern bool DeviceIoControlScsi(
SafeFileHandle hDevice,
uint IoControlCode,
WindowsIoctl IoControlCode,
ref ScsiPassThroughDirectAndSenseBuffer InBuffer,
uint nInBufferSize,
ref ScsiPassThroughDirectAndSenseBuffer OutBuffer,
@@ -29,9 +29,9 @@ namespace DiscImageChef.Devices.Windows
);
[DllImport("Kernel32.dll", SetLastError = true, EntryPoint="ioctl", CharSet = CharSet.Auto)]
public static extern bool DeviceIoControlAta(
internal static extern bool DeviceIoControlAta(
SafeFileHandle hDevice,
uint IoControlCode,
WindowsIoctl IoControlCode,
ref AtaPassThroughDirect InBuffer,
uint nInBufferSize,
ref AtaPassThroughDirect OutBuffer,
@@ -41,7 +41,7 @@ namespace DiscImageChef.Devices.Windows
);
[DllImport("Kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
public static extern bool CloseHandle(SafeFileHandle hDevice);
internal static extern bool CloseHandle(SafeFileHandle hDevice);
}
}