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

Try to detect the drive has not locked correctly, and try to use cold values if they look as possibly valid.

Browse Source
This commit is contained in:
Natalia Portillo
2019-11-16 20:17:24 +00:00
parent 4483b10598
commit 8af8672bd2
1 changed files with 55 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
DiscImageChef.Core/Devices/Dumping/XGD.cs
View File

@@ -1,4 +1,4 @@
// /***************************************************************************
// /***************************************************************************
// The Disc Image Chef
// ----------------------------------------------------------------------------
//
@@ -77,9 +77,32 @@ namespace DiscImageChef.Core.Devices.Dumping
if(mediaTags.ContainsKey(MediaTagType.DVD_DMI))
mediaTags.Remove(MediaTagType.DVD_DMI);
// Drive shall move to lock state when a new disc is inserted. Old kreon versions do not lock correctly so save this
sense = dev.ReadCapacity(out byte[] coldReadCapacity, out byte[] senseBuf, dev.Timeout, out _);
if(sense)
{
dumpLog.WriteLine("Cannot get disc capacity.");
StoppingErrorMessage?.Invoke("Cannot get disc capacity.");
return;
}
// Drive shall move to lock state when a new disc is inserted. Old kreon versions do not lock correctly so save this
sense = dev.ReadDiscStructure(out byte[] coldPfi, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
MmcDiscStructureFormat.PhysicalInformation, 0, 0, out _);
if(sense)
{
dumpLog.WriteLine("Cannot get PFI.");
StoppingErrorMessage?.Invoke("Cannot get PFI.");
return;
}
UpdateStatus?.Invoke("Reading Xbox Security Sector.");
dumpLog.WriteLine("Reading Xbox Security Sector.");
sense = dev.KreonExtractSs(out byte[] ssBuf, out byte[] senseBuf, dev.Timeout, out _);
sense = dev.KreonExtractSs(out byte[] ssBuf, out senseBuf, dev.Timeout, out _);
if(sense)
{
@@ -175,6 +198,36 @@ namespace DiscImageChef.Core.Devices.Dumping
Array.Copy(readBuffer, 4, tmpBuf, 0, readBuffer.Length - 4);
mediaTags.Add(MediaTagType.DVD_DMI, tmpBuf);
// Should be a safe value to detect the lock command was ignored, and we're indeed getting the whole size and not the locked one
if(totalSize > 300000)
{
UpdateStatus?.Invoke("Video partition is too big, did lock work? Trying cold values.");
dumpLog.WriteLine("Video partition is too big, did lock work? Trying cold values.");
totalSize = (ulong)((coldReadCapacity[0] << 24) + (coldReadCapacity[1] << 16) +
(coldReadCapacity[2] << 8) + coldReadCapacity[3]);
tmpBuf = new byte[coldPfi.Length - 4];
Array.Copy(coldPfi, 4, tmpBuf, 0, coldPfi.Length - 4);
mediaTags.Remove(MediaTagType.DVD_PFI);
mediaTags.Add(MediaTagType.DVD_PFI, tmpBuf);
DicConsole.DebugWriteLine("Dump-media command", "Video partition total size: {0} sectors", totalSize);
l0Video = PFI.Decode(coldPfi).Value.Layer0EndPSN - PFI.Decode(coldPfi).Value.DataAreaStartPSN + 1;
l1Video = totalSize - l0Video + 1;
if(totalSize > 300000)
{
dumpLog.WriteLine("Cannot get video partition size, not continuing. Try to eject and reinsert the drive, if it keeps happening, contact support.");
StoppingErrorMessage?.
Invoke("Cannot get video partition size, not continuing. Try to eject and reinsert the drive, if it keeps happening, contact support.");
return;
}
}
// Get game partition size
DicConsole.DebugWriteLine("Dump-media command", "Getting game partition size");
UpdateStatus?.Invoke("Unlocking drive (Xtreme).");