Added check to CardiTaskThreadPatch that the required slot is actually mapped to arm7. Fixes #60

arm9/source/patches/platform/LoaderPlatform.h

@@ -5,6 +5,7 @@
 #include "SdWritePatchCode.h"
 #include "../PatchHeap.h"
 #include "../PatchCodeCollection.h"
+#include "LoaderPlatformType.h"
 
 /// @brief Abstract class for platform (flashcard or other sd access method) specific parts of the loader.
 class LoaderPlatform
@@ -38,6 +39,10 @@ public:
     virtual const SdReadPatchCode* CreateRomReadPatchCode(
         PatchCodeCollection& patchCodeCollection, PatchHeap& patchHeap) const { return nullptr; }
 
+    /// @brief Returns the type of this loader platform.
+    /// @return The type of this loader platform.
+    virtual LoaderPlatformType GetPlatformType() const = 0;
+
     /// @brief Checks if the platform supports rom reads directly.
     /// @return True if the platform supports rom reads, or false otherwise.
     virtual bool HasRomReads() const { return false; }

arm9/source/patches/platform/LoaderPlatformType.h

@@ -0,0 +1,11 @@
+#pragma once
+
+/// @brief Enum representing the type of loader platform.
+enum class LoaderPlatformType
+{
+    /// @brief Slot 1 (DS) cartridge.
+    Slot1,
+
+    /// @brief Slot 2 (GBA) cartridge.
+    Slot2
+};

arm9/source/patches/platform/ace3ds/Ace3DSLoaderPlatform.h

@@ -34,5 +34,7 @@ public:
         });
     }
 
+    LoaderPlatformType GetPlatformType() const override { return LoaderPlatformType::Slot1; }
+
     bool HasDmaSdReads() const override { return true; }
 };

arm9/source/patches/platform/acekard-common/IoRPGLoaderPlatform.h

@@ -11,6 +11,8 @@ public:
     explicit IoRPGLoaderPlatform(u8 ioRpgCmdSdioByte)
         : _ioRpgCmdSdioByte(ioRpgCmdSdioByte) { }
 
+    LoaderPlatformType GetPlatformType() const override { return LoaderPlatformType::Slot1; }
+
     bool InitializeSdCard() override;
 
 protected:

arm9/source/patches/platform/dspico/DSPicoLoaderPlatform.h

@@ -43,5 +43,7 @@ public:
         });
     }
 
+    LoaderPlatformType GetPlatformType() const override { return LoaderPlatformType::Slot1; }
+
     bool HasDmaSdReads() const override { return true; }
 };

arm9/source/patches/platform/dstt/DSTTLoaderPlatform.h

@@ -34,5 +34,7 @@ public:
         });
     }
 
+    LoaderPlatformType GetPlatformType() const override { return LoaderPlatformType::Slot1; }
+
     bool InitializeSdCard() override;
 };

arm9/source/patches/platform/ezp/EZPLoaderPlatform.h

@@ -30,4 +30,6 @@ public:
             return new EZPWriteSectorsPatchCode(patchHeap);
         });
     }
+
+    LoaderPlatformType GetPlatformType() const override { return LoaderPlatformType::Slot1; }
 };

arm9/source/patches/platform/g003/G003LoaderPlatform.h

@@ -34,5 +34,7 @@ public:
         });
     }
 
+    LoaderPlatformType GetPlatformType() const override { return LoaderPlatformType::Slot1; }
+
     bool HasDmaSdReads() const override { return true; }
 };

arm9/source/patches/platform/isnitro/IsNitroLoaderPlatform.h

@@ -27,6 +27,8 @@ public:
         });
     }
 
+    LoaderPlatformType GetPlatformType() const override { return LoaderPlatformType::Slot2; }
+
 private:
     u32 GetAgbRamPtr() const
     {

arm9/source/patches/platform/m3ds/M3DSLoaderPlatform.h

@@ -33,4 +33,6 @@ public:
                 }));
         });
     }
+
+    LoaderPlatformType GetPlatformType() const override { return LoaderPlatformType::Slot1; }
 };

arm9/source/patches/platform/melonds/MelonDSLoaderPlatform.h

@@ -25,4 +25,6 @@ public:
             return new MelonDSWriteSdPatchCode(patchHeap);
         });
     }
+
+    LoaderPlatformType GetPlatformType() const override { return LoaderPlatformType::Slot1; }
 };

arm9/source/patches/platform/r4/R4LoaderPlatform.h

@@ -37,6 +37,8 @@ public:
         });
     }
 
+    LoaderPlatformType GetPlatformType() const override { return LoaderPlatformType::Slot1; }
+
     bool HasRomReads() const override { return true; }
 
     void PrepareRomBoot(u32 romDirSector, u32 romDirSectorOffset) const override;

arm9/source/patches/platform/supercard/SuperCardLoaderPlatform.h

@@ -99,6 +99,8 @@ public:
         }
     }
 
+    LoaderPlatformType GetPlatformType() const override { return LoaderPlatformType::Slot2; }
+
     bool InitializeSdCard() override;
 
 private: