* DiscImageChef.Decoders/CD/ATIP.cs:

Make ATIP manufacturer resolver a public method. * DiscImageChef.Decoders/SCSI/MMC/Features.cs: Added HDBurn profiles. * DiscImageChef.Decoders/SCSI/Modes.cs: Corrected typo. * DiscImageChef.DiscImages/BLU.cs: * DiscImageChef.DiscImages/GDI.cs: * DiscImageChef.DiscImages/VHD.cs: * DiscImageChef.DiscImages/Nero.cs: * DiscImageChef/Commands/Compare.cs: * DiscImageChef.DiscImages/CopyQM.cs: * DiscImageChef.DiscImages/CDRWin.cs: * DiscImageChef.DiscImages/CDRDAO.cs: * DiscImageChef.DiscImages/Apple2MG.cs: * DiscImageChef.DiscImages/TeleDisk.cs: * DiscImageChef.DiscImages/ImageInfo.cs: * DiscImageChef.DiscImages/Alcohol120.cs: * DiscImageChef.DiscImages/DiskCopy42.cs: * DiscImageChef.DiscImages/ZZZRawImage.cs: Added field for drive firmware revision. * DiscImageChef.DiscImages/BlindWrite4.cs: Added field for drive firmware revision. Change subchannel informative exception. Change application name and version. * DiscImageChef.DiscImages/ImagePlugin.cs: Added subchannel types for Q only. * DiscImageChef/Commands/CreateSidecar.cs: If drive image contains information about the dumping drive, use it. Added subchannel types for Q only.
2025-12-16 19:24:25 +00:00 · 2016-08-18 00:05:24 +01:00
parent c4c92a8240
commit b3924779ba
24 changed files with 452 additions and 285 deletions
--- a/DiscImageChef.DiscImages/Alcohol120.cs
+++ b/DiscImageChef.DiscImages/Alcohol120.cs
@@ -199,6 +199,7 @@ namespace DiscImageChef.ImagePlugins
            ImageInfo.driveManufacturer = null;
            ImageInfo.driveModel = null;
            ImageInfo.driveSerialNumber = null;
+            ImageInfo.driveFirmwareRevision = null;
        }

        public override bool IdentifyImage(string imagePath)
--- a/DiscImageChef.DiscImages/Apple2MG.cs
+++ b/DiscImageChef.DiscImages/Apple2MG.cs
@@ -194,6 +194,7 @@ namespace DiscImageChef.ImagePlugins
            ImageInfo.driveManufacturer = null;
            ImageInfo.driveModel = null;
            ImageInfo.driveSerialNumber = null;
+            ImageInfo.driveFirmwareRevision = null;
        }

        public override bool IdentifyImage(string imagePath)
--- a/DiscImageChef.DiscImages/BLU.cs
+++ b/DiscImageChef.DiscImages/BLU.cs
@@ -90,6 +90,7 @@ namespace DiscImageChef.ImagePlugins
            ImageInfo.driveManufacturer = null;
            ImageInfo.driveModel = null;
            ImageInfo.driveSerialNumber = null;
+            ImageInfo.driveFirmwareRevision = null;
        }

        public override bool IdentifyImage(string imagePath)
--- a/DiscImageChef.DiscImages/BlindWrite4.cs
+++ b/DiscImageChef.DiscImages/BlindWrite4.cs
@@ -202,6 +202,7 @@ namespace DiscImageChef.ImagePlugins
            ImageInfo.driveManufacturer = null;
            ImageInfo.driveModel = null;
            ImageInfo.driveSerialNumber = null;
+            ImageInfo.driveFirmwareRevision = null;
        }

        public override bool IdentifyImage(string imagePath)
@@ -785,7 +786,9 @@ namespace DiscImageChef.ImagePlugins

            ImageInfo.mediaType = MediaType.CD;

-            ImageInfo.imageApplication = "BlindRead 4";
+            ImageInfo.imageApplication = "BlindWrite";
+            ImageInfo.imageApplicationVersion = "4";
+            ImageInfo.imageVersion = "4";

            FileInfo fi = new FileInfo(dataFile);
            ImageInfo.imageSize = (ulong)fi.Length;
@@ -1116,7 +1119,7 @@ namespace DiscImageChef.ImagePlugins
                                break;
                            }
                        case SectorTagType.CDSectorSubchannel:
-                            throw new NotImplementedException("Subchannel interleaving not yet implemented");
+                            throw new NotImplementedException("Packed subchannel not yet supported");
                        default:
                            throw new ArgumentException("Unsupported tag requested", nameof(tag));
                    }
@@ -1146,7 +1149,7 @@ namespace DiscImageChef.ImagePlugins
                                    break;
                                }
                            case SectorTagType.CDSectorSubchannel:
