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 duming raw with DVD drives that support READ

Browse Source 
LONG (10) (afaik only Matshita).
This commit is contained in:
Natalia Portillo
2017-05-23 17:44:03 +01:00
parent c8ed8cb31f
commit efdfcf7db9
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DiscImageChef/ChangeLog
View File

@@ -1,3 +1,9 @@
2017-05-23 Natalia Portillo <claunia@claunia.com>
* Commands/DumpMedia.cs:
Add support for duming raw with DVD drives that support READ
LONG (10) (afaik only Matshita).
2017-05-19 Natalia Portillo <claunia@claunia.com> 2017-05-19 Natalia Portillo <claunia@claunia.com>
* DiscImageChef.csproj: * DiscImageChef.csproj:

25
DiscImageChef/Commands/DumpMedia.cs
View File

@@ -2397,7 +2397,7 @@ namespace DiscImageChef.Commands
// TODO: Raw reading // TODO: Raw reading
bool read6 = false, read10 = false, read12 = false, read16 = false, readcd = false; bool read6 = false, read10 = false, read12 = false, read16 = false, readcd = false;
bool readLong10 = false, readLong16 = false, hldtstReadRaw = false; bool readLong10 = false, readLong16 = false, hldtstReadRaw = false, readLongDvd = false;
bool plextorReadRaw = false, syqReadLong6 = false, syqReadLong10 = false; bool plextorReadRaw = false, syqReadLong6 = false, syqReadLong10 = false;
#region CompactDisc dump #region CompactDisc dump
@@ -3006,6 +3006,18 @@ namespace DiscImageChef.Commands
rawAble = true; rawAble = true;
longBlockSize = 2064; longBlockSize = 2064;
} }
// READ LONG (10) for some DVD drives
if(!rawAble && dev.Manufacturer == "MATSHITA")
{
testSense = dev.ReadLong10(out readBuffer, out senseBuf, false, false, 0, 37856, dev.Timeout, out duration);
if(!testSense && !dev.Error)
{
readLongDvd = true;
longBlockSize = 37856;
rawAble = true;
}
}
} }
if(blockSize == longBlockSize) if(blockSize == longBlockSize)
@@ -3033,7 +3045,7 @@ namespace DiscImageChef.Commands
{ {
if(readLong16) if(readLong16)
DicConsole.WriteLine("Using SCSI READ LONG (16) command."); DicConsole.WriteLine("Using SCSI READ LONG (16) command.");
else if(readLong10) else if(readLong10 || readLongDvd)
DicConsole.WriteLine("Using SCSI READ LONG (10) command."); DicConsole.WriteLine("Using SCSI READ LONG (10) command.");
else if(syqReadLong10) else if(syqReadLong10)
DicConsole.WriteLine("Using SyQuest READ LONG (10) command."); DicConsole.WriteLine("Using SyQuest READ LONG (10) command.");
@@ -3046,9 +3058,12 @@ namespace DiscImageChef.Commands
else else
throw new AccessViolationException("Should not arrive here"); throw new AccessViolationException("Should not arrive here");
if(readLongDvd) // Only a block will be read, but it contains 16 sectors and command expect sector number not block number
blocksToRead = 16;
else
blocksToRead = 1;
DicConsole.WriteLine("Reading {0} raw bytes ({1} cooked bytes) per sector.", DicConsole.WriteLine("Reading {0} raw bytes ({1} cooked bytes) per sector.",
longBlockSize, blockSize); longBlockSize, blockSize * blocksToRead);
blocksToRead = 1;
physicalBlockSize = longBlockSize; physicalBlockSize = longBlockSize;
blockSize = longBlockSize; blockSize = longBlockSize;
} }
@@ -3167,7 +3182,7 @@ namespace DiscImageChef.Commands
sense = dev.ReadLong16(out readBuffer, out senseBuf, false, i, blockSize, dev.Timeout, out cmdDuration); sense = dev.ReadLong16(out readBuffer, out senseBuf, false, i, blockSize, dev.Timeout, out cmdDuration);
totalDuration += cmdDuration; totalDuration += cmdDuration;
} }
else if(readLong10) else if(readLong10 || readLongDvd)
{ {
sense = dev.ReadLong10(out readBuffer, out senseBuf, false, false, (uint)i, (ushort)blockSize, dev.Timeout, out cmdDuration); sense = dev.ReadLong10(out readBuffer, out senseBuf, false, false, (uint)i, (ushort)blockSize, dev.Timeout, out cmdDuration);
totalDuration += cmdDuration; totalDuration += cmdDuration;