From 93d0671e4977bad395e91b06657f71ac53ee13a0 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Mon, 6 Jan 2020 01:12:00 +0000
Subject: [PATCH] Calculate pregap when drive only supports reading Q
 subchannel.

---
 .../.idea/contentModel.xml                    |  2 -
 .../Devices/Dumping/CompactDisc/Pregap.cs     | 52 +++++++++++++++++--
 2 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/.idea/.idea.DiscImageChef/.idea/contentModel.xml b/.idea/.idea.DiscImageChef/.idea/contentModel.xml
index 40b8bb4ce..76606dd10 100644
--- a/.idea/.idea.DiscImageChef/.idea/contentModel.xml
+++ b/.idea/.idea.DiscImageChef/.idea/contentModel.xml
@@ -3,10 +3,8 @@
   <component name="ContentModelStore">
     <e p="$APPLICATION_CONFIG_DIR$/consoles/db" t="IncludeRecursive" />
     <e p="$APPLICATION_PLUGINS_DIR$/puppet/lib/stubs" t="IncludeRecursive" />
-    <e p="$APPLICATION_CONFIG_DIR$/scratches" t="IncludeRecursive" />
     <e p="$USER_HOME$/.Rider2019.3/system/extResources" t="IncludeRecursive" />
     <e p="$USER_HOME$/.Rider2019.3/system/resharper-host/local/Transient/ReSharperHost/v193/SolutionCaches/_DiscImageChef.-1491758497.00" t="ExcludeRecursive" />
-    <e p="$USER_HOME$/.config/git/ignore" t="IncludeRecursive" />
     <e p="$USER_HOME$/.nuget/packages/sqlitepclraw.lib.e_sqlite3.linux/1.1.12/runtimes/linux-x64/native/libe_sqlite3.so" t="Include" />
     <e p="$PROJECT_DIR$" t="IncludeFlat">
       <e p=".git/info/exclude" t="IncludeRecursive" />
diff --git a/DiscImageChef.Core/Devices/Dumping/CompactDisc/Pregap.cs b/DiscImageChef.Core/Devices/Dumping/CompactDisc/Pregap.cs
index 2ccf4cfec..26adcd743 100644
--- a/DiscImageChef.Core/Devices/Dumping/CompactDisc/Pregap.cs
+++ b/DiscImageChef.Core/Devices/Dumping/CompactDisc/Pregap.cs
@@ -141,7 +141,8 @@ namespace DiscImageChef.Core.Devices.Dumping
             // Check if subchannel is BCD
             for(retries = 0; retries < 10; retries++)
             {
-                sense = GetSectorForPregap(dev, 11, dbDev, out subBuf);
+                sense = supportsRwSubchannel ? GetSectorForPregapRaw(dev, 11, dbDev, out subBuf)
+                            : GetSectorForPregapQ16(dev, 11, dbDev, out subBuf);
 
                 if(sense)
                     continue;
@@ -180,7 +181,8 @@ namespace DiscImageChef.Core.Devices.Dumping
                 // Check if pregap is 0
                 for(retries = 0; retries < 10; retries++)
                 {
-                    sense = GetSectorForPregap(dev, (uint)lba, dbDev, out subBuf);
+                    sense = supportsRwSubchannel ? GetSectorForPregapRaw(dev, (uint)lba, dbDev, out subBuf)
+                                : GetSectorForPregapQ16(dev, (uint)lba, dbDev, out subBuf);
 
                     if(sense)
                         continue;
@@ -221,11 +223,13 @@ namespace DiscImageChef.Core.Devices.Dumping
                 while(lba > (int)previousTrack.TrackStartSector)
                 {
                     // Some drives crash if you try to read just before the previous read, so seek away first
-                    GetSectorForPregap(dev, (uint)lba - 10, dbDev, out subBuf);
+                    sense = supportsRwSubchannel ? GetSectorForPregapRaw(dev, (uint)lba - 10, dbDev, out subBuf)
+                                : GetSectorForPregapQ16(dev, (uint)lba                  - 10, dbDev, out subBuf);
 
                     for(retries = 0; retries < 10; retries++)
                     {
-                        sense = GetSectorForPregap(dev, (uint)lba, dbDev, out subBuf);
+                        sense = supportsRwSubchannel ? GetSectorForPregapRaw(dev, (uint)lba, dbDev, out subBuf)
+                                    : GetSectorForPregapQ16(dev, (uint)lba, dbDev, out subBuf);
 
                         if(sense)
                             continue;
@@ -315,7 +319,7 @@ namespace DiscImageChef.Core.Devices.Dumping
             }
         }
 
-        static bool GetSectorForPregap(Device dev, uint lba, Database.Models.Device dbDev, out byte[] subBuf)
+        static bool GetSectorForPregapRaw(Device dev, uint lba, Database.Models.Device dbDev, out byte[] subBuf)
         {
             byte[] cmdBuf;
             bool   sense;
@@ -370,6 +374,44 @@ namespace DiscImageChef.Core.Devices.Dumping
             return sense;
         }
 
+        static bool GetSectorForPregapQ16(Device dev, uint lba, Database.Models.Device dbDev, out byte[] subBuf)
+        {
+            byte[] cmdBuf;
+            bool   sense;
+            subBuf = null;
+
+            sense = dev.ReadCd(out cmdBuf, out _, lba, 2368, 1, MmcSectorTypes.AllTypes, false, false, true,
+                               MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.Q16,
+                               dev.Timeout, out _);
+
+            if(sense)
+                sense = dev.ReadCd(out cmdBuf, out _, lba, 2368, 1, MmcSectorTypes.Cdda, false, false, false,
+                                   MmcHeaderCodes.None, true, false, MmcErrorField.None, MmcSubchannel.Q16, dev.Timeout,
+                                   out _);
+
+            if(!sense)
+            {
+                subBuf = new byte[16];
+                Array.Copy(cmdBuf, 2352, subBuf, 0, 16);
+            }
+            else
+            {
+                sense = dev.ReadCd(out cmdBuf, out _, lba, 16, 1, MmcSectorTypes.AllTypes, false, false, false,
+                                   MmcHeaderCodes.None, false, false, MmcErrorField.None, MmcSubchannel.Q16,
+                                   dev.Timeout, out _);
+
+                if(sense)
+                    sense = dev.ReadCd(out cmdBuf, out _, lba, 16, 1, MmcSectorTypes.Cdda, false, false, false,
+                                       MmcHeaderCodes.None, false, false, MmcErrorField.None, MmcSubchannel.Q16,
+                                       dev.Timeout, out _);
+
+                if(!sense)
+                    subBuf = cmdBuf;
+            }
+
+            return sense;
+        }
+
         static byte[] DeinterleaveQ(byte[] subchannel)
         {
             int[] q = new int[subchannel.Length / 8];