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

Reverse used SCSI READ command, as some USB devices claim to support a later one but don't properly.

Browse Source
This commit is contained in:
Natalia Portillo
2020-10-28 20:03:28 +00:00
parent a6571c51e6
commit 0c0d97e07a
1 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
Aaru.Core/Devices/ReaderSCSI.cs
View File

@@ -134,6 +134,12 @@ namespace Aaru.Core.Devices
return true; return true;
} }
if(Blocks > 0x001FFFFF + 1)
_read6 = false;
if(_read10)
_read12 = false;
if(!_read16 && if(!_read16 &&
Blocks > 0xFFFFFFFF + (long)1) Blocks > 0xFFFFFFFF + (long)1)
{ {
@@ -143,6 +149,12 @@ namespace Aaru.Core.Devices
return true; return true;
} }
if(Blocks > 0xFFFFFFFF + (long)1)
{
_read10 = false;
_read12 = false;
}
_seek6 = !_dev.Seek6(out senseBuf, lba, _timeout, out _); _seek6 = !_dev.Seek6(out senseBuf, lba, _timeout, out _);
_seek10 = !_dev.Seek10(out senseBuf, lba, _timeout, out _); _seek10 = !_dev.Seek10(out senseBuf, lba, _timeout, out _);
@@ -466,14 +478,14 @@ namespace Aaru.Core.Devices
else if(_plextorReadRaw) else if(_plextorReadRaw)
AaruConsole.WriteLine("Using Plextor raw DVD reading."); AaruConsole.WriteLine("Using Plextor raw DVD reading.");
} }
else if(_read16)
AaruConsole.WriteLine("Using SCSI READ (16) command.");
else if(_read12)
AaruConsole.WriteLine("Using SCSI READ (12) command.");
else if(_read10)
AaruConsole.WriteLine("Using SCSI READ (10) command.");
else if(_read6) else if(_read6)
AaruConsole.WriteLine("Using SCSI READ (6) command."); AaruConsole.WriteLine("Using SCSI READ (6) command.");
else if(_read10)
AaruConsole.WriteLine("Using SCSI READ (10) command.");
else if(_read12)
AaruConsole.WriteLine("Using SCSI READ (12) command.");
else if(_read16)
AaruConsole.WriteLine("Using SCSI READ (16) command.");
return false; return false;
} }
@@ -525,18 +537,9 @@ namespace Aaru.Core.Devices
while(true) while(true)
{ {
if(_read16) if(_read6)
{ {
_dev.Read16(out _, out _, 0, false, true, false, 0, LogicalBlockSize, 0, BlocksToRead, false, _dev.Read6(out _, out _, 0, LogicalBlockSize, (byte)BlocksToRead, _timeout, out _);
_timeout, out _);
if(_dev.Error)
BlocksToRead /= 2;
}
else if(_read12)
{
_dev.Read12(out _, out _, 0, false, false, false, false, 0, LogicalBlockSize, 0, BlocksToRead,
false, _timeout, out _);
if(_dev.Error) if(_dev.Error)
BlocksToRead /= 2; BlocksToRead /= 2;
@@ -549,9 +552,18 @@ namespace Aaru.Core.Devices
if(_dev.Error) if(_dev.Error)
BlocksToRead /= 2; BlocksToRead /= 2;
} }
else if(_read6) else if(_read12)
{ {
_dev.Read6(out _, out _, 0, LogicalBlockSize, (byte)BlocksToRead, _timeout, out _); _dev.Read12(out _, out _, 0, false, false, false, false, 0, LogicalBlockSize, 0, BlocksToRead,
false, _timeout, out _);
if(_dev.Error)
BlocksToRead /= 2;
}
else if(_read16)
{
_dev.Read16(out _, out _, 0, false, true, false, 0, LogicalBlockSize, 0, BlocksToRead, false,
_timeout, out _);
if(_dev.Error) if(_dev.Error)
BlocksToRead /= 2; BlocksToRead /= 2;
@@ -604,18 +616,18 @@ namespace Aaru.Core.Devices
return true; return true;
else else
{ {
if(_read16) if(_read6)
sense = _dev.Read16(out buffer, out senseBuf, 0, false, false, false, block, LogicalBlockSize, 0, sense = _dev.Read6(out buffer, out senseBuf, (uint)block, LogicalBlockSize, (byte)count, _timeout,
count, false, _timeout, out duration); out duration);
else if(_read12)
sense = _dev.Read12(out buffer, out senseBuf, 0, false, false, false, false, (uint)block,
LogicalBlockSize, 0, count, false, _timeout, out duration);
else if(_read10) else if(_read10)
sense = _dev.Read10(out buffer, out senseBuf, 0, false, false, false, false, (uint)block, sense = _dev.Read10(out buffer, out senseBuf, 0, false, false, false, false, (uint)block,
LogicalBlockSize, 0, (ushort)count, _timeout, out duration); LogicalBlockSize, 0, (ushort)count, _timeout, out duration);
else if(_read6) else if(_read12)
sense = _dev.Read6(out buffer, out senseBuf, (uint)block, LogicalBlockSize, (byte)count, _timeout, sense = _dev.Read12(out buffer, out senseBuf, 0, false, false, false, false, (uint)block,
out duration); LogicalBlockSize, 0, count, false, _timeout, out duration);
else if(_read16)
sense = _dev.Read16(out buffer, out senseBuf, 0, false, false, false, block, LogicalBlockSize, 0,
count, false, _timeout, out duration);
else else
return true; return true;
} }