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

Calculate pregap when drive only supports reading Q subchannel.

Browse Source
This commit is contained in:
Natalia Portillo
2020-01-06 01:12:00 +00:00
parent fb0281ef41
commit 93d0671e49
2 changed files with 47 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/.idea.DiscImageChef/.idea/contentModel.xml generated
View File

@@ -3,10 +3,8 @@
<component name="ContentModelStore"> <component name="ContentModelStore">
<e p="$APPLICATION_CONFIG_DIR$/consoles/db" t="IncludeRecursive" /> <e p="$APPLICATION_CONFIG_DIR$/consoles/db" t="IncludeRecursive" />
<e p="$APPLICATION_PLUGINS_DIR$/puppet/lib/stubs" t="IncludeRecursive" /> <e p="$APPLICATION_PLUGINS_DIR$/puppet/lib/stubs" t="IncludeRecursive" />
<e p="$APPLICATION_CONFIG_DIR$/scratches" t="IncludeRecursive" />
<e p="$USER_HOME$/.Rider2019.3/system/extResources" t="IncludeRecursive" /> <e p="$USER_HOME$/.Rider2019.3/system/extResources" t="IncludeRecursive" />
<e p="$USER_HOME$/.Rider2019.3/system/resharper-host/local/Transient/ReSharperHost/v193/SolutionCaches/_DiscImageChef.-1491758497.00" t="ExcludeRecursive" /> <e p="$USER_HOME$/.Rider2019.3/system/resharper-host/local/Transient/ReSharperHost/v193/SolutionCaches/_DiscImageChef.-1491758497.00" t="ExcludeRecursive" />
<e p="$USER_HOME$/.config/git/ignore" t="IncludeRecursive" />
<e p="$USER_HOME$/.nuget/packages/sqlitepclraw.lib.e_sqlite3.linux/1.1.12/runtimes/linux-x64/native/libe_sqlite3.so" t="Include" /> <e p="$USER_HOME$/.nuget/packages/sqlitepclraw.lib.e_sqlite3.linux/1.1.12/runtimes/linux-x64/native/libe_sqlite3.so" t="Include" />
<e p="$PROJECT_DIR$" t="IncludeFlat"> <e p="$PROJECT_DIR$" t="IncludeFlat">
<e p=".git/info/exclude" t="IncludeRecursive" /> <e p=".git/info/exclude" t="IncludeRecursive" />

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

@@ -141,7 +141,8 @@ namespace DiscImageChef.Core.Devices.Dumping
// Check if subchannel is BCD // Check if subchannel is BCD
for(retries = 0; retries < 10; retries++) for(retries = 0; retries < 10; retries++)
{ {
sense = GetSectorForPregap(dev, 11, dbDev, out subBuf); sense = supportsRwSubchannel ? GetSectorForPregapRaw(dev, 11, dbDev, out subBuf)
: GetSectorForPregapQ16(dev, 11, dbDev, out subBuf);
if(sense) if(sense)
continue; continue;
@@ -180,7 +181,8 @@ namespace DiscImageChef.Core.Devices.Dumping
// Check if pregap is 0 // Check if pregap is 0
for(retries = 0; retries < 10; retries++) for(retries = 0; retries < 10; retries++)
{ {
sense = GetSectorForPregap(dev, (uint)lba, dbDev, out subBuf); sense = supportsRwSubchannel ? GetSectorForPregapRaw(dev, (uint)lba, dbDev, out subBuf)
: GetSectorForPregapQ16(dev, (uint)lba, dbDev, out subBuf);
if(sense) if(sense)
continue; continue;
@@ -221,11 +223,13 @@ namespace DiscImageChef.Core.Devices.Dumping
while(lba > (int)previousTrack.TrackStartSector) while(lba > (int)previousTrack.TrackStartSector)
{ {
// Some drives crash if you try to read just before the previous read, so seek away first // Some drives crash if you try to read just before the previous read, so seek away first
GetSectorForPregap(dev, (uint)lba - 10, dbDev, out subBuf); sense = supportsRwSubchannel ? GetSectorForPregapRaw(dev, (uint)lba - 10, dbDev, out subBuf)
: GetSectorForPregapQ16(dev, (uint)lba - 10, dbDev, out subBuf);
for(retries = 0; retries < 10; retries++) for(retries = 0; retries < 10; retries++)
{ {
sense = GetSectorForPregap(dev, (uint)lba, dbDev, out subBuf); sense = supportsRwSubchannel ? GetSectorForPregapRaw(dev, (uint)lba, dbDev, out subBuf)
: GetSectorForPregapQ16(dev, (uint)lba, dbDev, out subBuf);
if(sense) if(sense)
continue; continue;
@@ -315,7 +319,7 @@ namespace DiscImageChef.Core.Devices.Dumping
} }
} }
static bool GetSectorForPregap(Device dev, uint lba, Database.Models.Device dbDev, out byte[] subBuf) static bool GetSectorForPregapRaw(Device dev, uint lba, Database.Models.Device dbDev, out byte[] subBuf)
{ {
byte[] cmdBuf; byte[] cmdBuf;
bool sense; bool sense;
@@ -370,6 +374,44 @@ namespace DiscImageChef.Core.Devices.Dumping
return sense; return sense;
} }
static bool GetSectorForPregapQ16(Device dev, uint lba, Database.Models.Device dbDev, out byte[] subBuf)
{
byte[] cmdBuf;
bool sense;
subBuf = null;
sense = dev.ReadCd(out cmdBuf, out _, lba, 2368, 1, MmcSectorTypes.AllTypes, false, false, true,
MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.Q16,
dev.Timeout, out _);
if(sense)
sense = dev.ReadCd(out cmdBuf, out _, lba, 2368, 1, MmcSectorTypes.Cdda, false, false, false,
MmcHeaderCodes.None, true, false, MmcErrorField.None, MmcSubchannel.Q16, dev.Timeout,
out _);
if(!sense)
{
subBuf = new byte[16];
Array.Copy(cmdBuf, 2352, subBuf, 0, 16);
}
else
{
sense = dev.ReadCd(out cmdBuf, out _, lba, 16, 1, MmcSectorTypes.AllTypes, false, false, false,
MmcHeaderCodes.None, false, false, MmcErrorField.None, MmcSubchannel.Q16,
dev.Timeout, out _);
if(sense)
sense = dev.ReadCd(out cmdBuf, out _, lba, 16, 1, MmcSectorTypes.Cdda, false, false, false,
MmcHeaderCodes.None, false, false, MmcErrorField.None, MmcSubchannel.Q16,
dev.Timeout, out _);
if(!sense)
subBuf = cmdBuf;
}
return sense;
}
static byte[] DeinterleaveQ(byte[] subchannel) static byte[] DeinterleaveQ(byte[] subchannel)
{ {
int[] q = new int[subchannel.Length / 8]; int[] q = new int[subchannel.Length / 8];