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 PCMCIA Data packet.

Browse Source
This commit is contained in:
Natalia Portillo
2019-10-19 01:10:06 +01:00
parent b7f6170a1f
commit a8f3fc912d
2 changed files with 109 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -656,6 +656,8 @@ namespace DiscImageChef.Devices
#region PCMCIA
if(remote is null)
{
if (PlatformId == PlatformID.Linux)
{
if (devicePath.StartsWith("/dev/sd", StringComparison.Ordinal) ||
@@ -702,6 +704,15 @@ namespace DiscImageChef.Devices
{
IsPcmcia = false;
}
}
else
{
if (remote.GetPcmciaData(out var cisBuf))
{
IsPcmcia = true;
Cis = cisBuf;
}
}
#endregion PCMCIA

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

@@ -751,7 +751,7 @@ namespace DiscImageChef.Devices.Remote
return false;
}
if (hdr.packetType != DicPacketType.ResponseGetUsbData)
if (hdr.packetType != DicPacketType.ResponseGetFireWireData)
{
DicConsole.ErrorWriteLine("Expected FireWire Data Response Packet, got packet type {0}...",
hdr.packetType);
@@ -783,7 +783,71 @@ namespace DiscImageChef.Devices.Remote
public bool GetPcmciaData(out byte[] cis)
{
throw new NotImplementedException("Getting PCMCIA data not yet implemented...");
cis = null;
var cmdPkt = new DicPacketCmdGetPcmciaData()
{
hdr = new DicPacketHeader
{
id = Consts.PacketId,
len = (uint) Marshal.SizeOf<DicPacketCmdGetPcmciaData>(),
version = Consts.PacketVersion,
packetType = DicPacketType.CommandGetPcmciaData
}
};
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.ResponseGetPcmciaData)
{
DicConsole.ErrorWriteLine("Expected PCMCIA 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<DicPacketResGetPcmciaData>(buf);
if (!res.isPcmcia)
return false;
cis = res.cis;
return true;
}
}
}