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

* DiscImageChef.Decoders/CD/ATIP.cs:

Browse Source 
Added manufacturer code for a GCK disc I just came upon.

	* DiscImageChef.Metadata/DiskType.cs:
	  Corrected miswriting of CDXA, CDRW and CDROM.

	* DiscImageChef/Commands/MediaInfo.cs:
	  Check ATIP even if no TOC, as blank discs do always have
	  ATIP (but no TOC or PMA).
This commit is contained in:
Natalia Portillo
2015-12-13 07:43:14 +00:00
parent ec5ba8481a
commit 3ee16d149d
6 changed files with 48 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
DiscImageChef.Decoders/CD/ATIP.cs
View File

@@ -464,6 +464,9 @@ namespace DiscImageChef.Decoders.CD
manufacturer = "CDA Datenträger Albrechts GmbH";
break;
case 21:
// Seen only once
if (frm == 10)
manufacturer = "GCK";
if (frm == 30)
manufacturer = "Bestdisc Technology Corporation";
if (frm == 40)

5
DiscImageChef.Decoders/ChangeLog
View File

@@ -1,3 +1,8 @@
2015-12-13 Natalia Portillo <claunia@claunia.com>
* CD/ATIP.cs:
Added manufacturer code for a GCK disc I just came upon.
2015-12-04 Natalia Portillo <claunia@claunia.com>
* SCSI/Sense.cs:

5
DiscImageChef.Metadata/ChangeLog
View File

@@ -1,3 +1,8 @@
2015-12-13 Natalia Portillo <claunia@claunia.com>
* DiskType.cs:
Corrected miswriting of CDXA, CDRW and CDROM.
2015-12-06 Natalia Portillo <claunia@claunia.com>
* DiskType.cs:

12
DiscImageChef.Metadata/DiskType.cs
View File

@@ -110,16 +110,16 @@ namespace DiscImageChef.Metadata
DiscSubType = "CD-R";
break;
case CommonTypes.DiskType.CDROM:
DiscType = "CD-ROM";
DiscSubType = "CD";
DiscType = "CD";
DiscSubType = "CD-ROM";
break;
case CommonTypes.DiskType.CDROMXA:
DiscType = "CD-ROM XA";
DiscSubType = "CD";
DiscType = "CD";
DiscSubType = "CD-ROM XA";
break;
case CommonTypes.DiskType.CDRW:
DiscType = "CD-RW";
DiscSubType = "CD";
DiscType = "CD";
DiscSubType = "CD-RW";
break;
case CommonTypes.DiskType.CDV:
DiscType = "CD";

6
DiscImageChef/ChangeLog
View File

@@ -1,3 +1,9 @@
2015-12-13 Natalia Portillo <claunia@claunia.com>
* Commands/MediaInfo.cs:
Check ATIP even if no TOC, as blank discs do always have
ATIP (but no TOC or PMA).
2015-12-06 Natalia Portillo <claunia@claunia.com>
* Commands/Checksum.cs:

16
DiscImageChef/Commands/MediaInfo.cs
View File

@@ -711,22 +711,25 @@ namespace DiscImageChef.Commands
dskType == DiskType.CDRW ||
dskType == DiskType.Unknown)
{
Decoders.CD.TOC.CDTOC? toc = null;
// We discarded all discs that falsify a TOC before requesting a real TOC
// No TOC, no CD
sense = dev.ReadTocPmaAtip(out cmdBuf, out senseBuf, false, 0, 0, dev.Timeout, out duration);
if (sense)
// No TOC, no CD (or an empty one)
bool tocSense = dev.ReadTocPmaAtip(out cmdBuf, out senseBuf, false, 0, 0, dev.Timeout, out duration);
if (tocSense)
DicConsole.ErrorWriteLine("READ TOC/PMA/ATIP: TOC\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
else
{
Decoders.CD.TOC.CDTOC? toc = Decoders.CD.TOC.Decode(cmdBuf);
toc = Decoders.CD.TOC.Decode(cmdBuf);
DicConsole.WriteLine("TOC:\n{0}", Decoders.CD.TOC.Prettify(toc));
doWriteFile(outputPrefix, "_toc.bin", "SCSI READ TOC/PMA/ATIP", cmdBuf);
// As we have a TOC we know it is a CD
if(dskType == DiskType.Unknown)
dskType = DiskType.CD;
}
// Now check if it is a CD-R or CD-RW before everything else
// ATIP exists on blank CDs
sense = dev.ReadAtip(out cmdBuf, out senseBuf, dev.Timeout, out duration);
if (sense)
DicConsole.ErrorWriteLine("READ TOC/PMA/ATIP: ATIP\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
@@ -742,6 +745,9 @@ namespace DiscImageChef.Commands
}
}
// We got a TOC, get information about a recorded/mastered CD
if(!tocSense)
{
sense = dev.ReadDiscInformation(out cmdBuf, out senseBuf, MmcDiscInformationDataTypes.DiscInformation, dev.Timeout, out duration);
if (sense)
DicConsole.ErrorWriteLine("READ DISC INFORMATION 000b\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));