1 files changed, 59 insertions, 20 deletions

diff --git a/src/DSi_SD.h b/src/DSi_SD.h
index 17ba8d3..05f8c9d 100644
--- a/src/DSi_SD.h
+++ b/src/DSi_SD.h
@@ -20,28 +20,30 @@
 #define DSI_SD_H
 
 #include <cstring>
+#include <variant>
 #include "FIFO.h"
 #include "FATStorage.h"
+#include "DSi_NAND.h"
 #include "Savestate.h"
 
 namespace melonDS
 {
-namespace DSi_NAND
-{
-    class NANDImage;
-}
-
 class DSi_SDDevice;
 class DSi;
 
+using Nothing = std::monostate;
+using DSiStorage = std::variant<std::monostate, FATStorage, DSi_NAND::NANDImage>;
 
 class DSi_SDHost
 {
 public:
-    DSi_SDHost(melonDS::DSi& dsi, u32 num);
+    /// Creates an SDMMC host.
+    DSi_SDHost(melonDS::DSi& dsi, DSi_NAND::NANDImage&& nand, std::optional<FATStorage>&& sdcard = std::nullopt) noexcept;
+
+    /// Creates an SDIO host
+    explicit DSi_SDHost(melonDS::DSi& dsi) noexcept;
     ~DSi_SDHost();
 
-    void CloseHandles();
     void Reset();
 
     void DoSavestate(Savestate* file);
@@ -59,6 +61,15 @@ public:
 
     void SetCardIRQ();
 
+    [[nodiscard]] FATStorage* GetSDCard() noexcept;
+    [[nodiscard]] const FATStorage* GetSDCard() const noexcept;
+    [[nodiscard]] DSi_NAND::NANDImage* GetNAND() noexcept;
+    [[nodiscard]] const DSi_NAND::NANDImage* GetNAND() const noexcept;
+
+    void SetSDCard(FATStorage&& sdcard) noexcept;
+    void SetSDCard(std::optional<FATStorage>&& sdcard) noexcept;
+    void SetNAND(DSi_NAND::NANDImage&& nand) noexcept;
+
     u16 Read(u32 addr);
     void Write(u32 addr, u16 val);
     u16 ReadFIFO16();
@@ -96,7 +107,7 @@ private:
     u32 Param;
     u16 ResponseBuffer[8];
 
-    DSi_SDDevice* Ports[2];
+    std::array<std::unique_ptr<DSi_SDDevice>, 2> Ports {};
 
     u32 CurFIFO; // FIFO accessible for read/write
     FIFO<u16, 0x100> DataFIFO[2];
@@ -134,25 +145,53 @@ protected:
 class DSi_MMCStorage : public DSi_SDDevice
 {
 public:
-    DSi_MMCStorage(DSi_SDHost* host, DSi_NAND::NANDImage& nand);
-    DSi_MMCStorage(DSi_SDHost* host, bool internal, const std::string& filename, u64 size, bool readonly, const std::string& sourcedir);
-    ~DSi_MMCStorage();
-
-    void Reset();
-
-    void DoSavestate(Savestate* file);
+    DSi_MMCStorage(melonDS::DSi& dsi, DSi_SDHost* host, DSi_NAND::NANDImage&& nand) noexcept;
+    DSi_MMCStorage(melonDS::DSi& dsi, DSi_SDHost* host, FATStorage&& sdcard) noexcept;
+    ~DSi_MMCStorage() override;
+
+    [[nodiscard]] FATStorage* GetSDCard() noexcept { return std::get_if<FATStorage>(&Storage); }
+    [[nodiscard]] const FATStorage* GetSDCard() const noexcept { return std::get_if<FATStorage>(&Storage); }
+    [[nodiscard]] DSi_NAND::NANDImage* GetNAND() noexcept { return std::get_if<DSi_NAND::NANDImage>(&Storage); }
+    [[nodiscard]] const DSi_NAND::NANDImage* GetNAND() const noexcept { return std::get_if<DSi_NAND::NANDImage>(&Storage); }
+
+    void SetNAND(DSi_NAND::NANDImage&& nand) noexcept { Storage = std::move(nand); }
+    void SetSDCard(FATStorage&& sdcard) noexcept { Storage = std::move(sdcard); }
+    void SetSDCard(std::optional<FATStorage>&& sdcard) noexcept
+    {
+        if (sdcard)
+        { // If we're setting a new SD card...
+            Storage = std::move(*sdcard);
+            sdcard = std::nullopt;
+        }
+        else
+        {
+            Storage = Nothing();
+        }
+    }
+
+    void SetStorage(DSiStorage&& storage) noexcept
+    {
+        Storage = std::move(storage);
+        storage = Nothing();
+        // not sure if a moved-from variant is empty or contains a moved-from object;
+        // better to be safe than sorry
+    }
+
+    void Reset() override;
+
+    void DoSavestate(Savestate* file) override;
 
     void SetCID(const u8* cid) { memcpy(CID, cid, sizeof(CID)); }
 
-    void SendCMD(u8 cmd, u32 param);
+    void SendCMD(u8 cmd, u32 param) override;
     void SendACMD(u8 cmd, u32 param);
 
-    void ContinueTransfer();
+    void ContinueTransfer() override;
 
 private:
-    bool Internal;
-    DSi_NAND::NANDImage* NAND;
-    FATStorage* SD;
+    static constexpr u8 DSiSDCardCID[16] = {0xBD, 0x12, 0x34, 0x56, 0x78, 0x03, 0x4D, 0x30, 0x30, 0x46, 0x50, 0x41, 0x00, 0x00, 0x15, 0x00};
+    melonDS::DSi& DSi;
+    DSiStorage Storage;
 
     u8 CID[16];
     u8 CSD[16];