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

Implement SCSI remote packet.

Browse Source
This commit is contained in:
Natalia Portillo
2019-10-17 22:15:01 +01:00
parent 357631b203
commit 8c0e01aa2c
4 changed files with 1017 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
DiscImageChef.Devices/Device/Constructor.cs
View File

@@ -401,8 +401,24 @@ namespace DiscImageChef.Devices
else
{
Type = remote.GetDeviceType();
// TODO: Get INQUIRY if SCSI or ATAPI
// TODO: Get SD/MMC registers if SD/MMC
switch (Type)
{
case DeviceType.ATAPI:
case DeviceType.SCSI:
scsiSense = ScsiInquiry(out inqBuf, out _);
break;
case DeviceType.SecureDigital:
case DeviceType.MMC:
if (!remote.GetSdhciRegisters(out cachedCsd, out cachedCid, out cachedOcr, out cachedScr))
{
Type = DeviceType.SCSI;
ScsiType = PeripheralDeviceTypes.DirectAccess;
}
break;
}
}
#region SecureDigital / MultiMediaCard

871
DiscImageChef.Devices/Enums.cs
View File

File diff suppressed because it is too large Load Diff

88
DiscImageChef.Devices/Remote/Remote.cs
View File

@@ -331,7 +331,91 @@ namespace DiscImageChef.Devices.Remote
public int SendScsiCommand(byte[] cdb, ref byte[] buffer, out byte[] senseBuffer, uint timeout,
ScsiDirection direction, out double duration, out bool sense)
{
throw new NotImplementedException("Remote SCSI commands not yet implemented...");
senseBuffer = null;
duration = 0;
sense = true;
var cmdPkt = new DicPacketCmdScsi
{
hdr = new DicPacketHeader
{
id = Consts.PacketId,
version = Consts.PacketVersion,
packetType = DicPacketType.CommandScsi
},
direction = (int) direction,
timeout = timeout * 1000
};
if (cdb != null)
cmdPkt.cdb_len = (uint) cdb.Length;
if (buffer != null)
cmdPkt.buf_len = (uint) buffer.Length;
cmdPkt.hdr.len = (uint) (Marshal.SizeOf<DicPacketCmdScsi>() + cmdPkt.cdb_len + cmdPkt.buf_len);
var pktBuf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
var buf = new byte[cmdPkt.hdr.len];
Array.Copy(pktBuf, 0, buf, 0, Marshal.SizeOf<DicPacketCmdScsi>());
if (cdb != null)
Array.Copy(cdb, 0, buf, Marshal.SizeOf<DicPacketCmdScsi>(), cmdPkt.cdb_len);
if (buffer != null)
Array.Copy(buffer, 0, buf, Marshal.SizeOf<DicPacketCmdScsi>() + cmdPkt.cdb_len, cmdPkt.buf_len);
var len = _socket.Send(buf, SocketFlags.None);
if (len != buf.Length)
{
DicConsole.ErrorWriteLine("Could not write to the network...");
return -1;
}
var hdrBuf = new byte[Marshal.SizeOf<DicPacketHeader>()];
len = _socket.Receive(hdrBuf, hdrBuf.Length, SocketFlags.Peek);
if (len < hdrBuf.Length)
{
DicConsole.ErrorWriteLine("Could not read from the network...");
return -1;
}
var hdr = Marshal.ByteArrayToStructureLittleEndian<DicPacketHeader>(hdrBuf);
if (hdr.id != Consts.PacketId)
{
DicConsole.ErrorWriteLine("Received data is not a DIC Remote Packet...");
return -1;
}
if (hdr.packetType != DicPacketType.ResponseScsi)
{
DicConsole.ErrorWriteLine("Expected SCSI Response Packet, got packet type {0}...",
hdr.packetType);
return -1;
}
buf = new byte[hdr.len];
len = _socket.Receive(buf, buf.Length, SocketFlags.None);
if (len < buf.Length)
{
DicConsole.ErrorWriteLine("Could not read from the network...");
return -1;
}
var res = Marshal.ByteArrayToStructureLittleEndian<DicPacketResScsi>(buf);
senseBuffer = new byte[res.sense_len];
Array.Copy(buf, Marshal.SizeOf<DicPacketResScsi>(), senseBuffer, 0, res.sense_len);
buffer = new byte[res.buf_len];
Array.Copy(buf, Marshal.SizeOf<DicPacketResScsi>() + res.sense_len, buffer, 0, res.buf_len);
duration = res.duration;
sense = res.sense != 0;
return (int) res.error_no;
}
public int SendAtaCommand(AtaRegistersChs registers, out AtaErrorRegistersChs errorRegisters,
@@ -376,7 +460,7 @@ namespace DiscImageChef.Devices.Remote
hdr = new DicPacketHeader
{
id = Consts.PacketId,
len = (uint) Marshal.SizeOf<DicPacketCommandOpenDevice>(),
len = (uint) Marshal.SizeOf<DicPacketCmdGetDeviceType>(),
version = Consts.PacketVersion,
packetType = DicPacketType.CommandGetType
}

10
DiscImageChef.Devices/Remote/Structs.cs
View File

@@ -98,7 +98,7 @@ namespace DiscImageChef.Devices.Remote
public uint buf_len;
public uint duration;
public uint sense;
public uint errno;
public uint error_no;
}
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
@@ -122,7 +122,7 @@ namespace DiscImageChef.Devices.Remote
public AtaErrorRegistersChs registers;
public uint duration;
public uint sense;
public uint errno;
public uint error_no;
}
@@ -147,7 +147,7 @@ namespace DiscImageChef.Devices.Remote
public AtaErrorRegistersLba28 registers;
public uint duration;
public uint sense;
public uint errno;
public uint error_no;
}
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
@@ -171,7 +171,7 @@ namespace DiscImageChef.Devices.Remote
public AtaErrorRegistersLba48 registers;
public uint duration;
public uint sense;
public uint errno;
public uint error_no;
}
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
@@ -200,7 +200,7 @@ namespace DiscImageChef.Devices.Remote
public uint duration;
public uint sense;
public uint errno;
public uint error_no;
}
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]