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

When dumping an SD/MMC card try to detect if OS buffered reads are failing, and max readable blocks using sequential commands, and downgrade accordingly.

Browse Source 
Now also detects cards that are totally unreadable.
This commit is contained in:
Natalia Portillo
2021-12-11 19:48:34 +00:00
parent 37a03e3c95
commit 6e50f53d7c
2 changed files with 75 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Aaru.Core/Devices/Dumping/Dump.cs
View File

@@ -93,7 +93,7 @@ namespace Aaru.Core.Devices.Dumping
readonly DumpSubchannel _subchannel;
readonly bool _titleKeys;
readonly bool _trim;
readonly bool _useBufferedReads;
bool _useBufferedReads;
bool _aborted;
AaruContext _ctx; // Main database context
Database.Models.Device _dbDev; // Device database entry

74
Aaru.Core/Devices/Dumping/SecureDigital.cs
View File

@@ -313,6 +313,80 @@ namespace Aaru.Core.Devices.Dumping
}
}
if(_useBufferedReads && blocksToRead > 1 && !supportsCmd23)
{
while(true)
{
error = _dev.BufferedOsRead(out cmdBuf, 0, blockSize * blocksToRead,
out duration);
if(error)
blocksToRead /= 2;
if(!error ||
blocksToRead == 1)
break;
// Device is in timeout, reopen to reset
if(_dev.LastError == 110)
sense = _dev.ReOpen();
}
if(error)
{
UpdateStatus?.Invoke("Buffered OS reads are not working, trying direct commands.");
_dumpLog.WriteLine("Buffered OS reads are not working, trying direct commands.");
blocksToRead = 1;
_useBufferedReads = false;
}
}
if(!_useBufferedReads && blocksToRead > 1 && !supportsCmd23)
{
while(true)
{
error = _dev.ReadMultipleUsingSingle(out cmdBuf, out _, 0, blockSize, blocksToRead,
byteAddressed, timeout, out duration);
if(error)
blocksToRead /= 2;
// Device is in timeout, reopen to reset
if(_dev.LastError == 110)
sense = _dev.ReOpen();
if(!error ||
blocksToRead == 1)
break;
}
if(error)
{
_dumpLog.WriteLine("ERROR: Cannot get blocks to read, device error {0}.", _dev.LastError);
StoppingErrorMessage?.
Invoke($"Device error {_dev.LastError} trying to guess ideal transfer length.");
return;
}
}
if(blocksToRead == 1)
{
error = _dev.ReadSingleBlock(out cmdBuf, out _, 0, blockSize, byteAddressed, timeout,
out duration);
if(error)
{
_dumpLog.WriteLine("ERROR: Could not read from device, device error {0}.", _dev.LastError);
StoppingErrorMessage?.
Invoke($"Device error {_dev.LastError} trying to read from device.");
return;
}
}
if(supportsCmd23 || blocksToRead == 1)
{
UpdateStatus?.Invoke($"Device can read {blocksToRead} blocks at a time.");