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 misdetecting optical discs as flash drives.

Browse Source
This commit is contained in:
Natalia Portillo
2020-12-29 19:37:16 +00:00
parent f8754a178b
commit afeb830549
6 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -283,8 +283,7 @@ namespace Aaru.Core.Media.Info
break;
}
if(dev.ScsiType == PeripheralDeviceTypes.MultiMediaDevice &&
!(dev.IsUsb && (scsiMediumType == 0x40 || scsiMediumType == 0x41 || scsiMediumType == 0x42)))
if(dev.ScsiType == PeripheralDeviceTypes.MultiMediaDevice)
{
sense = dev.GetConfiguration(out cmdBuf, out senseBuf, 0, MmcGetConfigurationRt.Current, dev.Timeout,
out _);
@@ -293,6 +292,10 @@ namespace Aaru.Core.Media.Info
{
AaruConsole.DebugWriteLine("Media-Info command", "READ GET CONFIGURATION:\n{0}",
Sense.PrettifySense(senseBuf));
if(dev.IsUsb &&
(scsiMediumType == 0x40 || scsiMediumType == 0x41 || scsiMediumType == 0x42))
MediaType = MediaType.FlashDrive;
}
else
{
@@ -1398,7 +1401,7 @@ namespace Aaru.Core.Media.Info
case MediaType.Unknown:
MediaType = MediaTypeFromDevice.GetFromScsi((byte)dev.ScsiType, dev.Manufacturer, dev.Model,
scsiMediumType, scsiDensityCode, Blocks, BlockSize,
dev.IsUsb);
dev.IsUsb, true);
break;
}