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

Decode fixed or descriptor SCSI sense in a single pass, use whichever was returned by drive.

Browse Source
This commit is contained in:
Natalia Portillo
2021-03-26 00:37:54 +00:00
parent e4dbcdebc3
commit eda85862cd
16 changed files with 608 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Aaru.Core/Devices/Dumping/CompactDisc/Data.cs
View File

@@ -197,9 +197,9 @@ namespace Aaru.Core.Devices.Dumping
}
}
if(track.TrackSequence != 0 &&
(i + blocksToRead) - (ulong)sectorsForOffset > track.TrackEndSector + 1)
blocksToRead = (uint)(((track.TrackEndSector + 1) - i) + (ulong)sectorsForOffset);
if(track.TrackSequence != 0 &&
i + blocksToRead - (ulong)sectorsForOffset > track.TrackEndSector + 1)
blocksToRead = (uint)(track.TrackEndSector + 1 - i + (ulong)sectorsForOffset);
if(blocksToRead == 1 &&
!inData)
@@ -495,7 +495,7 @@ namespace Aaru.Core.Devices.Dumping
if(elapsed < 1)
continue;
currentSpeed = (sectorSpeedStart * blockSize) / (1048576 * elapsed);
currentSpeed = sectorSpeedStart * blockSize / (1048576 * elapsed);
sectorSpeedStart = 0;
timeSpeedStart = DateTime.UtcNow;
}
@@ -592,7 +592,7 @@ namespace Aaru.Core.Devices.Dumping
}
else
{
if(crossingLeadOut && Sense.DecodeFixed(senseBuf)?.ASC == 0x21)
if(crossingLeadOut && Sense.Decode(senseBuf)?.ASC == 0x21)
{
if(failedCrossingLeadOut)
break;
@@ -661,7 +661,7 @@ namespace Aaru.Core.Devices.Dumping
if(elapsed < 1)
continue;
currentSpeed = (sectorSpeedStart * blockSize) / (1048576 * elapsed);
currentSpeed = sectorSpeedStart * blockSize / (1048576 * elapsed);
sectorSpeedStart = 0;
timeSpeedStart = DateTime.UtcNow;
}