mirror of
https://github.com/aaru-dps/Aaru.git
synced 2025-12-16 19:24:25 +00:00
Open remote host for devices starting with dic://
This commit is contained in:
@@ -40,7 +40,6 @@ using DiscImageChef.CommonTypes.Interop;
|
||||
using DiscImageChef.Decoders.ATA;
|
||||
using DiscImageChef.Decoders.SCSI;
|
||||
using DiscImageChef.Decoders.SCSI.MMC;
|
||||
using DiscImageChef.Decoders.SecureDigital;
|
||||
using DiscImageChef.Devices.FreeBSD;
|
||||
using DiscImageChef.Devices.Windows;
|
||||
using Microsoft.Win32.SafeHandles;
|
||||
@@ -68,6 +67,18 @@ namespace DiscImageChef.Devices
|
||||
Error = false;
|
||||
IsRemovable = false;
|
||||
|
||||
if (devicePath.StartsWith("dic://"))
|
||||
{
|
||||
devicePath = devicePath.Substring(6);
|
||||
var pieces = devicePath.Split('/');
|
||||
var host = pieces[0];
|
||||
devicePath = devicePath.Substring(host.Length);
|
||||
|
||||
remote = new Remote.Remote(host);
|
||||
|
||||
throw new NotImplementedException("Remote devices not yet implemented...");
|
||||
}
|
||||
|
||||
switch (PlatformId)
|
||||
{
|
||||
case PlatformID.Win32NT:
|
||||
@@ -104,7 +115,10 @@ namespace DiscImageChef.Devices
|
||||
LastError = Marshal.GetLastWin32Error();
|
||||
}
|
||||
}
|
||||
else Error = true;
|
||||
else
|
||||
{
|
||||
Error = true;
|
||||
}
|
||||
|
||||
LastError = Marshal.GetLastWin32Error();
|
||||
}
|
||||
@@ -121,11 +135,12 @@ namespace DiscImageChef.Devices
|
||||
LastError = Marshal.GetLastWin32Error();
|
||||
}
|
||||
|
||||
CamDevice camDevice = (CamDevice)Marshal.PtrToStructure((IntPtr)FileHandle, typeof(CamDevice));
|
||||
var camDevice = (CamDevice) Marshal.PtrToStructure((IntPtr) FileHandle, typeof(CamDevice));
|
||||
|
||||
if (StringHandlers.CToString(camDevice.SimName) == "ata")
|
||||
throw new
|
||||
InvalidOperationException("Parallel ATA devices are not supported on FreeBSD due to upstream bug #224250.");
|
||||
InvalidOperationException(
|
||||
"Parallel ATA devices are not supported on FreeBSD due to upstream bug #224250.");
|
||||
|
||||
break;
|
||||
}
|
||||
@@ -142,24 +157,24 @@ namespace DiscImageChef.Devices
|
||||
|
||||
if (Error) throw new SystemException($"Error {LastError} trying device.");
|
||||
|
||||
bool scsiSense = true;
|
||||
var scsiSense = true;
|
||||
|
||||
// Windows is answering SCSI INQUIRY for all device types so it needs to be detected first
|
||||
switch (PlatformId)
|
||||
{
|
||||
case PlatformID.Win32NT:
|
||||
StoragePropertyQuery query = new StoragePropertyQuery();
|
||||
var query = new StoragePropertyQuery();
|
||||
query.PropertyId = StoragePropertyId.Device;
|
||||
query.QueryType = StorageQueryType.Standard;
|
||||
query.AdditionalParameters = new byte[1];
|
||||
|
||||
IntPtr descriptorPtr = Marshal.AllocHGlobal(1000);
|
||||
byte[] descriptorB = new byte[1000];
|
||||
var descriptorPtr = Marshal.AllocHGlobal(1000);
|
||||
var descriptorB = new byte[1000];
|
||||
|
||||
uint returned = 0;
|
||||
int error = 0;
|
||||
var error = 0;
|
||||
|
||||
bool hasError = !Extern.DeviceIoControlStorageQuery((SafeFileHandle)FileHandle,
|
||||
var hasError = !Extern.DeviceIoControlStorageQuery((SafeFileHandle) FileHandle,
|
||||
WindowsIoctl.IoctlStorageQueryProperty,
|
||||
ref query, (uint) Marshal.SizeOf(query),
|
||||
descriptorPtr, 1000, ref returned, IntPtr.Zero);
|
||||
@@ -170,7 +185,7 @@ namespace DiscImageChef.Devices
|
||||
|
||||
if (!hasError && error == 0)
|
||||
{
|
||||
StorageDeviceDescriptor descriptor = new StorageDeviceDescriptor
|
||||
var descriptor = new StorageDeviceDescriptor
|
||||
{
|
||||
Version = BitConverter.ToUInt32(descriptorB, 0),
|
||||
Size = BitConverter.ToUInt32(descriptorB, 4),
|
||||
@@ -230,16 +245,19 @@ namespace DiscImageChef.Devices
|
||||
scsiSense = ScsiInquiry(out inqBuf, out _);
|
||||
break;
|
||||
case DeviceType.ATA:
|
||||
bool atapiSense = AtapiIdentify(out ataBuf, out _);
|
||||
var atapiSense = AtapiIdentify(out ataBuf, out _);
|
||||
|
||||
if (!atapiSense)
|
||||
{
|
||||
Type = DeviceType.ATAPI;
|
||||
Identify.IdentifyDevice? ataid = Identify.Decode(ataBuf);
|
||||
var ataid = Identify.Decode(ataBuf);
|
||||
|
||||
if (ataid.HasValue) scsiSense = ScsiInquiry(out inqBuf, out _);
|
||||
}
|
||||
else Manufacturer = "ATA";
|
||||
else
|
||||
{
|
||||
Manufacturer = "ATA";
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
@@ -249,13 +267,13 @@ namespace DiscImageChef.Devices
|
||||
|
||||
if (Windows.Command.IsSdhci((SafeFileHandle) FileHandle))
|
||||
{
|
||||
byte[] sdBuffer = new byte[16];
|
||||
var sdBuffer = new byte[16];
|
||||
|
||||
LastError = Windows.Command.SendMmcCommand((SafeFileHandle) FileHandle, MmcCommands.SendCsd,
|
||||
false, false,
|
||||
MmcFlags.ResponseSpiR2 | MmcFlags.ResponseR2 |
|
||||
MmcFlags.CommandAc, 0, 16, 1, ref sdBuffer, out _,
|
||||
out _, out bool sense);
|
||||
out _, out var sense);
|
||||
|
||||
if (!sense)
|
||||
{
|
||||
@@ -332,35 +350,37 @@ namespace DiscImageChef.Devices
|
||||
if (devicePath.StartsWith("/dev/sd", StringComparison.Ordinal) ||
|
||||
devicePath.StartsWith("/dev/sr", StringComparison.Ordinal) ||
|
||||
devicePath.StartsWith("/dev/st", StringComparison.Ordinal))
|
||||
{
|
||||
scsiSense = ScsiInquiry(out inqBuf, out _);
|
||||
}
|
||||
// MultiMediaCard and SecureDigital go here
|
||||
else if (devicePath.StartsWith("/dev/mmcblk", StringComparison.Ordinal))
|
||||
{
|
||||
string devPath = devicePath.Substring(5);
|
||||
var devPath = devicePath.Substring(5);
|
||||
if (File.Exists("/sys/block/" + devPath + "/device/csd"))
|
||||
{
|
||||
int len =
|
||||
var len =
|
||||
ConvertFromHexAscii("/sys/block/" + devPath + "/device/csd", out cachedCsd);
|
||||
if (len == 0) cachedCsd = null;
|
||||
}
|
||||
|
||||
if (File.Exists("/sys/block/" + devPath + "/device/cid"))
|
||||
{
|
||||
int len =
|
||||
var len =
|
||||
ConvertFromHexAscii("/sys/block/" + devPath + "/device/cid", out cachedCid);
|
||||
if (len == 0) cachedCid = null;
|
||||
}
|
||||
|
||||
if (File.Exists("/sys/block/" + devPath + "/device/scr"))
|
||||
{
|
||||
int len =
|
||||
var len =
|
||||
ConvertFromHexAscii("/sys/block/" + devPath + "/device/scr", out cachedScr);
|
||||
if (len == 0) cachedScr = null;
|
||||
}
|
||||
|
||||
if (File.Exists("/sys/block/" + devPath + "/device/ocr"))
|
||||
{
|
||||
int len =
|
||||
var len =
|
||||
ConvertFromHexAscii("/sys/block/" + devPath + "/device/ocr", out cachedOcr);
|
||||
if (len == 0) cachedOcr = null;
|
||||
}
|
||||
@@ -373,6 +393,7 @@ namespace DiscImageChef.Devices
|
||||
}
|
||||
|
||||
#region SecureDigital / MultiMediaCard
|
||||
|
||||
if (cachedCid != null)
|
||||
{
|
||||
ScsiType = PeripheralDeviceTypes.DirectAccess;
|
||||
@@ -381,7 +402,7 @@ namespace DiscImageChef.Devices
|
||||
if (cachedScr != null)
|
||||
{
|
||||
Type = DeviceType.SecureDigital;
|
||||
CID decoded = Decoders.SecureDigital.Decoders.DecodeCID(cachedCid);
|
||||
var decoded = Decoders.SecureDigital.Decoders.DecodeCID(cachedCid);
|
||||
Manufacturer = VendorString.Prettify(decoded.Manufacturer);
|
||||
Model = decoded.ProductName;
|
||||
Revision = $"{(decoded.ProductRevision & 0xF0) >> 4:X2}.{decoded.ProductRevision & 0x0F:X2}";
|
||||
@@ -390,16 +411,18 @@ namespace DiscImageChef.Devices
|
||||
else
|
||||
{
|
||||
Type = DeviceType.MMC;
|
||||
Decoders.MMC.CID decoded = Decoders.MMC.Decoders.DecodeCID(cachedCid);
|
||||
var decoded = Decoders.MMC.Decoders.DecodeCID(cachedCid);
|
||||
Manufacturer = Decoders.MMC.VendorString.Prettify(decoded.Manufacturer);
|
||||
Model = decoded.ProductName;
|
||||
Revision = $"{(decoded.ProductRevision & 0xF0) >> 4:X2}.{decoded.ProductRevision & 0x0F:X2}";
|
||||
Serial = $"{decoded.ProductSerialNumber}";
|
||||
}
|
||||
}
|
||||
|
||||
#endregion SecureDigital / MultiMediaCard
|
||||
|
||||
#region USB
|
||||
|
||||
switch (PlatformId)
|
||||
{
|
||||
case PlatformID.Linux:
|
||||
@@ -407,10 +430,10 @@ namespace DiscImageChef.Devices
|
||||
devicePath.StartsWith("/dev/sr", StringComparison.Ordinal) ||
|
||||
devicePath.StartsWith("/dev/st", StringComparison.Ordinal))
|
||||
{
|
||||
string devPath = devicePath.Substring(5);
|
||||
var devPath = devicePath.Substring(5);
|
||||
if (Directory.Exists("/sys/block/" + devPath))
|
||||
{
|
||||
string resolvedLink = Linux.Command.ReadLink("/sys/block/" + devPath);
|
||||
var resolvedLink = Linux.Command.ReadLink("/sys/block/" + devPath);
|
||||
resolvedLink = "/sys" + resolvedLink.Substring(2);
|
||||
if (!string.IsNullOrEmpty(resolvedLink))
|
||||
while (resolvedLink.Contains("usb"))
|
||||
@@ -420,17 +443,17 @@ namespace DiscImageChef.Devices
|
||||
!File.Exists(resolvedLink + "/idProduct") ||
|
||||
!File.Exists(resolvedLink + "/idVendor")) continue;
|
||||
|
||||
FileStream usbFs = new FileStream(resolvedLink + "/descriptors",
|
||||
var usbFs = new FileStream(resolvedLink + "/descriptors",
|
||||
System.IO.FileMode.Open,
|
||||
System.IO.FileAccess.Read);
|
||||
byte[] usbBuf = new byte[65536];
|
||||
int usbCount = usbFs.Read(usbBuf, 0, 65536);
|
||||
var usbBuf = new byte[65536];
|
||||
var usbCount = usbFs.Read(usbBuf, 0, 65536);
|
||||
UsbDescriptors = new byte[usbCount];
|
||||
Array.Copy(usbBuf, 0, UsbDescriptors, 0, usbCount);
|
||||
usbFs.Close();
|
||||
|
||||
StreamReader usbSr = new StreamReader(resolvedLink + "/idProduct");
|
||||
string usbTemp = usbSr.ReadToEnd();
|
||||
var usbSr = new StreamReader(resolvedLink + "/idProduct");
|
||||
var usbTemp = usbSr.ReadToEnd();
|
||||
ushort.TryParse(usbTemp, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
|
||||
out usbProduct);
|
||||
usbSr.Close();
|
||||
@@ -473,7 +496,7 @@ namespace DiscImageChef.Devices
|
||||
Usb.UsbDevice usbDevice = null;
|
||||
|
||||
// I have to search for USB disks, floppies and CD-ROMs as separate device types
|
||||
foreach(string devGuid in new[]
|
||||
foreach (var devGuid in new[]
|
||||
{
|
||||
Usb.GuidDevinterfaceFloppy, Usb.GuidDevinterfaceCdrom, Usb.GuidDevinterfaceDisk
|
||||
})
|
||||
@@ -498,19 +521,21 @@ namespace DiscImageChef.Devices
|
||||
IsUsb = false;
|
||||
break;
|
||||
}
|
||||
|
||||
#endregion USB
|
||||
|
||||
#region FireWire
|
||||
|
||||
if (PlatformId == PlatformID.Linux)
|
||||
{
|
||||
if (devicePath.StartsWith("/dev/sd", StringComparison.Ordinal) ||
|
||||
devicePath.StartsWith("/dev/sr", StringComparison.Ordinal) ||
|
||||
devicePath.StartsWith("/dev/st", StringComparison.Ordinal))
|
||||
{
|
||||
string devPath = devicePath.Substring(5);
|
||||
var devPath = devicePath.Substring(5);
|
||||
if (Directory.Exists("/sys/block/" + devPath))
|
||||
{
|
||||
string resolvedLink = Linux.Command.ReadLink("/sys/block/" + devPath);
|
||||
var resolvedLink = Linux.Command.ReadLink("/sys/block/" + devPath);
|
||||
resolvedLink = "/sys" + resolvedLink.Substring(2);
|
||||
if (!string.IsNullOrEmpty(resolvedLink))
|
||||
while (resolvedLink.Contains("firewire"))
|
||||
@@ -519,8 +544,8 @@ namespace DiscImageChef.Devices
|
||||
if (!File.Exists(resolvedLink + "/model") || !File.Exists(resolvedLink + "/vendor") ||
|
||||
!File.Exists(resolvedLink + "/guid")) continue;
|
||||
|
||||
StreamReader fwSr = new StreamReader(resolvedLink + "/model");
|
||||
string fwTemp = fwSr.ReadToEnd();
|
||||
var fwSr = new StreamReader(resolvedLink + "/model");
|
||||
var fwTemp = fwSr.ReadToEnd();
|
||||
uint.TryParse(fwTemp, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
|
||||
out firewireModel);
|
||||
fwSr.Close();
|
||||
@@ -558,20 +583,25 @@ namespace DiscImageChef.Devices
|
||||
}
|
||||
}
|
||||
// TODO: Implement for other operating systems
|
||||
else IsFireWire = false;
|
||||
else
|
||||
{
|
||||
IsFireWire = false;
|
||||
}
|
||||
|
||||
#endregion FireWire
|
||||
|
||||
#region PCMCIA
|
||||
|
||||
if (PlatformId == PlatformID.Linux)
|
||||
{
|
||||
if (devicePath.StartsWith("/dev/sd", StringComparison.Ordinal) ||
|
||||
devicePath.StartsWith("/dev/sr", StringComparison.Ordinal) ||
|
||||
devicePath.StartsWith("/dev/st", StringComparison.Ordinal))
|
||||
{
|
||||
string devPath = devicePath.Substring(5);
|
||||
var devPath = devicePath.Substring(5);
|
||||
if (Directory.Exists("/sys/block/" + devPath))
|
||||
{
|
||||
string resolvedLink = Linux.Command.ReadLink("/sys/block/" + devPath);
|
||||
var resolvedLink = Linux.Command.ReadLink("/sys/block/" + devPath);
|
||||
resolvedLink = "/sys" + resolvedLink.Substring(2);
|
||||
if (!string.IsNullOrEmpty(resolvedLink))
|
||||
while (resolvedLink.Contains("/sys/devices"))
|
||||
@@ -579,20 +609,20 @@ namespace DiscImageChef.Devices
|
||||
resolvedLink = Path.GetDirectoryName(resolvedLink);
|
||||
if (!Directory.Exists(resolvedLink + "/pcmcia_socket")) continue;
|
||||
|
||||
string[] subdirs = Directory.GetDirectories(resolvedLink + "/pcmcia_socket",
|
||||
var subdirs = Directory.GetDirectories(resolvedLink + "/pcmcia_socket",
|
||||
"pcmcia_socket*",
|
||||
SearchOption.TopDirectoryOnly);
|
||||
|
||||
if (subdirs.Length <= 0) continue;
|
||||
|
||||
string possibleDir = Path.Combine(resolvedLink, "pcmcia_socket", subdirs[0]);
|
||||
var possibleDir = Path.Combine(resolvedLink, "pcmcia_socket", subdirs[0]);
|
||||
if (!File.Exists(possibleDir + "/card_type") || !File.Exists(possibleDir + "/cis"))
|
||||
continue;
|
||||
|
||||
FileStream cisFs = new FileStream(possibleDir + "/cis", System.IO.FileMode.Open,
|
||||
var cisFs = new FileStream(possibleDir + "/cis", System.IO.FileMode.Open,
|
||||
System.IO.FileAccess.Read);
|
||||
byte[] cisBuf = new byte[65536];
|
||||
int cisCount = cisFs.Read(cisBuf, 0, 65536);
|
||||
var cisBuf = new byte[65536];
|
||||
var cisCount = cisFs.Read(cisBuf, 0, 65536);
|
||||
Cis = new byte[cisCount];
|
||||
Array.Copy(cisBuf, 0, Cis, 0, cisCount);
|
||||
cisFs.Close();
|
||||
@@ -604,20 +634,24 @@ namespace DiscImageChef.Devices
|
||||
}
|
||||
}
|
||||
// TODO: Implement for other operating systems
|
||||
else IsPcmcia = false;
|
||||
else
|
||||
{
|
||||
IsPcmcia = false;
|
||||
}
|
||||
|
||||
#endregion PCMCIA
|
||||
|
||||
if (!scsiSense)
|
||||
{
|
||||
Inquiry.SCSIInquiry? inquiry = Inquiry.Decode(inqBuf);
|
||||
var inquiry = Inquiry.Decode(inqBuf);
|
||||
|
||||
Type = DeviceType.SCSI;
|
||||
bool serialSense = ScsiInquiry(out inqBuf, out _, 0x80);
|
||||
var serialSense = ScsiInquiry(out inqBuf, out _, 0x80);
|
||||
if (!serialSense) Serial = EVPD.DecodePage80(inqBuf);
|
||||
|
||||
if (inquiry.HasValue)
|
||||
{
|
||||
string tmp = StringHandlers.CToString(inquiry.Value.ProductRevisionLevel);
|
||||
var tmp = StringHandlers.CToString(inquiry.Value.ProductRevisionLevel);
|
||||
if (tmp != null) Revision = tmp.Trim();
|
||||
tmp = StringHandlers.CToString(inquiry.Value.ProductIdentification);
|
||||
if (tmp != null) Model = tmp.Trim();
|
||||
@@ -628,12 +662,12 @@ namespace DiscImageChef.Devices
|
||||
ScsiType = (PeripheralDeviceTypes) inquiry.Value.PeripheralDeviceType;
|
||||
}
|
||||
|
||||
bool atapiSense = AtapiIdentify(out ataBuf, out _);
|
||||
var atapiSense = AtapiIdentify(out ataBuf, out _);
|
||||
|
||||
if (!atapiSense)
|
||||
{
|
||||
Type = DeviceType.ATAPI;
|
||||
Identify.IdentifyDevice? ataId = Identify.Decode(ataBuf);
|
||||
var ataId = Identify.Decode(ataBuf);
|
||||
|
||||
if (ataId.HasValue) Serial = ataId.Value.SerialNumber;
|
||||
}
|
||||
@@ -644,17 +678,20 @@ namespace DiscImageChef.Devices
|
||||
|
||||
if (scsiSense && (IsUsb || IsFireWire) || Manufacturer == "ATA")
|
||||
{
|
||||
bool ataSense = AtaIdentify(out ataBuf, out _);
|
||||
var ataSense = AtaIdentify(out ataBuf, out _);
|
||||
if (!ataSense)
|
||||
{
|
||||
Type = DeviceType.ATA;
|
||||
Identify.IdentifyDevice? ataid = Identify.Decode(ataBuf);
|
||||
var ataid = Identify.Decode(ataBuf);
|
||||
|
||||
if (ataid.HasValue)
|
||||
{
|
||||
string[] separated = ataid.Value.Model.Split(' ');
|
||||
var separated = ataid.Value.Model.Split(' ');
|
||||
|
||||
if(separated.Length == 1) Model = separated[0];
|
||||
if (separated.Length == 1)
|
||||
{
|
||||
Model = separated[0];
|
||||
}
|
||||
else
|
||||
{
|
||||
Manufacturer = separated[0];
|
||||
@@ -689,7 +726,7 @@ namespace DiscImageChef.Devices
|
||||
if (string.IsNullOrEmpty(Model)) Model = UsbProductString;
|
||||
if (string.IsNullOrEmpty(Serial)) Serial = UsbSerialString;
|
||||
else
|
||||
foreach(char c in Serial.Where(char.IsControl))
|
||||
foreach (var c in Serial.Where(char.IsControl))
|
||||
Serial = UsbSerialString;
|
||||
}
|
||||
|
||||
@@ -699,7 +736,7 @@ namespace DiscImageChef.Devices
|
||||
if (string.IsNullOrEmpty(Model)) Model = FireWireModelName;
|
||||
if (string.IsNullOrEmpty(Serial)) Serial = $"{firewireGuid:X16}";
|
||||
else
|
||||
foreach(char c in Serial.Where(char.IsControl))
|
||||
foreach (var c in Serial.Where(char.IsControl))
|
||||
Serial = $"{firewireGuid:X16}";
|
||||
}
|
||||
|
||||
@@ -707,37 +744,40 @@ namespace DiscImageChef.Devices
|
||||
// administrator privileges
|
||||
if (ScsiType != PeripheralDeviceTypes.MultiMediaDevice) return;
|
||||
|
||||
bool featureSense = GetConfiguration(out byte[] featureBuffer, out _, 0x0108, MmcGetConfigurationRt.Single,
|
||||
var featureSense = GetConfiguration(out var featureBuffer, out _, 0x0108, MmcGetConfigurationRt.Single,
|
||||
Timeout, out _);
|
||||
|
||||
if (featureSense) return;
|
||||
|
||||
Features.SeparatedFeatures features = Features.Separate(featureBuffer);
|
||||
var features = Features.Separate(featureBuffer);
|
||||
if (features.Descriptors?.Length != 1 || features.Descriptors[0].Code != 0x0108) return;
|
||||
|
||||
Feature_0108? serialFeature = Features.Decode_0108(features.Descriptors[0].Data);
|
||||
var serialFeature = Features.Decode_0108(features.Descriptors[0].Data);
|
||||
|
||||
if (serialFeature is null) return;
|
||||
|
||||
Serial = serialFeature.Value.Serial;
|
||||
}
|
||||
|
||||
static int ConvertFromHexAscii(string file, out byte[] outBuf)
|
||||
private static int ConvertFromHexAscii(string file, out byte[] outBuf)
|
||||
{
|
||||
StreamReader sr = new StreamReader(file);
|
||||
string ins = sr.ReadToEnd().Trim();
|
||||
var sr = new StreamReader(file);
|
||||
var ins = sr.ReadToEnd().Trim();
|
||||
outBuf = new byte[ins.Length / 2];
|
||||
int count = 0;
|
||||
var count = 0;
|
||||
|
||||
try
|
||||
{
|
||||
for(int i = 0; i < ins.Length; i += 2)
|
||||
for (var i = 0; i < ins.Length; i += 2)
|
||||
{
|
||||
outBuf[i / 2] = Convert.ToByte(ins.Substring(i, 2), 16);
|
||||
count++;
|
||||
}
|
||||
}
|
||||
catch { count = 0; }
|
||||
catch
|
||||
{
|
||||
count = 0;
|
||||
}
|
||||
|
||||
sr.Close();
|
||||
return count;
|
||||
|
||||
@@ -38,18 +38,18 @@ namespace DiscImageChef.Devices
|
||||
{
|
||||
public partial class Device
|
||||
{
|
||||
readonly ushort usbVendor;
|
||||
readonly ushort usbProduct;
|
||||
readonly ulong firewireGuid;
|
||||
readonly uint firewireModel;
|
||||
readonly uint firewireVendor;
|
||||
private readonly ushort usbVendor;
|
||||
private readonly ushort usbProduct;
|
||||
private readonly ulong firewireGuid;
|
||||
private readonly uint firewireModel;
|
||||
private readonly uint firewireVendor;
|
||||
|
||||
// MMC and SecureDigital, values that need to be get with card idle, something that may
|
||||
// not be possible to do but usually is already done by the SDHCI driver.
|
||||
readonly byte[] cachedCsd;
|
||||
readonly byte[] cachedCid;
|
||||
readonly byte[] cachedScr;
|
||||
readonly byte[] cachedOcr;
|
||||
private readonly byte[] cachedCsd;
|
||||
private readonly byte[] cachedCid;
|
||||
private readonly byte[] cachedScr;
|
||||
private readonly byte[] cachedOcr;
|
||||
|
||||
/// <summary>
|
||||
/// Gets the Platform ID for this device
|
||||
@@ -217,5 +217,7 @@ namespace DiscImageChef.Devices
|
||||
/// Contains the PCMCIA CIS if applicable
|
||||
/// </summary>
|
||||
public byte[] Cis { get; }
|
||||
|
||||
private readonly Remote.Remote remote;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user