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 support for CD drives (and things that pretend to be) that don't support READ CD but support SCSI READ(x) commands.

Browse Source
This commit is contained in:
Natalia Portillo
2018-06-19 22:17:20 +01:00
parent 8978315a88
commit aec8ae2620
1 changed files with 103 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
DiscImageChef.Core/Devices/Dumping/CompactDisc.cs
View File

@@ -97,6 +97,7 @@ namespace DiscImageChef.Core.Devices.Dumping
DateTime start; DateTime start;
DateTime end; DateTime end;
bool readcd; bool readcd;
bool read6 = false, read10 = false, read12 = false, read16 = false;
bool sense = false; bool sense = false;
const uint SECTOR_SIZE = 2352; const uint SECTOR_SIZE = 2352;
FullTOC.CDFullTOC? toc = null; FullTOC.CDFullTOC? toc = null;
@@ -274,9 +275,31 @@ namespace DiscImageChef.Core.Devices.Dumping
if(!readcd) if(!readcd)
{ {
dumpLog.WriteLine("Cannot read from disc, not continuing..."); dumpLog.WriteLine("Drive does not support READ CD, trying SCSI READ commands...");
DicConsole.ErrorWriteLine("Cannot read from disc, not continuing..."); DicConsole.ErrorWriteLine("Drive does not support READ CD, trying SCSI READ commands...");
return;
dumpLog.WriteLine("Checking if drive supports READ(6)...");
DicConsole.WriteLine("Checking if drive supports READ(6)...");
read6 = !dev.Read6(out readBuffer, out senseBuf, 0, 2048, 1, dev.Timeout, out _);
dumpLog.WriteLine("Checking if drive supports READ(10)...");
DicConsole.WriteLine("Checking if drive supports READ(10)...");
read10 = !dev.Read10(out readBuffer, out senseBuf, 0, false, true, false, false, 0, 2048, 0, 1,
dev.Timeout, out _);
dumpLog.WriteLine("Checking if drive supports READ(12)...");
DicConsole.WriteLine("Checking if drive supports READ(12)...");
read12 = !dev.Read12(out readBuffer, out senseBuf, 0, false, true, false, false, 0, 2048, 0,
1, false, dev.Timeout, out _);
dumpLog.WriteLine("Checking if drive supports READ(16)...");
DicConsole.WriteLine("Checking if drive supports READ(16)...");
read16 = !dev.Read16(out readBuffer, out senseBuf, 0, false, true, false, 0, 2048, 0, 1, false,
dev.Timeout, out _);
if(!read6 && !read10 && !read12 && !read16)
{
dumpLog.WriteLine("Cannot read from disc, not continuing...");
DicConsole.ErrorWriteLine("Cannot read from disc, not continuing...");
return;
}
} }
dumpLog.WriteLine("Drive can only read without subchannel..."); dumpLog.WriteLine("Drive can only read without subchannel...");
@@ -522,6 +545,12 @@ namespace DiscImageChef.Core.Devices.Dumping
{ {
if(tracks[t].TrackType == TrackType.Audio) continue; if(tracks[t].TrackType == TrackType.Audio) continue;
if(!readcd)
{
tracks[t].TrackType = TrackType.CdMode1;
continue;
}
dumpLog.WriteLine("Checking mode for track {0}...", tracks[t].TrackSequence); dumpLog.WriteLine("Checking mode for track {0}...", tracks[t].TrackSequence);
DicConsole.WriteLine("Checking mode for track {0}...", tracks[t].TrackSequence); DicConsole.WriteLine("Checking mode for track {0}...", tracks[t].TrackSequence);
@@ -556,7 +585,7 @@ namespace DiscImageChef.Core.Devices.Dumping
} }
// Check if something prevents from dumping the Lead-in // Check if something prevents from dumping the Lead-in
if(dumpLeadIn) if(dumpLeadIn && readcd)
{ {
if(dev.PlatformId == PlatformID.FreeBSD) if(dev.PlatformId == PlatformID.FreeBSD)
{ {
@@ -592,7 +621,7 @@ namespace DiscImageChef.Core.Devices.Dumping
throw new InvalidOperationException("Could not process resume file, not continuing..."); throw new InvalidOperationException("Could not process resume file, not continuing...");
// Try to read the Lead-in // Try to read the Lead-in
if(dumpLeadIn) if(dumpLeadIn && readcd)
{ {
DicConsole.WriteLine("Trying to read Lead-In..."); DicConsole.WriteLine("Trying to read Lead-In...");
bool gotLeadIn = false; bool gotLeadIn = false;
@@ -658,6 +687,29 @@ namespace DiscImageChef.Core.Devices.Dumping
true, MmcErrorField.None, supportedSubchannel, dev.Timeout, out _); true, MmcErrorField.None, supportedSubchannel, dev.Timeout, out _);
if(dev.Error || sense) blocksToRead /= 2; if(dev.Error || sense) blocksToRead /= 2;
} }
else if(read16)
{
sense = dev.Read16(out readBuffer, out senseBuf, 0, false, true, false, 0, blockSize, 0, blocksToRead, false,
dev.Timeout, out _);
if(dev.Error || sense) blocksToRead /= 2;
}
else if(read12)
{
sense = dev.Read12(out readBuffer, out senseBuf, 0, false, true, false, false, 0, blockSize, 0, blocksToRead, false,
dev.Timeout, out _);
if(dev.Error || sense) blocksToRead /= 2;
}
else if(read10)
{
sense = dev.Read10(out readBuffer, out senseBuf, 0, false, true, false, false, 0, blockSize, 0, (ushort)blocksToRead,
dev.Timeout, out _);
if(dev.Error || sense) blocksToRead /= 2;
}
else if(read6)
{
sense = dev.Read6(out readBuffer, out senseBuf, 0, blockSize, (byte)blocksToRead, dev.Timeout, out _);
if(dev.Error || sense) blocksToRead /= 2;
}
if(!dev.Error || blocksToRead == 1) break; if(!dev.Error || blocksToRead == 1) break;
} }
@@ -822,6 +874,29 @@ namespace DiscImageChef.Core.Devices.Dumping
true, MmcErrorField.None, supportedSubchannel, dev.Timeout, out cmdDuration); true, MmcErrorField.None, supportedSubchannel, dev.Timeout, out cmdDuration);
totalDuration += cmdDuration; totalDuration += cmdDuration;
} }
else if(read16)
{
sense = dev.Read16(out readBuffer, out senseBuf, 0, false, true, false, i, blockSize, 0, blocksToRead, false,
dev.Timeout, out cmdDuration);
if(dev.Error || sense) blocksToRead /= 2;
}
else if(read12)
{
sense = dev.Read12(out readBuffer, out senseBuf, 0, false, true, false, false, (uint)i, blockSize, 0, blocksToRead, false,
dev.Timeout, out cmdDuration);
if(dev.Error || sense) blocksToRead /= 2;
}
else if(read10)
{
sense = dev.Read10(out readBuffer, out senseBuf, 0, false, true, false, false, (uint)i, blockSize, 0, (ushort)blocksToRead,
dev.Timeout, out cmdDuration);
if(dev.Error || sense) blocksToRead /= 2;
}
else if(read6)
{
sense = dev.Read6(out readBuffer, out senseBuf, (uint)i, blockSize, (byte)blocksToRead, dev.Timeout, out cmdDuration);
if(dev.Error || sense) blocksToRead /= 2;
}
if(!sense && !dev.Error) if(!sense && !dev.Error)
{ {
@@ -925,6 +1000,29 @@ namespace DiscImageChef.Core.Devices.Dumping
out double cmdDuration); out double cmdDuration);
totalDuration += cmdDuration; totalDuration += cmdDuration;
} }
else if(read16)
{
sense = dev.Read16(out readBuffer, out senseBuf, 0, false, true, false, badSector, blockSize, 0, blocksToRead, false,
dev.Timeout, out double cmdDuration);
if(dev.Error || sense) blocksToRead /= 2;
}
else if(read12)
{
sense = dev.Read12(out readBuffer, out senseBuf, 0, false, true, false, false, (uint)badSector, blockSize, 0, blocksToRead, false,
dev.Timeout, out double cmdDuration);
if(dev.Error || sense) blocksToRead /= 2;
}
else if(read10)
{
sense = dev.Read10(out readBuffer, out senseBuf, 0, false, true, false, false, (uint)badSector, blockSize, 0, (ushort)blocksToRead,
dev.Timeout, out double cmdDuration);
if(dev.Error || sense) blocksToRead /= 2;
}
else if(read6)
{
sense = dev.Read6(out readBuffer, out senseBuf, (uint)badSector, blockSize, (byte)blocksToRead, dev.Timeout, out double cmdDuration);
if(dev.Error || sense) blocksToRead /= 2;
}
if(sense || dev.Error) continue; if(sense || dev.Error) continue;