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

Fix detection of flash drives that report themselves as CD drives when they're not.

Browse Source
This commit is contained in:
Natalia Portillo
2020-12-03 18:19:05 +00:00
parent 72870f3c10
commit 1e4ac8b2fb
4 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Aaru.Core/Media/Info/ScsiInfo.cs
View File

@@ -283,7 +283,8 @@ namespace Aaru.Core.Media.Info
break;
}
if(dev.ScsiType == PeripheralDeviceTypes.MultiMediaDevice)
if(dev.ScsiType == PeripheralDeviceTypes.MultiMediaDevice &&
!(dev.IsUsb && (scsiMediumType == 0x40 || scsiMediumType == 0x41 || scsiMediumType == 0x42)))
{
sense = dev.GetConfiguration(out cmdBuf, out senseBuf, 0, MmcGetConfigurationRt.Current, dev.Timeout,
out _);
@@ -1397,7 +1398,8 @@ namespace Aaru.Core.Media.Info
case MediaType.Unknown:
MediaType = MediaTypeFromDevice.GetFromScsi((byte)dev.ScsiType, dev.Manufacturer, dev.Model,
scsiMediumType, scsiDensityCode, Blocks, BlockSize);
scsiMediumType, scsiDensityCode, Blocks, BlockSize,
dev.IsUsb);
break;
}
@@ -1407,7 +1409,8 @@ namespace Aaru.Core.Media.Info
containsFloppyPage)
MediaType = MediaType.FlashDrive;
if(DeviceInfo.ScsiType != PeripheralDeviceTypes.MultiMediaDevice)
if(DeviceInfo.ScsiType != PeripheralDeviceTypes.MultiMediaDevice ||
(dev.IsUsb && (scsiMediumType == 0x40 || scsiMediumType == 0x41 || scsiMediumType == 0x42)))
return;
sense = dev.ReadDiscInformation(out cmdBuf, out senseBuf, MmcDiscInformationDataTypes.DiscInformation,