aaru-dps/Aaru-aaru-dps
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2026-04-05 21:44:17 +00:00
Code Issues 657 Packages Projects Releases 19 Wiki Activity

Handle parallel track path

Browse Source
This commit is contained in:
Rebecca Wallander
2026-03-01 22:15:19 +01:00
parent c7ba345f80
commit e849c5aff9
3 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Aaru.Core/Devices/Dumping/Sbc/Dump.cs
View File

@@ -322,7 +322,8 @@ partial class Dump
PFI.PhysicalFormatInformation? decodedPfi = PFI.Decode(pfi, dskType);
scsiReader.layerbreak = decodedPfi?.Layer0EndPSN ?? 0;
scsiReader.otp = decodedPfi is { Layers: 1, TrackPath: false };
scsiReader.otp = decodedPfi?.TrackPath ?? false;
if(!scsiReader.otp) scsiReader.layerbreak = decodedPfi?.DataAreaEndPSN ?? 0;
if(scsiReader.HldtstReadRaw) blocksToRead = 1;
if(scsiReader.OmniDriveReadRaw) blocksToRead = 31;

8
Aaru.Decoders/DVD/PFI.cs
View File

@@ -812,13 +812,13 @@ public static class PFI
switch(decoded.TrackPath)
{
case true when decoded.Layers == 1:
sb.AppendLine(Localization.Layers_are_in_parallel_track_path);
break;
case false when decoded.Layers == 1:
sb.AppendLine(Localization.Layers_are_in_opposite_track_path);
break;
case true when decoded.Layers == 1:
sb.AppendLine(Localization.Layers_are_in_parallel_track_path);
break;
}

26
Aaru.Devices/Device/ScsiCommands/ReadBuffer.cs
View File

@@ -119,7 +119,7 @@ public partial class Device
}
else
{
if(!IsCorrectSlPsn(sectorNumber, (ulong)(firstLba + i))) return false;
if(!IsCorrectDlPtpPsn(sectorNumber, (ulong)(firstLba + i), layer, layerbreak)) return false;
}
}
@@ -144,9 +144,9 @@ public partial class Device
/// <returns><c>false</c> if the sector is not matching expected value, else <c>true</c></returns>
static bool IsCorrectDlPtpPsn(uint sectorNumber, ulong lba, byte layer, uint layerbreak)
{
if(layer != 1) return IsCorrectSlPsn(sectorNumber, lba);
if(layer == 0) return IsCorrectSlPsn(sectorNumber, lba);
return sectorNumber == lba - layerbreak + 0x30000;
return sectorNumber == lba + 0x30000 - (layerbreak + 1 - 0x30000);
}
/// <summary>
@@ -258,10 +258,10 @@ public partial class Device
if(!sense && buffer != null && buffer.Length >= 2236 * 3)
{
// Validate that the data starts with the expected DVD sector header pattern
if(buffer.Length >= 3 &&
buffer[0] == 0x00 &&
if(buffer.Length >= 4 &&
buffer[1] == 0x03 &&
buffer[2] == 0x00)
buffer[2] == 0x00 &&
buffer[3] == 0x00)
{
AaruLogging.Debug(SCSI_MODULE_NAME, "ReadBuffer 3C variant {0:x2}{1:x2} detected", variant.mode,
variant.bufferId);
@@ -308,12 +308,12 @@ public partial class Device
return 0; // Detection failed
}
// Search for pattern 00 03 00 starting from beginning
// Search for pattern 03 00 00 starting from beginning + 1 byte
// Find first occurrence
int firstOffset = -1;
for(int i = 0; i < buffer.Length - 3; i++)
{
if(buffer[i] == 0x00 && buffer[i + 1] == 0x03 && buffer[i + 2] == 0x00)
if(buffer[i + 1] == 0x03 && buffer[i + 2] == 0x00 && buffer[i + 3] == 0x00)
{
firstOffset = i;
break;
@@ -332,7 +332,7 @@ public partial class Device
int secondOffset = -1;
for(int i = firstOffset + 2064; i < Math.Min(firstOffset + 2500, buffer.Length - 3); i++)
{
if(buffer[i] == 0x00 && buffer[i + 1] == 0x03 && buffer[i + 2] == 0x00)
if(buffer[i + 1] == 0x03 && buffer[i + 2] == 0x00 && buffer[i + 3] == 0x01)
{
secondOffset = i;
break;
@@ -355,9 +355,9 @@ public partial class Device
int expectedOffset = (int)(firstOffset + stride * sectorNum);
if(expectedOffset + 3 >= buffer.Length) break;
if(buffer[expectedOffset] != 0x00 ||
buffer[expectedOffset + 1] != 0x03 ||
buffer[expectedOffset + 2] != 0x00)
if(buffer[expectedOffset + 1] != 0x03 ||
buffer[expectedOffset + 2] != 0x00 ||
(buffer[expectedOffset + 3] != 0x02 && buffer[expectedOffset + 3] != 0x03))
{
return 0; // Verification failed
}
@@ -571,7 +571,7 @@ public partial class Device
byte[] deinterleaved = DeinterleaveEccBlock(buffer, transferLength, _detectedBufferStride, _bufferFormat);
if(!CheckSectorNumber(deinterleaved, lba, transferLength, layerbreak, true))
if(!CheckSectorNumber(deinterleaved, lba, transferLength, layerbreak, otp))
{
// Buffer offset lost - this means we've wrapped around
// Use the number of sectors read to detect buffer capacity