-                                throw new NotImplementedException("Subchannel interleaving not yet implemented");
+                                throw new NotImplementedException("Packed subchannel not yet supported");
                            default:
                                throw new ArgumentException("Unsupported tag requested", nameof(tag));
                        }
@@ -1157,7 +1160,7 @@ namespace DiscImageChef.ImagePlugins
                        switch(tag)
                        {
                            case SectorTagType.CDSectorSubchannel:
-                                throw new NotImplementedException("Subchannel interleaving not yet implemented");
+                                throw new NotImplementedException("Packed subchannel not yet supported");
                            default:
                                throw new ArgumentException("Unsupported tag requested", nameof(tag));
                        }
--- a/DiscImageChef.DiscImages/BlindWrite5.cs
+++ b/DiscImageChef.DiscImages/BlindWrite5.cs
@@ -0,0 +1,42 @@
+// /***************************************************************************
+// The Disc Image Chef
+// ----------------------------------------------------------------------------
+//
+// Filename       : BlindWrite5.cs
+// Author(s)      : Natalia Portillo <claunia@claunia.com>
+//
+// Component      : Component
+//
+// --[ Description ] ----------------------------------------------------------
+//
+//     Description
+//
+// --[ License ] --------------------------------------------------------------
+//
+//     This library is free software; you can redistribute it and/or modify
+//     it under the terms of the GNU Lesser General Public License as
+//     published by the Free Software Foundation; either version 2.1 of the
+//     License, or (at your option) any later version.
+//
+//     This library is distributed in the hope that it will be useful, but
+//     WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+//     Lesser General Public License for more details.
+//
+//     You should have received a copy of the GNU Lesser General Public
+//     License along with this library; if not, see <http://www.gnu.org/licenses/>.
+//
+// ----------------------------------------------------------------------------
+// Copyright © 2011-2016 Natalia Portillo
+// ****************************************************************************/
+using System;
+namespace DiscImageChef.DiscImages
+{
+    public class BlindWrite5
+    {
+        public BlindWrite5()
+        {
+        }
+    }
+}
+
--- a/DiscImageChef.DiscImages/CDRDAO.cs
+++ b/DiscImageChef.DiscImages/CDRDAO.cs
@@ -232,6 +232,7 @@ namespace DiscImageChef.ImagePlugins
            ImageInfo.driveManufacturer = null;
            ImageInfo.driveModel = null;
            ImageInfo.driveSerialNumber = null;
+            ImageInfo.driveFirmwareRevision = null;
        }

        #endregion Public methods
--- a/DiscImageChef.DiscImages/CDRWin.cs
+++ b/DiscImageChef.DiscImages/CDRWin.cs
@@ -305,6 +305,7 @@ namespace DiscImageChef.ImagePlugins
            ImageInfo.driveManufacturer = null;
            ImageInfo.driveModel = null;
            ImageInfo.driveSerialNumber = null;
+            ImageInfo.driveFirmwareRevision = null;
        }

        // Due to .cue format, this method must parse whole file, ignoring errors (those will be thrown by OpenImage()).
--- a/DiscImageChef.DiscImages/ChangeLog
+++ b/DiscImageChef.DiscImages/ChangeLog
@@ -1,3 +1,25 @@
+2016-08-18  Natalia Portillo  <claunia@claunia.com>
+
+	* BLU.cs:
+	* GDI.cs:
+	* VHD.cs:
+	* Nero.cs:
+	* CopyQM.cs:
+	* CDRDAO.cs:
+	* CDRWin.cs:
+	* TeleDisk.cs:
+	* Apple2MG.cs:
+	* ImageInfo.cs:
+	* Alcohol120.cs:
+	* DiskCopy42.cs:
+	* ZZZRawImage.cs: Added field for drive firmware revision.
+
+	* BlindWrite4.cs: Added field for drive firmware revision.
+	Change subchannel informative exception.
+	Change application name and version.
+
+	* ImagePlugin.cs: Added subchannel types for Q only.
+
 2016-08-17  Natalia Portillo  <claunia@claunia.com>

 	* BlindWrite4.cs:
--- a/DiscImageChef.DiscImages/CopyQM.cs
+++ b/DiscImageChef.DiscImages/CopyQM.cs
@@ -186,6 +186,7 @@ namespace DiscImageChef.ImagePlugins
            ImageInfo.driveManufacturer = null;
            ImageInfo.driveModel = null;
            ImageInfo.driveSerialNumber = null;
+            ImageInfo.driveFirmwareRevision = null;
        }

        #region Public methods
