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 REV120.

Browse Source
This commit is contained in:
Natalia Portillo
2019-09-19 16:39:32 +01:00
parent 44a4fab381
commit 7f01bc5940
6 changed files with 1511 additions and 1343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DONATING.md
View File

@@ -21,7 +21,7 @@ After adding enhanced support all drives will be given to the Canary Islands Com
- Iomega Bernoulli - Iomega Bernoulli
- Iomega Ditto drive and tapes - Iomega Ditto drive and tapes
- Iomega JAZ and JAZ 2 - Iomega JAZ and JAZ 2
- Iomega REV 70Gb and 120Gb - Iomega REV 70Gb
- Iomega ZIP750 drive - Iomega ZIP750 drive
- LD-ROM drive and media - LD-ROM drive and media
- LTO drive and tapes - LTO drive and tapes

383
DiscImageChef.CommonTypes/MediaTypeFromSCSI.cs
View File

File diff suppressed because it is too large Load Diff

204
DiscImageChef.Core/Devices/Dumping/MMC.cs
View File

@@ -58,18 +58,18 @@ namespace DiscImageChef.Core.Devices.Dumping
{ {
bool sense; bool sense;
byte[] tmpBuf; byte[] tmpBuf;
bool compactDisc = true; var compactDisc = true;
bool isXbox = false; var isXbox = false;
// TODO: Log not only what is it reading, but if it was read correctly or not. // TODO: Log not only what is it reading, but if it was read correctly or not.
sense = dev.GetConfiguration(out byte[] cmdBuf, out _, 0, MmcGetConfigurationRt.Current, dev.Timeout, sense = dev.GetConfiguration(out var cmdBuf, out _, 0, MmcGetConfigurationRt.Current, dev.Timeout,
out _); out _);
if(!sense) if (!sense)
{ {
Features.SeparatedFeatures ftr = Features.Separate(cmdBuf); var ftr = Features.Separate(cmdBuf);
dumpLog.WriteLine("Device reports current profile is 0x{0:X4}", ftr.CurrentProfile); dumpLog.WriteLine("Device reports current profile is 0x{0:X4}", ftr.CurrentProfile);
switch(ftr.CurrentProfile) switch (ftr.CurrentProfile)
{ {
case 0x0001: case 0x0001:
dskType = MediaType.GENERIC_HDD; dskType = MediaType.GENERIC_HDD;
@@ -167,40 +167,48 @@ namespace DiscImageChef.Core.Devices.Dumping
} }
} }
if(compactDisc) if (compactDisc)
{ {
CompactDisc(ref dskType); CompactDisc(ref dskType);
return; return;
} }
Reader scsiReader = new Reader(dev, dev.Timeout, null, dumpRaw); var scsiReader = new Reader(dev, dev.Timeout, null, dumpRaw);
ulong blocks = scsiReader.GetDeviceBlocks(); var blocks = scsiReader.GetDeviceBlocks();
dumpLog.WriteLine("Device reports disc has {0} blocks", blocks); dumpLog.WriteLine("Device reports disc has {0} blocks", blocks);
Dictionary<MediaTagType, byte[]> mediaTags = new Dictionary<MediaTagType, byte[]>(); var mediaTags = new Dictionary<MediaTagType, byte[]>();
if(dskType == MediaType.PD650) if (dskType == MediaType.PD650)
switch(blocks + 1) switch (blocks + 1)
{ {
case 1281856: case 1281856:
dskType = MediaType.PD650_WORM; dskType = MediaType.PD650_WORM;
break; break;
case 58620544:
dskType = MediaType.REV120;
break;
case 17090880: case 17090880:
dskType = MediaType.REV35; dskType = MediaType.REV35;
break; break;
// TODO: Unknown value
default:
dskType = MediaType.REV70;
break;
} }
#region Nintendo #region Nintendo
switch(dskType)
switch (dskType)
{ {
case MediaType.Unknown when blocks > 0: case MediaType.Unknown when blocks > 0:
dumpLog.WriteLine("Reading Physical Format Information"); dumpLog.WriteLine("Reading Physical Format Information");
sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0, sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
MmcDiscStructureFormat.PhysicalInformation, 0, dev.Timeout, out _); MmcDiscStructureFormat.PhysicalInformation, 0, dev.Timeout, out _);
if(!sense) if (!sense)
{ {
PFI.PhysicalFormatInformation? nintendoPfi = PFI.Decode(cmdBuf); var nintendoPfi = PFI.Decode(cmdBuf);
if(nintendoPfi != null) if (nintendoPfi != null)
if(nintendoPfi.Value.DiskCategory == DiskCategory.Nintendo && if (nintendoPfi.Value.DiskCategory == DiskCategory.Nintendo &&
nintendoPfi.Value.PartVersion == 15) nintendoPfi.Value.PartVersion == 15)
{ {
dumpLog.WriteLine("Dumping Nintendo GameCube or Wii discs is not yet implemented."); dumpLog.WriteLine("Dumping Nintendo GameCube or Wii discs is not yet implemented.");
@@ -231,19 +239,19 @@ namespace DiscImageChef.Core.Devices.Dumping
dumpLog.WriteLine("Reading Physical Format Information"); dumpLog.WriteLine("Reading Physical Format Information");
sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0, sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
MmcDiscStructureFormat.PhysicalInformation, 0, dev.Timeout, out _); MmcDiscStructureFormat.PhysicalInformation, 0, dev.Timeout, out _);
if(!sense) if (!sense)
if(PFI.Decode(cmdBuf).HasValue) if (PFI.Decode(cmdBuf).HasValue)
{ {
tmpBuf = new byte[cmdBuf.Length - 4]; tmpBuf = new byte[cmdBuf.Length - 4];
Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4); Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
mediaTags.Add(MediaTagType.DVD_PFI, tmpBuf); mediaTags.Add(MediaTagType.DVD_PFI, tmpBuf);
PFI.PhysicalFormatInformation decPfi = PFI.Decode(cmdBuf).Value; var decPfi = PFI.Decode(cmdBuf).Value;
UpdateStatus?.Invoke($"PFI:\n{PFI.Prettify(decPfi)}"); UpdateStatus?.Invoke($"PFI:\n{PFI.Prettify(decPfi)}");
// False book types // False book types
if(dskType == MediaType.DVDROM) if (dskType == MediaType.DVDROM)
switch(decPfi.DiskCategory) switch (decPfi.DiskCategory)
{ {
case DiskCategory.DVDPR: case DiskCategory.DVDPR:
dskType = MediaType.DVDPR; dskType = MediaType.DVDPR;
@@ -294,25 +302,28 @@ namespace DiscImageChef.Core.Devices.Dumping
sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0, sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
MmcDiscStructureFormat.DiscManufacturingInformation, 0, dev.Timeout, MmcDiscStructureFormat.DiscManufacturingInformation, 0, dev.Timeout,
out _); out _);
if(!sense) if (!sense)
{ {
if(DMI.IsXbox(cmdBuf) || DMI.IsXbox360(cmdBuf)) if (DMI.IsXbox(cmdBuf) || DMI.IsXbox360(cmdBuf))
{ {
if(DMI.IsXbox(cmdBuf)) dskType = MediaType.XGD; if (DMI.IsXbox(cmdBuf))
else if(DMI.IsXbox360(cmdBuf)) {
dskType = MediaType.XGD;
}
else if (DMI.IsXbox360(cmdBuf))
{ {
dskType = MediaType.XGD2; dskType = MediaType.XGD2;
// All XGD3 all have the same number of blocks // All XGD3 all have the same number of blocks
if(blocks == 25063 || // Locked (or non compatible drive) if (blocks == 25063 || // Locked (or non compatible drive)
blocks == 4229664 || // Xtreme unlock blocks == 4229664 || // Xtreme unlock
blocks == 4246304) // Wxripper unlock blocks == 4246304) // Wxripper unlock
dskType = MediaType.XGD3; dskType = MediaType.XGD3;
} }
sense = dev.ScsiInquiry(out byte[] inqBuf, out _); sense = dev.ScsiInquiry(out var inqBuf, out _);
if(sense || !Inquiry.Decode(inqBuf).HasValue || Inquiry.Decode(inqBuf).HasValue && if (sense || !Inquiry.Decode(inqBuf).HasValue || Inquiry.Decode(inqBuf).HasValue &&
!Inquiry.Decode(inqBuf).Value.KreonPresent) !Inquiry.Decode(inqBuf).Value.KreonPresent)
{ {
dumpLog.WriteLine("Dumping Xbox Game Discs requires a drive with Kreon firmware."); dumpLog.WriteLine("Dumping Xbox Game Discs requires a drive with Kreon firmware.");
@@ -321,10 +332,11 @@ namespace DiscImageChef.Core.Devices.Dumping
return; return;
} }
if(dumpRaw && !force) if (dumpRaw && !force)
{ {
StoppingErrorMessage StoppingErrorMessage
?.Invoke("Not continuing. If you want to continue reading cooked data when raw is not available use the force option."); ?.Invoke(
"Not continuing. If you want to continue reading cooked data when raw is not available use the force option.");
// TODO: Exit more gracefully // TODO: Exit more gracefully
return; return;
} }
@@ -332,7 +344,7 @@ namespace DiscImageChef.Core.Devices.Dumping
isXbox = true; isXbox = true;
} }
if(cmdBuf.Length == 2052) if (cmdBuf.Length == 2052)
{ {
tmpBuf = new byte[cmdBuf.Length - 4]; tmpBuf = new byte[cmdBuf.Length - 4];
Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4); Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
@@ -342,37 +354,42 @@ namespace DiscImageChef.Core.Devices.Dumping
break; break;
} }
#endregion Nintendo #endregion Nintendo
#region All DVD and HD DVD types #region All DVD and HD DVD types
#endregion All DVD and HD DVD types #endregion All DVD and HD DVD types
#region DVD-ROM #region DVD-ROM
if(dskType == MediaType.DVDDownload || dskType == MediaType.DVDROM)
if (dskType == MediaType.DVDDownload || dskType == MediaType.DVDROM)
{ {
dumpLog.WriteLine("Reading Lead-in Copyright Information."); dumpLog.WriteLine("Reading Lead-in Copyright Information.");
sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0, sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
MmcDiscStructureFormat.CopyrightInformation, 0, dev.Timeout, out _); MmcDiscStructureFormat.CopyrightInformation, 0, dev.Timeout, out _);
if(!sense) if (!sense)
if(CSS_CPRM.DecodeLeadInCopyright(cmdBuf).HasValue) if (CSS_CPRM.DecodeLeadInCopyright(cmdBuf).HasValue)
{ {
tmpBuf = new byte[cmdBuf.Length - 4]; tmpBuf = new byte[cmdBuf.Length - 4];
Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4); Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
mediaTags.Add(MediaTagType.DVD_CMI, tmpBuf); mediaTags.Add(MediaTagType.DVD_CMI, tmpBuf);
} }
} }
#endregion DVD-ROM #endregion DVD-ROM
switch(dskType) switch (dskType)
{ {
#region DVD-ROM and HD DVD-ROM #region DVD-ROM and HD DVD-ROM
case MediaType.DVDDownload: case MediaType.DVDDownload:
case MediaType.DVDROM: case MediaType.DVDROM:
case MediaType.HDDVDROM: case MediaType.HDDVDROM:
dumpLog.WriteLine("Reading Burst Cutting Area."); dumpLog.WriteLine("Reading Burst Cutting Area.");
sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0, sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
MmcDiscStructureFormat.BurstCuttingArea, 0, dev.Timeout, out _); MmcDiscStructureFormat.BurstCuttingArea, 0, dev.Timeout, out _);
if(!sense) if (!sense)
{ {
tmpBuf = new byte[cmdBuf.Length - 4]; tmpBuf = new byte[cmdBuf.Length - 4];
Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4); Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
@@ -380,16 +397,18 @@ namespace DiscImageChef.Core.Devices.Dumping
} }
break; break;
#endregion DVD-ROM and HD DVD-ROM #endregion DVD-ROM and HD DVD-ROM
#region DVD-RAM and HD DVD-RAM #region DVD-RAM and HD DVD-RAM
case MediaType.DVDRAM: case MediaType.DVDRAM:
case MediaType.HDDVDRAM: case MediaType.HDDVDRAM:
dumpLog.WriteLine("Reading Disc Description Structure."); dumpLog.WriteLine("Reading Disc Description Structure.");
sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0, sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
MmcDiscStructureFormat.DvdramDds, 0, dev.Timeout, out _); MmcDiscStructureFormat.DvdramDds, 0, dev.Timeout, out _);
if(!sense) if (!sense)
if(DDS.Decode(cmdBuf).HasValue) if (DDS.Decode(cmdBuf).HasValue)
{ {
tmpBuf = new byte[cmdBuf.Length - 4]; tmpBuf = new byte[cmdBuf.Length - 4];
Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4); Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
@@ -400,8 +419,8 @@ namespace DiscImageChef.Core.Devices.Dumping
sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0, sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
MmcDiscStructureFormat.DvdramSpareAreaInformation, 0, dev.Timeout, MmcDiscStructureFormat.DvdramSpareAreaInformation, 0, dev.Timeout,
out _); out _);
if(!sense) if (!sense)
if(Spare.Decode(cmdBuf).HasValue) if (Spare.Decode(cmdBuf).HasValue)
{ {
tmpBuf = new byte[cmdBuf.Length - 4]; tmpBuf = new byte[cmdBuf.Length - 4];
Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4); Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
@@ -409,15 +428,17 @@ namespace DiscImageChef.Core.Devices.Dumping
} }
break; break;
#endregion DVD-RAM and HD DVD-RAM #endregion DVD-RAM and HD DVD-RAM
#region DVD-R and DVD-RW #region DVD-R and DVD-RW
case MediaType.DVDR: case MediaType.DVDR:
case MediaType.DVDRW: case MediaType.DVDRW:
dumpLog.WriteLine("Reading Pre-Recorded Information."); dumpLog.WriteLine("Reading Pre-Recorded Information.");
sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0, sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
MmcDiscStructureFormat.PreRecordedInfo, 0, dev.Timeout, out _); MmcDiscStructureFormat.PreRecordedInfo, 0, dev.Timeout, out _);
if(!sense) if (!sense)
{ {
tmpBuf = new byte[cmdBuf.Length - 4]; tmpBuf = new byte[cmdBuf.Length - 4];
Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4); Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
@@ -425,19 +446,21 @@ namespace DiscImageChef.Core.Devices.Dumping
} }
break; break;
#endregion DVD-R and DVD-RW #endregion DVD-R and DVD-RW
} }
switch(dskType) switch (dskType)
{ {
#region DVD-R, DVD-RW and HD DVD-R #region DVD-R, DVD-RW and HD DVD-R
case MediaType.DVDR: case MediaType.DVDR:
case MediaType.DVDRW: case MediaType.DVDRW:
case MediaType.HDDVDR: case MediaType.HDDVDR:
dumpLog.WriteLine("Reading Media Identifier."); dumpLog.WriteLine("Reading Media Identifier.");
sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0, sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
MmcDiscStructureFormat.DvdrMediaIdentifier, 0, dev.Timeout, out _); MmcDiscStructureFormat.DvdrMediaIdentifier, 0, dev.Timeout, out _);
if(!sense) if (!sense)
{ {
tmpBuf = new byte[cmdBuf.Length - 4]; tmpBuf = new byte[cmdBuf.Length - 4];
Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4); Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
@@ -448,7 +471,7 @@ namespace DiscImageChef.Core.Devices.Dumping
sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0, sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
MmcDiscStructureFormat.DvdrPhysicalInformation, 0, dev.Timeout, MmcDiscStructureFormat.DvdrPhysicalInformation, 0, dev.Timeout,
out _); out _);
if(!sense) if (!sense)
{ {
tmpBuf = new byte[cmdBuf.Length - 4]; tmpBuf = new byte[cmdBuf.Length - 4];
Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4); Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
@@ -456,9 +479,11 @@ namespace DiscImageChef.Core.Devices.Dumping
} }
break; break;
#endregion DVD-R, DVD-RW and HD DVD-R #endregion DVD-R, DVD-RW and HD DVD-R
#region All DVD+ #region All DVD+
case MediaType.DVDPR: case MediaType.DVDPR:
case MediaType.DVDPRDL: case MediaType.DVDPRDL:
case MediaType.DVDPRW: case MediaType.DVDPRW:
@@ -466,7 +491,7 @@ namespace DiscImageChef.Core.Devices.Dumping
dumpLog.WriteLine("Reading ADdress In Pregroove."); dumpLog.WriteLine("Reading ADdress In Pregroove.");
sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0, sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
MmcDiscStructureFormat.Adip, 0, dev.Timeout, out _); MmcDiscStructureFormat.Adip, 0, dev.Timeout, out _);
if(!sense) if (!sense)
{ {
tmpBuf = new byte[cmdBuf.Length - 4]; tmpBuf = new byte[cmdBuf.Length - 4];
Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4); Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
@@ -476,7 +501,7 @@ namespace DiscImageChef.Core.Devices.Dumping
dumpLog.WriteLine("Reading Disc Control Blocks."); dumpLog.WriteLine("Reading Disc Control Blocks.");
sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0, sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
MmcDiscStructureFormat.Dcb, 0, dev.Timeout, out _); MmcDiscStructureFormat.Dcb, 0, dev.Timeout, out _);
if(!sense) if (!sense)
{ {
tmpBuf = new byte[cmdBuf.Length - 4]; tmpBuf = new byte[cmdBuf.Length - 4];
Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4); Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
@@ -484,15 +509,17 @@ namespace DiscImageChef.Core.Devices.Dumping
} }
break; break;
#endregion All DVD+ #endregion All DVD+
#region HD DVD-ROM #region HD DVD-ROM
case MediaType.HDDVDROM: case MediaType.HDDVDROM:
dumpLog.WriteLine("Reading Lead-in Copyright Information."); dumpLog.WriteLine("Reading Lead-in Copyright Information.");
sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0, sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
MmcDiscStructureFormat.HddvdCopyrightInformation, 0, dev.Timeout, MmcDiscStructureFormat.HddvdCopyrightInformation, 0, dev.Timeout,
out _); out _);
if(!sense) if (!sense)
{ {
tmpBuf = new byte[cmdBuf.Length - 4]; tmpBuf = new byte[cmdBuf.Length - 4];
Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4); Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
@@ -500,9 +527,11 @@ namespace DiscImageChef.Core.Devices.Dumping
} }
break; break;
#endregion HD DVD-ROM #endregion HD DVD-ROM
#region All Blu-ray #region All Blu-ray
case MediaType.BDR: case MediaType.BDR:
case MediaType.BDRE: case MediaType.BDRE:
case MediaType.BDROM: case MediaType.BDROM:
@@ -511,8 +540,8 @@ namespace DiscImageChef.Core.Devices.Dumping
dumpLog.WriteLine("Reading Disc Information."); dumpLog.WriteLine("Reading Disc Information.");
sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Bd, 0, 0, sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Bd, 0, 0,
MmcDiscStructureFormat.DiscInformation, 0, dev.Timeout, out _); MmcDiscStructureFormat.DiscInformation, 0, dev.Timeout, out _);
if(!sense) if (!sense)
if(DI.Decode(cmdBuf).HasValue) if (DI.Decode(cmdBuf).HasValue)
{ {
tmpBuf = new byte[cmdBuf.Length - 4]; tmpBuf = new byte[cmdBuf.Length - 4];
Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4); Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
@@ -531,17 +560,19 @@ namespace DiscImageChef.Core.Devices.Dumping
mediaTags.Add(MediaTagType.PAC, tmpBuf); mediaTags.Add(MediaTagType.PAC, tmpBuf);
}*/ }*/
break; break;
#endregion All Blu-ray #endregion All Blu-ray
} }
switch(dskType) switch (dskType)
{ {
#region BD-ROM only #region BD-ROM only
case MediaType.BDROM: case MediaType.BDROM:
dumpLog.WriteLine("Reading Burst Cutting Area."); dumpLog.WriteLine("Reading Burst Cutting Area.");
sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Bd, 0, 0, sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Bd, 0, 0,
MmcDiscStructureFormat.BdBurstCuttingArea, 0, dev.Timeout, out _); MmcDiscStructureFormat.BdBurstCuttingArea, 0, dev.Timeout, out _);
if(!sense) if (!sense)
{ {
tmpBuf = new byte[cmdBuf.Length - 4]; tmpBuf = new byte[cmdBuf.Length - 4];
Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4); Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
@@ -549,9 +580,11 @@ namespace DiscImageChef.Core.Devices.Dumping
} }
break; break;
#endregion BD-ROM only #endregion BD-ROM only
#region Writable Blu-ray only #region Writable Blu-ray only
case MediaType.BDR: case MediaType.BDR:
case MediaType.BDRE: case MediaType.BDRE:
case MediaType.BDRXL: case MediaType.BDRXL:
@@ -559,7 +592,7 @@ namespace DiscImageChef.Core.Devices.Dumping
dumpLog.WriteLine("Reading Disc Definition Structure."); dumpLog.WriteLine("Reading Disc Definition Structure.");
sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Bd, 0, 0, sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Bd, 0, 0,
MmcDiscStructureFormat.BdDds, 0, dev.Timeout, out _); MmcDiscStructureFormat.BdDds, 0, dev.Timeout, out _);
if(!sense) if (!sense)
{ {
tmpBuf = new byte[cmdBuf.Length - 4]; tmpBuf = new byte[cmdBuf.Length - 4];
Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4); Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
@@ -569,7 +602,7 @@ namespace DiscImageChef.Core.Devices.Dumping
dumpLog.WriteLine("Reading Spare Area Information."); dumpLog.WriteLine("Reading Spare Area Information.");
sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Bd, 0, 0, sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Bd, 0, 0,
MmcDiscStructureFormat.BdSpareAreaInformation, 0, dev.Timeout, out _); MmcDiscStructureFormat.BdSpareAreaInformation, 0, dev.Timeout, out _);
if(!sense) if (!sense)
{ {
tmpBuf = new byte[cmdBuf.Length - 4]; tmpBuf = new byte[cmdBuf.Length - 4];
Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4); Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
@@ -577,10 +610,11 @@ namespace DiscImageChef.Core.Devices.Dumping
} }
break; break;
#endregion Writable Blu-ray only #endregion Writable Blu-ray only
} }
if(isXbox) if (isXbox)
{ {
Xgd(mediaTags, ref dskType); Xgd(mediaTags, ref dskType);
return; return;
@@ -593,13 +627,13 @@ namespace DiscImageChef.Core.Devices.Dumping
KeyValuePair<MediaTagType, byte[]> tag, KeyValuePair<MediaTagType, byte[]> tag,
ref CICMMetadataType sidecar) ref CICMMetadataType sidecar)
{ {
switch(tag.Key) switch (tag.Key)
{ {
case MediaTagType.DVD_PFI: case MediaTagType.DVD_PFI:
sidecar.OpticalDisc[0].PFI = new DumpType sidecar.OpticalDisc[0].PFI = new DumpType
{ {
Image = outputPath, Image = outputPath,
Size = (ulong)tag.Value.Length, Size = (ulong) tag.Value.Length,
Checksums = Checksum.GetChecksums(tag.Value).ToArray() Checksums = Checksum.GetChecksums(tag.Value).ToArray()
}; };
break; break;
@@ -607,7 +641,7 @@ namespace DiscImageChef.Core.Devices.Dumping
sidecar.OpticalDisc[0].DMI = new DumpType sidecar.OpticalDisc[0].DMI = new DumpType
{ {
Image = outputPath, Image = outputPath,
Size = (ulong)tag.Value.Length, Size = (ulong) tag.Value.Length,
Checksums = Checksum.GetChecksums(tag.Value).ToArray() Checksums = Checksum.GetChecksums(tag.Value).ToArray()
}; };
break; break;
@@ -616,17 +650,17 @@ namespace DiscImageChef.Core.Devices.Dumping
sidecar.OpticalDisc[0].CMI = new DumpType sidecar.OpticalDisc[0].CMI = new DumpType
{ {
Image = outputPath, Image = outputPath,
Size = (ulong)tag.Value.Length, Size = (ulong) tag.Value.Length,
Checksums = Checksum.GetChecksums(tag.Value).ToArray() Checksums = Checksum.GetChecksums(tag.Value).ToArray()
}; };
byte[] tmp = new byte[tag.Value.Length + 4]; var tmp = new byte[tag.Value.Length + 4];
Array.Copy(tag.Value, 0, tmp, 4, tag.Value.Length); Array.Copy(tag.Value, 0, tmp, 4, tag.Value.Length);
tmp[0] = (byte)((tag.Value.Length & 0xFF00) >> 8); tmp[0] = (byte) ((tag.Value.Length & 0xFF00) >> 8);
tmp[1] = (byte)(tag.Value.Length & 0xFF); tmp[1] = (byte) (tag.Value.Length & 0xFF);
CSS_CPRM.LeadInCopyright? cpy = CSS_CPRM.DecodeLeadInCopyright(tmp); var cpy = CSS_CPRM.DecodeLeadInCopyright(tmp);
if(cpy.HasValue && cpy.Value.CopyrightType != CopyrightType.NoProtection) if (cpy.HasValue && cpy.Value.CopyrightType != CopyrightType.NoProtection)
sidecar.OpticalDisc[0].CopyProtection = cpy.Value.CopyrightType.ToString(); sidecar.OpticalDisc[0].CopyProtection = cpy.Value.CopyrightType.ToString();
break; break;
@@ -635,7 +669,7 @@ namespace DiscImageChef.Core.Devices.Dumping
sidecar.OpticalDisc[0].BCA = new DumpType sidecar.OpticalDisc[0].BCA = new DumpType
{ {
Image = outputPath, Image = outputPath,
Size = (ulong)tag.Value.Length, Size = (ulong) tag.Value.Length,
Checksums = Checksum.GetChecksums(tag.Value).ToArray() Checksums = Checksum.GetChecksums(tag.Value).ToArray()
}; };
break; break;
@@ -644,7 +678,7 @@ namespace DiscImageChef.Core.Devices.Dumping
sidecar.OpticalDisc[0].DDS = new DumpType sidecar.OpticalDisc[0].DDS = new DumpType
{ {
Image = outputPath, Image = outputPath,
Size = (ulong)tag.Value.Length, Size = (ulong) tag.Value.Length,
Checksums = Checksum.GetChecksums(tag.Value).ToArray() Checksums = Checksum.GetChecksums(tag.Value).ToArray()
}; };
break; break;
@@ -653,7 +687,7 @@ namespace DiscImageChef.Core.Devices.Dumping
sidecar.OpticalDisc[0].SAI = new DumpType sidecar.OpticalDisc[0].SAI = new DumpType
{ {
Image = outputPath, Image = outputPath,
Size = (ulong)tag.Value.Length, Size = (ulong) tag.Value.Length,
Checksums = Checksum.GetChecksums(tag.Value).ToArray() Checksums = Checksum.GetChecksums(tag.Value).ToArray()
}; };
break; break;
@@ -661,7 +695,7 @@ namespace DiscImageChef.Core.Devices.Dumping
sidecar.OpticalDisc[0].PRI = new DumpType sidecar.OpticalDisc[0].PRI = new DumpType
{ {
Image = outputPath, Image = outputPath,
Size = (ulong)tag.Value.Length, Size = (ulong) tag.Value.Length,
Checksums = Checksum.GetChecksums(tag.Value).ToArray() Checksums = Checksum.GetChecksums(tag.Value).ToArray()
}; };
break; break;
@@ -669,7 +703,7 @@ namespace DiscImageChef.Core.Devices.Dumping
sidecar.OpticalDisc[0].MediaID = new DumpType sidecar.OpticalDisc[0].MediaID = new DumpType
{ {
Image = outputPath, Image = outputPath,
Size = (ulong)tag.Value.Length, Size = (ulong) tag.Value.Length,
Checksums = Checksum.GetChecksums(tag.Value).ToArray() Checksums = Checksum.GetChecksums(tag.Value).ToArray()
}; };
break; break;
@@ -677,7 +711,7 @@ namespace DiscImageChef.Core.Devices.Dumping
sidecar.OpticalDisc[0].PFIR = new DumpType sidecar.OpticalDisc[0].PFIR = new DumpType
{ {
Image = outputPath, Image = outputPath,
Size = (ulong)tag.Value.Length, Size = (ulong) tag.Value.Length,
Checksums = Checksum.GetChecksums(tag.Value).ToArray() Checksums = Checksum.GetChecksums(tag.Value).ToArray()
}; };
break; break;
@@ -685,7 +719,7 @@ namespace DiscImageChef.Core.Devices.Dumping
sidecar.OpticalDisc[0].ADIP = new DumpType sidecar.OpticalDisc[0].ADIP = new DumpType
{ {
Image = outputPath, Image = outputPath,
Size = (ulong)tag.Value.Length, Size = (ulong) tag.Value.Length,
Checksums = Checksum.GetChecksums(tag.Value).ToArray() Checksums = Checksum.GetChecksums(tag.Value).ToArray()
}; };
break; break;
@@ -693,7 +727,7 @@ namespace DiscImageChef.Core.Devices.Dumping
sidecar.OpticalDisc[0].DCB = new DumpType sidecar.OpticalDisc[0].DCB = new DumpType
{ {
Image = outputPath, Image = outputPath,
Size = (ulong)tag.Value.Length, Size = (ulong) tag.Value.Length,
Checksums = Checksum.GetChecksums(tag.Value).ToArray() Checksums = Checksum.GetChecksums(tag.Value).ToArray()
}; };
break; break;
@@ -701,12 +735,12 @@ namespace DiscImageChef.Core.Devices.Dumping
sidecar.OpticalDisc[0].DI = new DumpType sidecar.OpticalDisc[0].DI = new DumpType
{ {
Image = outputPath, Image = outputPath,
Size = (ulong)tag.Value.Length, Size = (ulong) tag.Value.Length,
Checksums = Checksum.GetChecksums(tag.Value).ToArray() Checksums = Checksum.GetChecksums(tag.Value).ToArray()
}; };
break; break;
case MediaTagType.Xbox_SecuritySector: case MediaTagType.Xbox_SecuritySector:
if(sidecar.OpticalDisc[0].Xbox == null) sidecar.OpticalDisc[0].Xbox = new XboxType(); if (sidecar.OpticalDisc[0].Xbox == null) sidecar.OpticalDisc[0].Xbox = new XboxType();
sidecar.OpticalDisc[0].Xbox.SecuritySectors = new[] sidecar.OpticalDisc[0].Xbox.SecuritySectors = new[]
{ {
@@ -717,7 +751,7 @@ namespace DiscImageChef.Core.Devices.Dumping
SecuritySectors = new DumpType SecuritySectors = new DumpType
{ {
Image = outputPath, Image = outputPath,
Size = (ulong)tag.Value.Length, Size = (ulong) tag.Value.Length,
Checksums = Checksum.GetChecksums(tag.Value).ToArray() Checksums = Checksum.GetChecksums(tag.Value).ToArray()
} }
} }
@@ -725,22 +759,22 @@ namespace DiscImageChef.Core.Devices.Dumping
break; break;
case MediaTagType.Xbox_PFI: case MediaTagType.Xbox_PFI:
if(sidecar.OpticalDisc[0].Xbox == null) sidecar.OpticalDisc[0].Xbox = new XboxType(); if (sidecar.OpticalDisc[0].Xbox == null) sidecar.OpticalDisc[0].Xbox = new XboxType();
sidecar.OpticalDisc[0].Xbox.PFI = new DumpType sidecar.OpticalDisc[0].Xbox.PFI = new DumpType
{ {
Image = outputPath, Image = outputPath,
Size = (ulong)tag.Value.Length, Size = (ulong) tag.Value.Length,
Checksums = Checksum.GetChecksums(tag.Value).ToArray() Checksums = Checksum.GetChecksums(tag.Value).ToArray()
}; };
break; break;
case MediaTagType.Xbox_DMI: case MediaTagType.Xbox_DMI:
if(sidecar.OpticalDisc[0].Xbox == null) sidecar.OpticalDisc[0].Xbox = new XboxType(); if (sidecar.OpticalDisc[0].Xbox == null) sidecar.OpticalDisc[0].Xbox = new XboxType();
sidecar.OpticalDisc[0].Xbox.DMI = new DumpType sidecar.OpticalDisc[0].Xbox.DMI = new DumpType
{ {
Image = outputPath, Image = outputPath,
Size = (ulong)tag.Value.Length, Size = (ulong) tag.Value.Length,
Checksums = Checksum.GetChecksums(tag.Value).ToArray() Checksums = Checksum.GetChecksums(tag.Value).ToArray()
}; };
break; break;
@@ -748,7 +782,7 @@ namespace DiscImageChef.Core.Devices.Dumping
sidecar.OpticalDisc[0].TOC = new DumpType sidecar.OpticalDisc[0].TOC = new DumpType
{ {
Image = outputPath, Image = outputPath,
Size = (ulong)tag.Value.Length, Size = (ulong) tag.Value.Length,
Checksums = Checksum.GetChecksums(tag.Value).ToArray() Checksums = Checksum.GetChecksums(tag.Value).ToArray()
}; };
break; break;
@@ -756,7 +790,7 @@ namespace DiscImageChef.Core.Devices.Dumping
sidecar.OpticalDisc[0].ATIP = new DumpType sidecar.OpticalDisc[0].ATIP = new DumpType
{ {
Image = outputPath, Image = outputPath,
Size = (ulong)tag.Value.Length, Size = (ulong) tag.Value.Length,
Checksums = Checksum.GetChecksums(tag.Value).ToArray() Checksums = Checksum.GetChecksums(tag.Value).ToArray()
}; };
break; break;
@@ -764,7 +798,7 @@ namespace DiscImageChef.Core.Devices.Dumping
sidecar.OpticalDisc[0].PMA = new DumpType sidecar.OpticalDisc[0].PMA = new DumpType
{ {
Image = outputPath, Image = outputPath,
Size = (ulong)tag.Value.Length, Size = (ulong) tag.Value.Length,
Checksums = Checksum.GetChecksums(tag.Value).ToArray() Checksums = Checksum.GetChecksums(tag.Value).ToArray()
}; };
break; break;
@@ -772,7 +806,7 @@ namespace DiscImageChef.Core.Devices.Dumping
sidecar.OpticalDisc[0].LeadInCdText = new DumpType sidecar.OpticalDisc[0].LeadInCdText = new DumpType
{ {
Image = outputPath, Image = outputPath,
Size = (ulong)tag.Value.Length, Size = (ulong) tag.Value.Length,
Checksums = Checksum.GetChecksums(tag.Value).ToArray() Checksums = Checksum.GetChecksums(tag.Value).ToArray()
}; };
break; break;
@@ -782,7 +816,7 @@ namespace DiscImageChef.Core.Devices.Dumping
new BorderType new BorderType
{ {
Image = outputPath, Image = outputPath,
Size = (ulong)tag.Value.Length, Size = (ulong) tag.Value.Length,
Checksums = Checksum.GetChecksums(tag.Value).ToArray() Checksums = Checksum.GetChecksums(tag.Value).ToArray()
} }
}; };
@@ -793,7 +827,7 @@ namespace DiscImageChef.Core.Devices.Dumping
new BorderType new BorderType
{ {
Image = outputPath, Image = outputPath,
Size = (ulong)tag.Value.Length, Size = (ulong) tag.Value.Length,
Checksums = Checksum.GetChecksums(tag.Value).ToArray() Checksums = Checksum.GetChecksums(tag.Value).ToArray()
} }
}; };

