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

Fix device-report.

Browse Source
This commit is contained in:
Natalia Portillo
2019-01-02 05:26:45 +00:00
parent 8df23e5f01
commit 80a4a65934
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
DiscImageChef.Core/Devices/Report/MMC.cs
View File

@@ -49,11 +49,14 @@ namespace DiscImageChef.Core.Devices.Report
while(offset + 4 < response.Length)
{
ushort code = (ushort)((response[offset + 0] << 8) + response[offset + 1]);
if(code != 0x0108) continue;
byte[] data = new byte[response[offset + 3] + 4];
if(code != 0x0108)
{
offset += (uint)data.Length;
continue;
}
if(data.Length + offset > response.Length) data = new byte[response.Length - offset];
Array.Copy(data, 4, response, offset + 4, data.Length - 4);
offset += (uint)data.Length;
@@ -608,6 +611,10 @@ namespace DiscImageChef.Core.Devices.Report
if(debug) mediaTest.DvdAacsData = buffer;
break;
case "BD-ROM":
case "Ultra HD Blu-ray movie":
case "PlayStation 3 game":
case "PlayStation 4 game":
case "Xbox One game":
DicConsole.WriteLine("Querying BD BCA...");
mediaTest.CanReadBCA = !dev.ReadDiscStructure(out buffer, out senseBuffer,
MmcDiscStructureMediaType.Bd, 0, 0,
@@ -616,7 +623,8 @@ namespace DiscImageChef.Core.Devices.Report
DicConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadBCA);
if(debug) mediaTest.BluBcaData = buffer;
break;
case "DVD-RAM":
case "DVD-RAM (1st gen, marked 2.6Gb or 5.2Gb)":
case "DVD-RAM (2nd gen, marked 4.7Gb or 9.4Gb)":
case "HD DVD-RAM":
mediaTest.CanReadDDS = !dev.ReadDiscStructure(out buffer, out senseBuffer,
MmcDiscStructureMediaType.Dvd, 0, 0,
@@ -715,7 +723,9 @@ namespace DiscImageChef.Core.Devices.Report
if(debug) mediaTest.DvdLayerData = buffer;
}
if(mediaType.StartsWith("BD-R", StringComparison.Ordinal))
if(mediaType.StartsWith("BD-R", StringComparison.Ordinal) || mediaType == "Ultra HD Blu-ray movie" ||
mediaType == "PlayStation 3 game" ||
mediaType == "PlayStation 4 game" || mediaType == "Xbox One game")
{
DicConsole.WriteLine("Querying BD Disc Information...");
mediaTest.CanReadDiscInformation = !dev.ReadDiscStructure(out buffer, out senseBuffer,