--- a/DiscImageChef.DiscImages/DiskCopy42.cs
+++ b/DiscImageChef.DiscImages/DiskCopy42.cs
@@ -154,6 +154,7 @@ namespace DiscImageChef.ImagePlugins
            ImageInfo.driveManufacturer = null;
            ImageInfo.driveModel = null;
            ImageInfo.driveSerialNumber = null;
+            ImageInfo.driveFirmwareRevision = null;
        }

        public override bool IdentifyImage(string imagePath)
--- a/DiscImageChef.DiscImages/GDI.cs
+++ b/DiscImageChef.DiscImages/GDI.cs
@@ -124,6 +124,7 @@ namespace DiscImageChef.ImagePlugins
            ImageInfo.driveManufacturer = null;
            ImageInfo.driveModel = null;
            ImageInfo.driveSerialNumber = null;
+            ImageInfo.driveFirmwareRevision = null;
        }

        // Due to .gdi format, this method must parse whole file, ignoring errors (those will be thrown by OpenImage()).
--- a/DiscImageChef.DiscImages/ImageInfo.cs
+++ b/DiscImageChef.DiscImages/ImageInfo.cs
@@ -64,6 +64,7 @@ namespace DiscImageChef.ImagePlugins
        public string driveManufacturer;
        public string driveModel;
        public string driveSerialNumber;
+        public string driveFirmwareRevision;
        public XmlMediaType xmlMediaType;
    }
 }
--- a/DiscImageChef.DiscImages/ImagePlugin.cs
+++ b/DiscImageChef.DiscImages/ImagePlugin.cs
@@ -503,7 +503,15 @@ namespace DiscImageChef.ImagePlugins
        /// <summary>
        /// Subchannel is interleaved and comes interleaved with main channel in same file
        /// </summary>
-        RawInterleaved
+        RawInterleaved,
+        /// <summary>
+        /// Only Q subchannel is stored as 16 bytes
+        /// </summary>
+        Q16,
+        /// <summary>
+        /// Only Q subchannel is stored as 16 bytes and comes interleaved with main channel in same file
+        /// </summary>
+        Q16Interleaved
    }

    /// <summary>
@@ -653,6 +661,8 @@ namespace DiscImageChef.ImagePlugins
        MMC_POWResourcesInformation,
        /// <summary>SCSI INQUIRY response</summary>
        SCSI_INQUIRY,
+        /// <summary>SCSI MODE PAGE 2Ah</summary>
+        SCSI_MODEPAGE_2A,
        /// <summary>ATA IDENTIFY DEVICE response</summary>
        ATA_IDENTIFY,
        /// <summary>ATA IDENTIFY PACKET DEVICE response</summary>
--- a/DiscImageChef.DiscImages/Nero.cs
+++ b/DiscImageChef.DiscImages/Nero.cs
@@ -1488,6 +1488,7 @@ namespace DiscImageChef.ImagePlugins
                ImageInfo.driveManufacturer = null;
                ImageInfo.driveModel = null;
                ImageInfo.driveSerialNumber = null;
+                ImageInfo.driveFirmwareRevision = null;
                ImageInfo.mediaSequence = 0;
                ImageInfo.lastMediaSequence = 0;
                if(imageNewFormat)
--- a/DiscImageChef.DiscImages/TeleDisk.cs
+++ b/DiscImageChef.DiscImages/TeleDisk.cs
@@ -219,6 +219,7 @@ namespace DiscImageChef.ImagePlugins
            ImageInfo.driveManufacturer = null;
            ImageInfo.driveModel = null;
            ImageInfo.driveSerialNumber = null;
+            ImageInfo.driveFirmwareRevision = null;
            ADiskCRCHasFailed = false;
            SectorsWhereCRCHasFailed = new List<ulong>();
        }
--- a/DiscImageChef.DiscImages/VHD.cs
+++ b/DiscImageChef.DiscImages/VHD.cs
@@ -386,6 +386,7 @@ namespace DiscImageChef.ImagePlugins
            ImageInfo.driveManufacturer = null;
            ImageInfo.driveModel = null;
            ImageInfo.driveSerialNumber = null;
+            ImageInfo.driveFirmwareRevision = null;
        }

        #region public methods
--- a/DiscImageChef.DiscImages/ZZZRawImage.cs
+++ b/DiscImageChef.DiscImages/ZZZRawImage.cs
@@ -72,6 +72,7 @@ namespace DiscImageChef.ImagePlugins
            ImageInfo.driveManufacturer = null;
            ImageInfo.driveModel = null;
            ImageInfo.driveSerialNumber = null;
+            ImageInfo.driveFirmwareRevision = null;
        }

        public override bool IdentifyImage(string imagePath)