mirror of
https://github.com/aaru-dps/Aaru.git
synced 2025-12-16 19:24:25 +00:00
On Linux try to open in read/write and exclusive mode, if not retry in readonly.
This commit is contained in:
@@ -62,9 +62,9 @@ namespace DiscImageChef.Devices
|
|||||||
/// <param name="devicePath">Device path</param>
|
/// <param name="devicePath">Device path</param>
|
||||||
public Device(string devicePath)
|
public Device(string devicePath)
|
||||||
{
|
{
|
||||||
PlatformId = DetectOS.GetRealPlatformID();
|
PlatformId = DetectOS.GetRealPlatformID();
|
||||||
Timeout = 15;
|
Timeout = 15;
|
||||||
Error = false;
|
Error = false;
|
||||||
IsRemovable = false;
|
IsRemovable = false;
|
||||||
|
|
||||||
switch(PlatformId)
|
switch(PlatformId)
|
||||||
@@ -72,12 +72,13 @@ namespace DiscImageChef.Devices
|
|||||||
case PlatformID.Win32NT:
|
case PlatformID.Win32NT:
|
||||||
{
|
{
|
||||||
FileHandle = Extern.CreateFile(devicePath, FileAccess.GenericRead | FileAccess.GenericWrite,
|
FileHandle = Extern.CreateFile(devicePath, FileAccess.GenericRead | FileAccess.GenericWrite,
|
||||||
FileShare.Read | FileShare.Write, IntPtr.Zero, FileMode.OpenExisting,
|
FileShare.Read | FileShare.Write, IntPtr.Zero,
|
||||||
|
FileMode.OpenExisting,
|
||||||
FileAttributes.Normal, IntPtr.Zero);
|
FileAttributes.Normal, IntPtr.Zero);
|
||||||
|
|
||||||
if(((SafeFileHandle)FileHandle).IsInvalid)
|
if(((SafeFileHandle)FileHandle).IsInvalid)
|
||||||
{
|
{
|
||||||
Error = true;
|
Error = true;
|
||||||
LastError = Marshal.GetLastWin32Error();
|
LastError = Marshal.GetLastWin32Error();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -85,11 +86,25 @@ namespace DiscImageChef.Devices
|
|||||||
}
|
}
|
||||||
case PlatformID.Linux:
|
case PlatformID.Linux:
|
||||||
{
|
{
|
||||||
FileHandle = Linux.Extern.open(devicePath, FileFlags.Readonly | FileFlags.NonBlocking);
|
FileHandle =
|
||||||
|
Linux.Extern.open(devicePath,
|
||||||
|
FileFlags.ReadWrite | FileFlags.NonBlocking | FileFlags.CreateNew);
|
||||||
|
|
||||||
if((int)FileHandle < 0)
|
if((int)FileHandle < 0)
|
||||||
{
|
{
|
||||||
Error = true;
|
LastError = Marshal.GetLastWin32Error();
|
||||||
|
|
||||||
|
if(LastError == 13) // EACCES
|
||||||
|
{
|
||||||
|
FileHandle = Linux.Extern.open(devicePath, FileFlags.Readonly | FileFlags.NonBlocking);
|
||||||
|
if((int)FileHandle < 0)
|
||||||
|
{
|
||||||
|
Error = true;
|
||||||
|
LastError = Marshal.GetLastWin32Error();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else Error = true;
|
||||||
|
|
||||||
LastError = Marshal.GetLastWin32Error();
|
LastError = Marshal.GetLastWin32Error();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -101,7 +116,7 @@ namespace DiscImageChef.Devices
|
|||||||
|
|
||||||
if(((IntPtr)FileHandle).ToInt64() == 0)
|
if(((IntPtr)FileHandle).ToInt64() == 0)
|
||||||
{
|
{
|
||||||
Error = true;
|
Error = true;
|
||||||
LastError = Marshal.GetLastWin32Error();
|
LastError = Marshal.GetLastWin32Error();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -118,7 +133,7 @@ namespace DiscImageChef.Devices
|
|||||||
|
|
||||||
if(Error) throw new SystemException($"Error {LastError} opening device.");
|
if(Error) throw new SystemException($"Error {LastError} opening device.");
|
||||||
|
|
||||||
Type = DeviceType.Unknown;
|
Type = DeviceType.Unknown;
|
||||||
ScsiType = PeripheralDeviceTypes.UnknownDevice;
|
ScsiType = PeripheralDeviceTypes.UnknownDevice;
|
||||||
|
|
||||||
byte[] ataBuf;
|
byte[] ataBuf;
|
||||||
@@ -133,15 +148,15 @@ namespace DiscImageChef.Devices
|
|||||||
{
|
{
|
||||||
case PlatformID.Win32NT:
|
case PlatformID.Win32NT:
|
||||||
StoragePropertyQuery query = new StoragePropertyQuery();
|
StoragePropertyQuery query = new StoragePropertyQuery();
|
||||||
query.PropertyId = StoragePropertyId.Device;
|
query.PropertyId = StoragePropertyId.Device;
|
||||||
query.QueryType = StorageQueryType.Standard;
|
query.QueryType = StorageQueryType.Standard;
|
||||||
query.AdditionalParameters = new byte[1];
|
query.AdditionalParameters = new byte[1];
|
||||||
|
|
||||||
IntPtr descriptorPtr = Marshal.AllocHGlobal(1000);
|
IntPtr descriptorPtr = Marshal.AllocHGlobal(1000);
|
||||||
byte[] descriptorB = new byte[1000];
|
byte[] descriptorB = new byte[1000];
|
||||||
|
|
||||||
uint returned = 0;
|
uint returned = 0;
|
||||||
int error = 0;
|
int error = 0;
|
||||||
|
|
||||||
bool hasError = !Extern.DeviceIoControlStorageQuery((SafeFileHandle)FileHandle,
|
bool hasError = !Extern.DeviceIoControlStorageQuery((SafeFileHandle)FileHandle,
|
||||||
WindowsIoctl.IoctlStorageQueryProperty,
|
WindowsIoctl.IoctlStorageQueryProperty,
|
||||||
@@ -156,18 +171,18 @@ namespace DiscImageChef.Devices
|
|||||||
{
|
{
|
||||||
StorageDeviceDescriptor descriptor = new StorageDeviceDescriptor
|
StorageDeviceDescriptor descriptor = new StorageDeviceDescriptor
|
||||||
{
|
{
|
||||||
Version = BitConverter.ToUInt32(descriptorB, 0),
|
Version = BitConverter.ToUInt32(descriptorB, 0),
|
||||||
Size = BitConverter.ToUInt32(descriptorB, 4),
|
Size = BitConverter.ToUInt32(descriptorB, 4),
|
||||||
DeviceType = descriptorB[8],
|
DeviceType = descriptorB[8],
|
||||||
DeviceTypeModifier = descriptorB[9],
|
DeviceTypeModifier = descriptorB[9],
|
||||||
RemovableMedia = descriptorB[10] > 0,
|
RemovableMedia = descriptorB[10] > 0,
|
||||||
CommandQueueing = descriptorB[11] > 0,
|
CommandQueueing = descriptorB[11] > 0,
|
||||||
VendorIdOffset = BitConverter.ToInt32(descriptorB, 12),
|
VendorIdOffset = BitConverter.ToInt32(descriptorB, 12),
|
||||||
ProductIdOffset = BitConverter.ToInt32(descriptorB, 16),
|
ProductIdOffset = BitConverter.ToInt32(descriptorB, 16),
|
||||||
ProductRevisionOffset = BitConverter.ToInt32(descriptorB, 20),
|
ProductRevisionOffset = BitConverter.ToInt32(descriptorB, 20),
|
||||||
SerialNumberOffset = BitConverter.ToInt32(descriptorB, 24),
|
SerialNumberOffset = BitConverter.ToInt32(descriptorB, 24),
|
||||||
BusType = (StorageBusType)BitConverter.ToUInt32(descriptorB, 28),
|
BusType = (StorageBusType)BitConverter.ToUInt32(descriptorB, 28),
|
||||||
RawPropertiesLength = BitConverter.ToUInt32(descriptorB, 32)
|
RawPropertiesLength = BitConverter.ToUInt32(descriptorB, 32)
|
||||||
};
|
};
|
||||||
descriptor.RawDeviceProperties = new byte[descriptor.RawPropertiesLength];
|
descriptor.RawDeviceProperties = new byte[descriptor.RawPropertiesLength];
|
||||||
Array.Copy(descriptorB, 36, descriptor.RawDeviceProperties, 0, descriptor.RawPropertiesLength);
|
Array.Copy(descriptorB, 36, descriptor.RawDeviceProperties, 0, descriptor.RawPropertiesLength);
|
||||||
@@ -183,11 +198,11 @@ namespace DiscImageChef.Devices
|
|||||||
break;
|
break;
|
||||||
case StorageBusType.FireWire:
|
case StorageBusType.FireWire:
|
||||||
IsFireWire = true;
|
IsFireWire = true;
|
||||||
Type = DeviceType.SCSI;
|
Type = DeviceType.SCSI;
|
||||||
break;
|
break;
|
||||||
case StorageBusType.USB:
|
case StorageBusType.USB:
|
||||||
IsUsb = true;
|
IsUsb = true;
|
||||||
Type = DeviceType.SCSI;
|
Type = DeviceType.SCSI;
|
||||||
break;
|
break;
|
||||||
case StorageBusType.ATAPI:
|
case StorageBusType.ATAPI:
|
||||||
Type = DeviceType.ATAPI;
|
Type = DeviceType.ATAPI;
|
||||||
@@ -224,6 +239,7 @@ namespace DiscImageChef.Devices
|
|||||||
if(ataid.HasValue) scsiSense = ScsiInquiry(out inqBuf, out _);
|
if(ataid.HasValue) scsiSense = ScsiInquiry(out inqBuf, out _);
|
||||||
}
|
}
|
||||||
else Manufacturer = "ATA";
|
else Manufacturer = "ATA";
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -283,7 +299,7 @@ namespace DiscImageChef.Devices
|
|||||||
|
|
||||||
LastError = Windows.Command.SendMmcCommand((SafeFileHandle)FileHandle,
|
LastError = Windows.Command.SendMmcCommand((SafeFileHandle)FileHandle,
|
||||||
(MmcCommands)SecureDigitalCommands
|
(MmcCommands)SecureDigitalCommands
|
||||||
.SendOperatingCondition, false, true,
|
.SendOperatingCondition, false, true,
|
||||||
MmcFlags.ResponseSpiR3 | MmcFlags.ResponseR3 |
|
MmcFlags.ResponseSpiR3 | MmcFlags.ResponseR3 |
|
||||||
MmcFlags.CommandBcr, 0, 4, 1, ref sdBuffer,
|
MmcFlags.CommandBcr, 0, 4, 1, ref sdBuffer,
|
||||||
out _, out _, out sense);
|
out _, out _, out sense);
|
||||||
@@ -311,6 +327,7 @@ namespace DiscImageChef.Devices
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case PlatformID.Linux:
|
case PlatformID.Linux:
|
||||||
if(devicePath.StartsWith("/dev/sd", StringComparison.Ordinal) ||
|
if(devicePath.StartsWith("/dev/sd", StringComparison.Ordinal) ||
|
||||||
@@ -323,25 +340,33 @@ namespace DiscImageChef.Devices
|
|||||||
string devPath = devicePath.Substring(5);
|
string devPath = devicePath.Substring(5);
|
||||||
if(File.Exists("/sys/block/" + devPath + "/device/csd"))
|
if(File.Exists("/sys/block/" + devPath + "/device/csd"))
|
||||||
{
|
{
|
||||||
int len = ConvertFromHexAscii("/sys/block/" + devPath + "/device/csd", out cachedCsd);
|
int len =
|
||||||
|
ConvertFromHexAscii("/sys/block/" + devPath + "/device/csd", out cachedCsd);
|
||||||
if(len == 0) cachedCsd = null;
|
if(len == 0) cachedCsd = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(File.Exists("/sys/block/" + devPath + "/device/cid"))
|
if(File.Exists("/sys/block/" + devPath + "/device/cid"))
|
||||||
{
|
{
|
||||||
int len = ConvertFromHexAscii("/sys/block/" + devPath + "/device/cid", out cachedCid);
|
int len =
|
||||||
|
ConvertFromHexAscii("/sys/block/" + devPath + "/device/cid", out cachedCid);
|
||||||
if(len == 0) cachedCid = null;
|
if(len == 0) cachedCid = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(File.Exists("/sys/block/" + devPath + "/device/scr"))
|
if(File.Exists("/sys/block/" + devPath + "/device/scr"))
|
||||||
{
|
{
|
||||||
int len = ConvertFromHexAscii("/sys/block/" + devPath + "/device/scr", out cachedScr);
|
int len =
|
||||||
|
ConvertFromHexAscii("/sys/block/" + devPath + "/device/scr", out cachedScr);
|
||||||
if(len == 0) cachedScr = null;
|
if(len == 0) cachedScr = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(File.Exists("/sys/block/" + devPath + "/device/ocr"))
|
if(File.Exists("/sys/block/" + devPath + "/device/ocr"))
|
||||||
{
|
{
|
||||||
int len = ConvertFromHexAscii("/sys/block/" + devPath + "/device/ocr", out cachedOcr);
|
int len =
|
||||||
|
ConvertFromHexAscii("/sys/block/" + devPath + "/device/ocr", out cachedOcr);
|
||||||
if(len == 0) cachedOcr = null;
|
if(len == 0) cachedOcr = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
scsiSense = ScsiInquiry(out inqBuf, out _);
|
scsiSense = ScsiInquiry(out inqBuf, out _);
|
||||||
@@ -351,7 +376,7 @@ namespace DiscImageChef.Devices
|
|||||||
#region SecureDigital / MultiMediaCard
|
#region SecureDigital / MultiMediaCard
|
||||||
if(cachedCid != null)
|
if(cachedCid != null)
|
||||||
{
|
{
|
||||||
ScsiType = PeripheralDeviceTypes.DirectAccess;
|
ScsiType = PeripheralDeviceTypes.DirectAccess;
|
||||||
IsRemovable = false;
|
IsRemovable = false;
|
||||||
|
|
||||||
if(cachedScr != null)
|
if(cachedScr != null)
|
||||||
@@ -359,18 +384,18 @@ namespace DiscImageChef.Devices
|
|||||||
Type = DeviceType.SecureDigital;
|
Type = DeviceType.SecureDigital;
|
||||||
CID decoded = Decoders.SecureDigital.Decoders.DecodeCID(cachedCid);
|
CID decoded = Decoders.SecureDigital.Decoders.DecodeCID(cachedCid);
|
||||||
Manufacturer = VendorString.Prettify(decoded.Manufacturer);
|
Manufacturer = VendorString.Prettify(decoded.Manufacturer);
|
||||||
Model = decoded.ProductName;
|
Model = decoded.ProductName;
|
||||||
Revision = $"{(decoded.ProductRevision & 0xF0) >> 4:X2}.{decoded.ProductRevision & 0x0F:X2}";
|
Revision = $"{(decoded.ProductRevision & 0xF0) >> 4:X2}.{decoded.ProductRevision & 0x0F:X2}";
|
||||||
Serial = $"{decoded.ProductSerialNumber}";
|
Serial = $"{decoded.ProductSerialNumber}";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Type = DeviceType.MMC;
|
Type = DeviceType.MMC;
|
||||||
Decoders.MMC.CID decoded = Decoders.MMC.Decoders.DecodeCID(cachedCid);
|
Decoders.MMC.CID decoded = Decoders.MMC.Decoders.DecodeCID(cachedCid);
|
||||||
Manufacturer = Decoders.MMC.VendorString.Prettify(decoded.Manufacturer);
|
Manufacturer = Decoders.MMC.VendorString.Prettify(decoded.Manufacturer);
|
||||||
Model = decoded.ProductName;
|
Model = decoded.ProductName;
|
||||||
Revision = $"{(decoded.ProductRevision & 0xF0) >> 4:X2}.{decoded.ProductRevision & 0x0F:X2}";
|
Revision = $"{(decoded.ProductRevision & 0xF0) >> 4:X2}.{decoded.ProductRevision & 0x0F:X2}";
|
||||||
Serial = $"{decoded.ProductSerialNumber}";
|
Serial = $"{decoded.ProductSerialNumber}";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endregion SecureDigital / MultiMediaCard
|
#endregion SecureDigital / MultiMediaCard
|
||||||
@@ -393,25 +418,25 @@ namespace DiscImageChef.Devices
|
|||||||
{
|
{
|
||||||
resolvedLink = Path.GetDirectoryName(resolvedLink);
|
resolvedLink = Path.GetDirectoryName(resolvedLink);
|
||||||
if(!File.Exists(resolvedLink + "/descriptors") ||
|
if(!File.Exists(resolvedLink + "/descriptors") ||
|
||||||
!File.Exists(resolvedLink + "/idProduct") ||
|
!File.Exists(resolvedLink + "/idProduct") ||
|
||||||
!File.Exists(resolvedLink + "/idVendor")) continue;
|
!File.Exists(resolvedLink + "/idVendor")) continue;
|
||||||
|
|
||||||
FileStream usbFs = new FileStream(resolvedLink + "/descriptors",
|
FileStream usbFs = new FileStream(resolvedLink + "/descriptors",
|
||||||
System.IO.FileMode.Open,
|
System.IO.FileMode.Open,
|
||||||
System.IO.FileAccess.Read);
|
System.IO.FileAccess.Read);
|
||||||
byte[] usbBuf = new byte[65536];
|
byte[] usbBuf = new byte[65536];
|
||||||
int usbCount = usbFs.Read(usbBuf, 0, 65536);
|
int usbCount = usbFs.Read(usbBuf, 0, 65536);
|
||||||
UsbDescriptors = new byte[usbCount];
|
UsbDescriptors = new byte[usbCount];
|
||||||
Array.Copy(usbBuf, 0, UsbDescriptors, 0, usbCount);
|
Array.Copy(usbBuf, 0, UsbDescriptors, 0, usbCount);
|
||||||
usbFs.Close();
|
usbFs.Close();
|
||||||
|
|
||||||
StreamReader usbSr = new StreamReader(resolvedLink + "/idProduct");
|
StreamReader usbSr = new StreamReader(resolvedLink + "/idProduct");
|
||||||
string usbTemp = usbSr.ReadToEnd();
|
string usbTemp = usbSr.ReadToEnd();
|
||||||
ushort.TryParse(usbTemp, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
|
ushort.TryParse(usbTemp, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
|
||||||
out usbProduct);
|
out usbProduct);
|
||||||
usbSr.Close();
|
usbSr.Close();
|
||||||
|
|
||||||
usbSr = new StreamReader(resolvedLink + "/idVendor");
|
usbSr = new StreamReader(resolvedLink + "/idVendor");
|
||||||
usbTemp = usbSr.ReadToEnd();
|
usbTemp = usbSr.ReadToEnd();
|
||||||
ushort.TryParse(usbTemp, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
|
ushort.TryParse(usbTemp, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
|
||||||
out usbVendor);
|
out usbVendor);
|
||||||
@@ -419,21 +444,21 @@ namespace DiscImageChef.Devices
|
|||||||
|
|
||||||
if(File.Exists(resolvedLink + "/manufacturer"))
|
if(File.Exists(resolvedLink + "/manufacturer"))
|
||||||
{
|
{
|
||||||
usbSr = new StreamReader(resolvedLink + "/manufacturer");
|
usbSr = new StreamReader(resolvedLink + "/manufacturer");
|
||||||
UsbManufacturerString = usbSr.ReadToEnd().Trim();
|
UsbManufacturerString = usbSr.ReadToEnd().Trim();
|
||||||
usbSr.Close();
|
usbSr.Close();
|
||||||
}
|
}
|
||||||
|
|
||||||
if(File.Exists(resolvedLink + "/product"))
|
if(File.Exists(resolvedLink + "/product"))
|
||||||
{
|
{
|
||||||
usbSr = new StreamReader(resolvedLink + "/product");
|
usbSr = new StreamReader(resolvedLink + "/product");
|
||||||
UsbProductString = usbSr.ReadToEnd().Trim();
|
UsbProductString = usbSr.ReadToEnd().Trim();
|
||||||
usbSr.Close();
|
usbSr.Close();
|
||||||
}
|
}
|
||||||
|
|
||||||
if(File.Exists(resolvedLink + "/serial"))
|
if(File.Exists(resolvedLink + "/serial"))
|
||||||
{
|
{
|
||||||
usbSr = new StreamReader(resolvedLink + "/serial");
|
usbSr = new StreamReader(resolvedLink + "/serial");
|
||||||
UsbSerialString = usbSr.ReadToEnd().Trim();
|
UsbSerialString = usbSr.ReadToEnd().Trim();
|
||||||
usbSr.Close();
|
usbSr.Close();
|
||||||
}
|
}
|
||||||
@@ -458,14 +483,15 @@ namespace DiscImageChef.Devices
|
|||||||
|
|
||||||
if(usbDevice != null)
|
if(usbDevice != null)
|
||||||
{
|
{
|
||||||
UsbDescriptors = usbDevice.BinaryDescriptors;
|
UsbDescriptors = usbDevice.BinaryDescriptors;
|
||||||
usbVendor = (ushort)usbDevice.DeviceDescriptor.idVendor;
|
usbVendor = (ushort)usbDevice.DeviceDescriptor.idVendor;
|
||||||
usbProduct = (ushort)usbDevice.DeviceDescriptor.idProduct;
|
usbProduct = (ushort)usbDevice.DeviceDescriptor.idProduct;
|
||||||
UsbManufacturerString = usbDevice.Manufacturer;
|
UsbManufacturerString = usbDevice.Manufacturer;
|
||||||
UsbProductString = usbDevice.Product;
|
UsbProductString = usbDevice.Product;
|
||||||
UsbSerialString =
|
UsbSerialString =
|
||||||
usbDevice.SerialNumber; // This is incorrect filled by Windows with SCSI/ATA serial number
|
usbDevice.SerialNumber; // This is incorrect filled by Windows with SCSI/ATA serial number
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
IsUsb = false;
|
IsUsb = false;
|
||||||
@@ -492,19 +518,19 @@ namespace DiscImageChef.Devices
|
|||||||
if(!File.Exists(resolvedLink + "/model") || !File.Exists(resolvedLink + "/vendor") ||
|
if(!File.Exists(resolvedLink + "/model") || !File.Exists(resolvedLink + "/vendor") ||
|
||||||
!File.Exists(resolvedLink + "/guid")) continue;
|
!File.Exists(resolvedLink + "/guid")) continue;
|
||||||
|
|
||||||
StreamReader fwSr = new StreamReader(resolvedLink + "/model");
|
StreamReader fwSr = new StreamReader(resolvedLink + "/model");
|
||||||
string fwTemp = fwSr.ReadToEnd();
|
string fwTemp = fwSr.ReadToEnd();
|
||||||
uint.TryParse(fwTemp, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
|
uint.TryParse(fwTemp, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
|
||||||
out firewireModel);
|
out firewireModel);
|
||||||
fwSr.Close();
|
fwSr.Close();
|
||||||
|
|
||||||
fwSr = new StreamReader(resolvedLink + "/vendor");
|
fwSr = new StreamReader(resolvedLink + "/vendor");
|
||||||
fwTemp = fwSr.ReadToEnd();
|
fwTemp = fwSr.ReadToEnd();
|
||||||
uint.TryParse(fwTemp, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
|
uint.TryParse(fwTemp, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
|
||||||
out firewireVendor);
|
out firewireVendor);
|
||||||
fwSr.Close();
|
fwSr.Close();
|
||||||
|
|
||||||
fwSr = new StreamReader(resolvedLink + "/guid");
|
fwSr = new StreamReader(resolvedLink + "/guid");
|
||||||
fwTemp = fwSr.ReadToEnd();
|
fwTemp = fwSr.ReadToEnd();
|
||||||
ulong.TryParse(fwTemp, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
|
ulong.TryParse(fwTemp, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
|
||||||
out firewireGuid);
|
out firewireGuid);
|
||||||
@@ -512,14 +538,14 @@ namespace DiscImageChef.Devices
|
|||||||
|
|
||||||
if(File.Exists(resolvedLink + "/model_name"))
|
if(File.Exists(resolvedLink + "/model_name"))
|
||||||
{
|
{
|
||||||
fwSr = new StreamReader(resolvedLink + "/model_name");
|
fwSr = new StreamReader(resolvedLink + "/model_name");
|
||||||
FireWireModelName = fwSr.ReadToEnd().Trim();
|
FireWireModelName = fwSr.ReadToEnd().Trim();
|
||||||
fwSr.Close();
|
fwSr.Close();
|
||||||
}
|
}
|
||||||
|
|
||||||
if(File.Exists(resolvedLink + "/vendor_name"))
|
if(File.Exists(resolvedLink + "/vendor_name"))
|
||||||
{
|
{
|
||||||
fwSr = new StreamReader(resolvedLink + "/vendor_name");
|
fwSr = new StreamReader(resolvedLink + "/vendor_name");
|
||||||
FireWireVendorName = fwSr.ReadToEnd().Trim();
|
FireWireVendorName = fwSr.ReadToEnd().Trim();
|
||||||
fwSr.Close();
|
fwSr.Close();
|
||||||
}
|
}
|
||||||
@@ -564,8 +590,8 @@ namespace DiscImageChef.Devices
|
|||||||
|
|
||||||
FileStream cisFs = new FileStream(possibleDir + "/cis", System.IO.FileMode.Open,
|
FileStream cisFs = new FileStream(possibleDir + "/cis", System.IO.FileMode.Open,
|
||||||
System.IO.FileAccess.Read);
|
System.IO.FileAccess.Read);
|
||||||
byte[] cisBuf = new byte[65536];
|
byte[] cisBuf = new byte[65536];
|
||||||
int cisCount = cisFs.Read(cisBuf, 0, 65536);
|
int cisCount = cisFs.Read(cisBuf, 0, 65536);
|
||||||
Cis = new byte[cisCount];
|
Cis = new byte[cisCount];
|
||||||
Array.Copy(cisBuf, 0, Cis, 0, cisCount);
|
Array.Copy(cisBuf, 0, Cis, 0, cisCount);
|
||||||
cisFs.Close();
|
cisFs.Close();
|
||||||
@@ -585,12 +611,12 @@ namespace DiscImageChef.Devices
|
|||||||
Inquiry.SCSIInquiry? inquiry = Inquiry.Decode(inqBuf);
|
Inquiry.SCSIInquiry? inquiry = Inquiry.Decode(inqBuf);
|
||||||
|
|
||||||
Type = DeviceType.SCSI;
|
Type = DeviceType.SCSI;
|
||||||
bool serialSense = ScsiInquiry(out inqBuf, out _, 0x80);
|
bool serialSense = ScsiInquiry(out inqBuf, out _, 0x80);
|
||||||
if(!serialSense) Serial = EVPD.DecodePage80(inqBuf);
|
if(!serialSense) Serial = EVPD.DecodePage80(inqBuf);
|
||||||
|
|
||||||
if(inquiry.HasValue)
|
if(inquiry.HasValue)
|
||||||
{
|
{
|
||||||
string tmp = StringHandlers.CToString(inquiry.Value.ProductRevisionLevel);
|
string tmp = StringHandlers.CToString(inquiry.Value.ProductRevisionLevel);
|
||||||
if(tmp != null) Revision = tmp.Trim();
|
if(tmp != null) Revision = tmp.Trim();
|
||||||
tmp = StringHandlers.CToString(inquiry.Value.ProductIdentification);
|
tmp = StringHandlers.CToString(inquiry.Value.ProductIdentification);
|
||||||
if(tmp != null) Model = tmp.Trim();
|
if(tmp != null) Model = tmp.Trim();
|
||||||
@@ -613,7 +639,7 @@ namespace DiscImageChef.Devices
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
LastError = 0;
|
LastError = 0;
|
||||||
Error = false;
|
Error = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -633,11 +659,11 @@ namespace DiscImageChef.Devices
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
Manufacturer = separated[0];
|
Manufacturer = separated[0];
|
||||||
Model = separated[separated.Length - 1];
|
Model = separated[separated.Length - 1];
|
||||||
}
|
}
|
||||||
|
|
||||||
Revision = ataid.Value.FirmwareRevision;
|
Revision = ataid.Value.FirmwareRevision;
|
||||||
Serial = ataid.Value.SerialNumber;
|
Serial = ataid.Value.SerialNumber;
|
||||||
|
|
||||||
ScsiType = PeripheralDeviceTypes.DirectAccess;
|
ScsiType = PeripheralDeviceTypes.DirectAccess;
|
||||||
|
|
||||||
@@ -653,31 +679,35 @@ namespace DiscImageChef.Devices
|
|||||||
if(Type == DeviceType.Unknown)
|
if(Type == DeviceType.Unknown)
|
||||||
{
|
{
|
||||||
Manufacturer = null;
|
Manufacturer = null;
|
||||||
Model = null;
|
Model = null;
|
||||||
Revision = null;
|
Revision = null;
|
||||||
Serial = null;
|
Serial = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(IsUsb)
|
if(IsUsb)
|
||||||
{
|
{
|
||||||
if(string.IsNullOrEmpty(Manufacturer)) Manufacturer = UsbManufacturerString;
|
if(string.IsNullOrEmpty(Manufacturer)) Manufacturer = UsbManufacturerString;
|
||||||
if(string.IsNullOrEmpty(Model)) Model = UsbProductString;
|
if(string.IsNullOrEmpty(Model)) Model = UsbProductString;
|
||||||
if(string.IsNullOrEmpty(Serial)) Serial = UsbSerialString;
|
if(string.IsNullOrEmpty(Serial)) Serial = UsbSerialString;
|
||||||
else foreach(char c in Serial.Where(char.IsControl)) Serial = UsbSerialString;
|
else
|
||||||
|
foreach(char c in Serial.Where(char.IsControl))
|
||||||
|
Serial = UsbSerialString;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!IsFireWire) return;
|
if(!IsFireWire) return;
|
||||||
|
|
||||||
if(string.IsNullOrEmpty(Manufacturer)) Manufacturer = FireWireVendorName;
|
if(string.IsNullOrEmpty(Manufacturer)) Manufacturer = FireWireVendorName;
|
||||||
if(string.IsNullOrEmpty(Model)) Model = FireWireModelName;
|
if(string.IsNullOrEmpty(Model)) Model = FireWireModelName;
|
||||||
if(string.IsNullOrEmpty(Serial)) Serial = $"{firewireGuid:X16}";
|
if(string.IsNullOrEmpty(Serial)) Serial = $"{firewireGuid:X16}";
|
||||||
else foreach(char c in Serial.Where(char.IsControl)) Serial = $"{firewireGuid:X16}";
|
else
|
||||||
|
foreach(char c in Serial.Where(char.IsControl))
|
||||||
|
Serial = $"{firewireGuid:X16}";
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ConvertFromHexAscii(string file, out byte[] outBuf)
|
static int ConvertFromHexAscii(string file, out byte[] outBuf)
|
||||||
{
|
{
|
||||||
StreamReader sr = new StreamReader(file);
|
StreamReader sr = new StreamReader(file);
|
||||||
string ins = sr.ReadToEnd().Trim();
|
string ins = sr.ReadToEnd().Trim();
|
||||||
outBuf = new byte[ins.Length / 2];
|
outBuf = new byte[ins.Length / 2];
|
||||||
int count = 0;
|
int count = 0;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user