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

Implemente remote Get FireWire Data packet.

Browse Source
This commit is contained in:
Natalia Portillo
2019-10-19 00:08:33 +01:00
parent 2cfcdf8842
commit b7f6170a1f
2 changed files with 142 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -576,6 +576,18 @@ namespace DiscImageChef.Devices
#region FireWire
if (!(remote is null))
{
if (remote.GetFirewireData(out firewireVendor, out firewireModel,
out firewireGuid, out var remoteFireWireVendorName, out var remoteFireWireModelName))
{
IsFireWire = true;
FireWireVendorName = remoteFireWireVendorName;
FireWireModelName = remoteFireWireModelName;
}
}
else
{
if (PlatformId == PlatformID.Linux)
{
if (devicePath.StartsWith("/dev/sd", StringComparison.Ordinal) ||
@@ -591,7 +603,8 @@ namespace DiscImageChef.Devices
while (resolvedLink.Contains("firewire"))
{
resolvedLink = Path.GetDirectoryName(resolvedLink);
if (!File.Exists(resolvedLink + "/model") || !File.Exists(resolvedLink + "/vendor") ||
if (!File.Exists(resolvedLink + "/model") ||
!File.Exists(resolvedLink + "/vendor") ||
!File.Exists(resolvedLink + "/guid")) continue;
var fwSr = new StreamReader(resolvedLink + "/model");
@@ -637,6 +650,7 @@ namespace DiscImageChef.Devices
{
IsFireWire = false;
}
}
#endregion FireWire

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

@@ -632,7 +632,7 @@ namespace DiscImageChef.Devices.Remote
product = null;
serial = null;
var cmdPkt = new DicPacketCmdGetSdhciRegisters
var cmdPkt = new DicPacketCmdGetUsbData
{
hdr = new DicPacketHeader
{
@@ -706,7 +706,79 @@ namespace DiscImageChef.Devices.Remote
public bool GetFirewireData(out uint idVendor, out uint idProduct,
out ulong guid, out string vendor, out string model)
{
throw new NotImplementedException("Getting FireWire data not yet implemented...");
idVendor = 0;
idProduct = 0;
guid = 0;
vendor = null;
model = null;
var cmdPkt = new DicPacketCmdGetFireWireData
{
hdr = new DicPacketHeader
{
id = Consts.PacketId,
len = (uint) Marshal.SizeOf<DicPacketCmdGetFireWireData>(),
version = Consts.PacketVersion,
packetType = DicPacketType.CommandGetFireWireData
}
};
var buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
var len = _socket.Send(buf, SocketFlags.None);
if (len != buf.Length)
{
DicConsole.ErrorWriteLine("Could not write to the network...");
return false;
}
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 false;
}
var hdr = Marshal.ByteArrayToStructureLittleEndian<DicPacketHeader>(hdrBuf);
if (hdr.id != Consts.PacketId)
{
DicConsole.ErrorWriteLine("Received data is not a DIC Remote Packet...");
return false;
}
if (hdr.packetType != DicPacketType.ResponseGetUsbData)
{
DicConsole.ErrorWriteLine("Expected FireWire Data Response Packet, got packet type {0}...",
hdr.packetType);
return false;
}
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 false;
}
var res = Marshal.ByteArrayToStructureLittleEndian<DicPacketResGetFireWireData>(buf);
if (!res.isFireWire)
return false;
idVendor = res.idVendor;
idProduct = res.idModel;
guid = res.guid;
vendor = res.vendor;
model = res.model;
return true;
}
public bool GetPcmciaData(out byte[] cis)