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

Add debug messages to pregap calculation.

Browse Source
This commit is contained in:
Natalia Portillo
2020-01-08 22:39:59 +00:00
parent 3ffed4fb66
commit e6dfbc028f
1 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
DiscImageChef.Core/Devices/Dumping/CompactDisc/Pregap.cs
View File

@@ -37,6 +37,7 @@ using System.Linq;
using DiscImageChef.Checksums; using DiscImageChef.Checksums;
using DiscImageChef.CommonTypes.Enums; using DiscImageChef.CommonTypes.Enums;
using DiscImageChef.CommonTypes.Structs; using DiscImageChef.CommonTypes.Structs;
using DiscImageChef.Console;
using DiscImageChef.Core.Logging; using DiscImageChef.Core.Logging;
using DiscImageChef.Devices; using DiscImageChef.Devices;
@@ -152,6 +153,12 @@ namespace DiscImageChef.Core.Devices.Dumping
break; break;
} }
DicConsole.DebugWriteLine("Pregap calculator", bcd == true
? "Subchannel is BCD"
: bcd == false
? "Subchannel is not BCD"
: "Could not detect drive subchannel BCD");
if(bcd is null) if(bcd is null)
{ {
dumpLog?.WriteLine("Could not detect if drive subchannel is BCD or not, pregaps could not be calculated, dump may be incorrect..."); dumpLog?.WriteLine("Could not detect if drive subchannel is BCD or not, pregaps could not be calculated, dump may be incorrect...");
@@ -169,7 +176,13 @@ namespace DiscImageChef.Core.Devices.Dumping
foreach(Track track in tracks) foreach(Track track in tracks)
{ {
if(track.TrackSequence <= 1) if(track.TrackSequence <= 1)
{
DicConsole.DebugWriteLine("Pregap calculator", "Skipping track 1");
continue; continue;
}
DicConsole.DebugWriteLine("Pregap calculator", "Track {0}", track.TrackSequence);
int lba = (int)track.TrackStartSector - 1; int lba = (int)track.TrackStartSector - 1;
bool pregapFound = false; bool pregapFound = false;
@@ -185,13 +198,24 @@ namespace DiscImageChef.Core.Devices.Dumping
: GetSectorForPregapQ16(dev, (uint)lba, dbDev, out subBuf); : GetSectorForPregapQ16(dev, (uint)lba, dbDev, out subBuf);
if(sense) if(sense)
{
DicConsole.DebugWriteLine("Pregap calculator", "LBA: {0}, Try {1}, Sense {2}", lba, retries + 1,
sense);
continue; continue;
}
if(bcd == false) if(bcd == false)
BinaryToBcdQ(subBuf); BinaryToBcdQ(subBuf);
CRC16CCITTContext.Data(subBuf, 10, out crc); CRC16CCITTContext.Data(subBuf, 10, out crc);
DicConsole.DebugWriteLine("Pregap calculator",
"LBA: {0}, Try {1}, Sense {2}, Q: {3:X2} {4:X2} {5:X2} {6:X2} {7:X2} {8:X2} {9:X2} {10:X2} {11:X2} {12:X2} CRC 0x{13:X2}{14:X2}, Calculated CRC: 0x{15:X2}{16:X2}",
lba, retries + 1, sense, subBuf[0], subBuf[1], subBuf[2], subBuf[3],
subBuf[4], subBuf[5], subBuf[6], subBuf[7], subBuf[8], subBuf[9],
subBuf[10], subBuf[11], crc[0], crc[1]);
if(crc[0] != subBuf[10] || if(crc[0] != subBuf[10] ||
crc[1] != subBuf[11]) crc[1] != subBuf[11])
continue; continue;
@@ -239,6 +263,12 @@ namespace DiscImageChef.Core.Devices.Dumping
CRC16CCITTContext.Data(subBuf, 10, out crc); CRC16CCITTContext.Data(subBuf, 10, out crc);
DicConsole.DebugWriteLine("Pregap calculator",
"LBA: {0}, Try {1}, Sense {2}, Q: {3:X2} {4:X2} {5:X2} {6:X2} {7:X2} {8:X2} {9:X2} {10:X2} {11:X2} {12:X2} CRC 0x{13:X2}{14:X2}, Calculated CRC: 0x{15:X2}{16:X2}",
lba, retries + 1, sense, subBuf[0], subBuf[1], subBuf[2], subBuf[3],
subBuf[4], subBuf[5], subBuf[6], subBuf[7], subBuf[8], subBuf[9],
subBuf[10], subBuf[11], crc[0], crc[1]);
if(crc[0] == subBuf[10] && if(crc[0] == subBuf[10] &&
crc[1] == subBuf[11]) crc[1] == subBuf[11])
break; break;
@@ -254,6 +284,8 @@ namespace DiscImageChef.Core.Devices.Dumping
{ {
inexactPositioning = true; inexactPositioning = true;
DicConsole.DebugWriteLine("Pregap calculator", "All Q empty for LBA {0}", lba);
break; break;
} }
@@ -307,11 +339,21 @@ namespace DiscImageChef.Core.Devices.Dumping
int diff = posQ - lba; int diff = posQ - lba;
if(diff != 0) if(diff != 0)
{
DicConsole.DebugWriteLine("Pregap calculator", "Invalid Q position for LBA {0}, got {1}", lba,
posQ);
inexactPositioning = true; inexactPositioning = true;
}
// Bigger than known change, otherwise we found it // Bigger than known change, otherwise we found it
if(pregapQ > pregaps[track.TrackSequence]) if(pregapQ > pregaps[track.TrackSequence])
{
DicConsole.DebugWriteLine("Pregap calculator", "Pregap for track {0}: {1}", track.TrackSequence,
pregapQ);
pregaps[track.TrackSequence] = pregapQ; pregaps[track.TrackSequence] = pregapQ;
}
else if(pregapQ == pregaps[track.TrackSequence]) else if(pregapQ == pregaps[track.TrackSequence])
break; break;