From c1a694a7ed0a59995a660fa956bbb41627cff436 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Tue, 28 Dec 2021 03:30:34 +0000
Subject: [PATCH] Add support for dumping Genesis / Mega Drive cartridges using
 a Retrode.

---
 .../.idea/runConfigurations/Aaru.xml          |  2 +-
 .../Devices/Dumping/LinearMemory/Retrode.cs   | 44 ++++++++++++-------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/.idea/.idea.Aaru/.idea/runConfigurations/Aaru.xml b/.idea/.idea.Aaru/.idea/runConfigurations/Aaru.xml
index 40360c4cb..e3733c56b 100644
--- a/.idea/.idea.Aaru/.idea/runConfigurations/Aaru.xml
+++ b/.idea/.idea.Aaru/.idea/runConfigurations/Aaru.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Aaru" type="DotNetProject" factoryName=".NET Project">
     <option name="EXE_PATH" value="$PROJECT_DIR$/Aaru/bin/Debug/net6/aaru" />
-    <option name="PROGRAM_PARAMETERS" value="m dump /dev/sda foo.sfc" />
+    <option name="PROGRAM_PARAMETERS" value="m dump /dev/sdb foo2.md" />
     <option name="WORKING_DIRECTORY" value="$USER_HOME$/Desktop" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
diff --git a/Aaru.Core/Devices/Dumping/LinearMemory/Retrode.cs b/Aaru.Core/Devices/Dumping/LinearMemory/Retrode.cs
index 7cf65d032..fa4f19ae1 100644
--- a/Aaru.Core/Devices/Dumping/LinearMemory/Retrode.cs
+++ b/Aaru.Core/Devices/Dumping/LinearMemory/Retrode.cs
@@ -46,7 +46,12 @@ public partial class Dump
         0x53, 0x46, 0x43
     };
 
-    /// <summary>Dumps a CFW PlayStation Portable UMD</summary>
+    static readonly byte[] _genesisExtension =
+    {
+        0x42, 0x49, 0x4E
+    };
+
+    /// <summary>Dumps a game cartridge using a Retrode adapter</summary>
     void Retrode()
     {
         bool sense = _dev.Read10(out byte[] buffer, out _, 0, false, true, false, false, 0, 512, 0, 1, _dev.Timeout,
@@ -92,23 +97,32 @@ public partial class Dump
             return;
         }
 
-        int    romPos;
-        bool   sfcFound = false;
+        int  romPos;
+        bool sfcFound     = false;
+        bool genesisFound = false;
         tmp = new byte[3];
 
         for(romPos = 0; romPos < buffer.Length; romPos += 0x20)
         {
             Array.Copy(buffer, romPos + 8, tmp, 0, 3);
 
-            if(!tmp.SequenceEqual(_sfcExtension))
-                continue;
+            if(tmp.SequenceEqual(_sfcExtension))
+            {
+                sfcFound = true;
 
-            sfcFound = true;
+                break;
+            }
 
-            break;
+            if(tmp.SequenceEqual(_genesisExtension))
+            {
+                genesisFound = true;
+
+                break;
+            }
         }
 
-        if(!sfcFound)
+        if(!sfcFound &&
+           !genesisFound)
         {
             StoppingErrorMessage?.Invoke("No cartridge found, not dumping...");
             _dumpLog.WriteLine("No cartridge found, not dumping...");
@@ -119,13 +133,13 @@ public partial class Dump
         ushort cluster = BitConverter.ToUInt16(buffer, romPos + 0x1A);
         uint   romSize = BitConverter.ToUInt32(buffer, romPos + 0x1C);
 
-        const MediaType mediaType     = MediaType.SNESGamePak;
-        uint            blocksToRead  = 64;
-        double          totalDuration = 0;
-        double          currentSpeed  = 0;
-        double          maxSpeed      = double.MinValue;
-        double          minSpeed      = double.MaxValue;
-        byte[]          senseBuf;
+        MediaType mediaType     = genesisFound ? MediaType.MegaDriveCartridge : MediaType.SNESGamePak;
+        uint      blocksToRead  = 64;
+        double    totalDuration = 0;
+        double    currentSpeed  = 0;
+        double    maxSpeed      = double.MinValue;
+        double    minSpeed      = double.MaxValue;
+        byte[]    senseBuf;
 
         if(_outputPlugin is not IByteAddressableImage outputBai ||
            !outputBai.SupportedMediaTypes.Contains(mediaType))