670
DiscImageChef.Core/Media/Info/ScsiInfo.cs
View File

File diff suppressed because it is too large Load Diff

39
DiscImageChef.DiscImages/ZZZRawImage/Helpers.cs
View File

@@ -36,22 +36,23 @@ namespace DiscImageChef.DiscImages
{ {
public partial class ZZZRawImage public partial class ZZZRawImage
{ {
MediaType CalculateDiskType() private MediaType CalculateDiskType()
{ {
if(imageInfo.SectorSize == 2048) if (imageInfo.SectorSize == 2048)
{ {
if(imageInfo.Sectors == 17090880) return MediaType.REV35; if (imageInfo.Sectors == 58620544) return MediaType.REV120;
if(imageInfo.Sectors <= 360000) return MediaType.CD; if (imageInfo.Sectors == 17090880) return MediaType.REV35;
if(imageInfo.Sectors <= 2295104) return MediaType.DVDPR; if (imageInfo.Sectors <= 360000) return MediaType.CD;
if(imageInfo.Sectors <= 2298496) return MediaType.DVDR; if (imageInfo.Sectors <= 2295104) return MediaType.DVDPR;
if(imageInfo.Sectors <= 4171712) return MediaType.DVDRDL; if (imageInfo.Sectors <= 2298496) return MediaType.DVDR;
if(imageInfo.Sectors <= 4173824) return MediaType.DVDPRDL; if (imageInfo.Sectors <= 4171712) return MediaType.DVDRDL;
if(imageInfo.Sectors <= 24438784) return MediaType.BDR; if (imageInfo.Sectors <= 4173824) return MediaType.DVDPRDL;
if (imageInfo.Sectors <= 24438784) return MediaType.BDR;
return imageInfo.Sectors <= 62500864 ? MediaType.BDRXL : MediaType.Unknown; return imageInfo.Sectors <= 62500864 ? MediaType.BDRXL : MediaType.Unknown;
} }
switch(imageInfo.ImageSize) switch (imageInfo.ImageSize)
{ {
case 80384: return MediaType.ECMA_66; case 80384: return MediaType.ECMA_66;
case 81664: return MediaType.IBM23FD; case 81664: return MediaType.IBM23FD;
@@ -61,7 +62,7 @@ namespace DiscImageChef.DiscImages
case 133120: return MediaType.ATARI_525_ED; case 133120: return MediaType.ATARI_525_ED;
case 143360: return MediaType.Apple33SS; case 143360: return MediaType.Apple33SS;
case 163840: case 163840:
if(imageInfo.SectorSize == 256) return MediaType.ACORN_525_SS_DD_40; if (imageInfo.SectorSize == 256) return MediaType.ACORN_525_SS_DD_40;
return MediaType.DOS_525_SS_DD_8; return MediaType.DOS_525_SS_DD_8;
case 184320: return MediaType.DOS_525_SS_DD_9; case 184320: return MediaType.DOS_525_SS_DD_9;
@@ -75,15 +76,15 @@ namespace DiscImageChef.DiscImages
case 322560: return MediaType.Apricot_35; case 322560: return MediaType.Apricot_35;
case 325632: return MediaType.ECMA_70; case 325632: return MediaType.ECMA_70;
case 327680: case 327680:
if(imageInfo.SectorSize == 256) return MediaType.ACORN_525_SS_DD_80; if (imageInfo.SectorSize == 256) return MediaType.ACORN_525_SS_DD_80;
return MediaType.DOS_525_DS_DD_8; return MediaType.DOS_525_DS_DD_8;
case 368640: case 368640:
if(extension == ".st") return MediaType.DOS_35_SS_DD_9; if (extension == ".st") return MediaType.DOS_35_SS_DD_9;
return MediaType.DOS_525_DS_DD_9; return MediaType.DOS_525_DS_DD_9;
case 409600: case 409600:
if(extension == ".st") return MediaType.ATARI_35_SS_DD; if (extension == ".st") return MediaType.ATARI_35_SS_DD;
return MediaType.AppleSonySS; return MediaType.AppleSonySS;
case 450560: return MediaType.ATARI_35_SS_DD_11; case 450560: return MediaType.ATARI_35_SS_DD_11;
@@ -93,15 +94,15 @@ namespace DiscImageChef.DiscImages
case 655360: return MediaType.ACORN_525_DS_DD; case 655360: return MediaType.ACORN_525_DS_DD;
case 737280: return MediaType.DOS_35_DS_DD_9; case 737280: return MediaType.DOS_35_DS_DD_9;
case 819200: case 819200:
if(imageInfo.SectorSize == 256) return MediaType.CBM_35_DD; if (imageInfo.SectorSize == 256) return MediaType.CBM_35_DD;
if((extension == ".adf" || extension == ".adl") && imageInfo.SectorSize == 1024) if ((extension == ".adf" || extension == ".adl") && imageInfo.SectorSize == 1024)
return MediaType.ACORN_35_DS_DD; return MediaType.ACORN_35_DS_DD;
if(extension == ".st") return MediaType.ATARI_35_DS_DD; if (extension == ".st") return MediaType.ATARI_35_DS_DD;
return MediaType.AppleSonyDS; return MediaType.AppleSonyDS;
case 839680: return MediaType.FDFORMAT_35_DD; case 839680: return MediaType.FDFORMAT_35_DD;
case 901120: case 901120:
if(extension == ".st") return MediaType.ATARI_35_DS_DD_11; if (extension == ".st") return MediaType.ATARI_35_DS_DD_11;
return MediaType.CBM_AMIGA_35_DD; return MediaType.CBM_AMIGA_35_DD;
case 988416: return MediaType.IBM43FD_256; case 988416: return MediaType.IBM43FD_256;
@@ -143,12 +144,14 @@ namespace DiscImageChef.DiscImages
case 1070617600: return MediaType.Jaz; case 1070617600: return MediaType.Jaz;
#region Commodore #region Commodore
case 174848: case 174848:
case 175531: return MediaType.CBM_1540; case 175531: return MediaType.CBM_1540;
case 196608: case 196608:
case 197376: return MediaType.CBM_1540_Ext; case 197376: return MediaType.CBM_1540_Ext;
case 349696: case 349696:
case 351062: return MediaType.CBM_1571; case 351062: return MediaType.CBM_1571;
#endregion Commodore #endregion Commodore
default: return MediaType.GENERIC_HDD; default: return MediaType.GENERIC_HDD;

442
DiscImageChef/Commands/DeviceReport.cs
View File

File diff suppressed because it is too large Load Diff