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 dumping track type change border in Plextor drives.

Browse Source
This commit is contained in:
Natalia Portillo
2020-03-07 20:05:17 +00:00
parent 7bc33f663e
commit 32c8d6a2d9
1 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -304,7 +304,32 @@ namespace Aaru.Core.Devices.Dumping
UpdateProgress?.Invoke($"Reading sector {i} of {blocks} ({currentSpeed:F3} MiB/sec.)",
(long)i + r, (long)blocks);
if(readcd)
if(_supportsPlextorD8)
{
int adjustment = 0;
if(offsetBytes < 0)
adjustment = -sectorsForOffset;
sense = ReadPlextorWithSubchannel(out cmdBuf, out senseBuf,
(uint)(firstSectorToRead + r + adjustment), blockSize,
(uint)sectorsForOffset + 1,
supportedPlextorSubchannel, out cmdDuration);
totalDuration += cmdDuration;
if(!sense)
{
uint sectorsForFix = (uint)(1 + sectorsForOffset);
FixOffsetData(offsetBytes, sectorSize, sectorsForOffset, supportedSubchannel,
ref sectorsForFix, subSize, ref cmdBuf, blockSize, false);
// TODO: Implement sector validity
cmdBuf = Sector.Scramble(cmdBuf);
}
}
else if(readcd)
{
sense = _dev.ReadCd(out cmdBuf, out senseBuf, (uint)(i + r), blockSize, 1,
MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
@@ -312,37 +337,6 @@ namespace Aaru.Core.Devices.Dumping
out cmdDuration);
totalDuration += cmdDuration;
// Some drives just happily return the next audio sector instead of the last data sector, so we need to manually check for correctness
// TODO: Check the same when trimming and reading back
if(!sense)
sense = CdChecksums.CheckCdSector(cmdBuf) != true;
if(_supportsPlextorD8 && sense)
{
int adjustment = 0;
if(offsetBytes < 0)
adjustment = -sectorsForOffset;
sense = ReadPlextorWithSubchannel(out cmdBuf, out senseBuf,
(uint)(firstSectorToRead + r + adjustment), blockSize,
(uint)sectorsForOffset + 1,
supportedPlextorSubchannel, out cmdDuration);
totalDuration += cmdDuration;
if(!sense)
{
uint sectorsForFix = (uint)(1 + sectorsForOffset);
FixOffsetData(offsetBytes, sectorSize, sectorsForOffset, supportedSubchannel,
ref sectorsForFix, subSize, ref cmdBuf, blockSize, false);
// TODO: Implement sector validity
cmdBuf = Sector.Scramble(cmdBuf);
}
}
}
else if(read16)
{