actually remove NDS/GBA ROM args from NDSArgs, since we won't be usin…

…g them
melonDS-emu · Nov 17, 2024 · 99aa567 · 99aa567
1 parent 5e3d2d0
commit 99aa567
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 24 deletions.
diff --git a/src/Args.h b/src/Args.h
@@ -85,18 +85,6 @@ struct GDBArgs
 /// New fields here should have default values if possible.
 struct NDSArgs
 {
-    /// NDS ROM to install.
-    /// Defaults to nullptr, which means no cart.
-    /// Should be populated with the desired save data beforehand,
-    /// including an SD card if applicable.
-    std::unique_ptr<NDSCart::CartCommon> NDSROM = nullptr;
-
-    /// GBA ROM to install.
-    /// Defaults to nullptr, which means no cart.
-    /// Should be populated with the desired save data beforehand.
-    /// Ignored in DSi mode.
-    std::unique_ptr<GBACart::CartCommon> GBAROM = nullptr;
-
     /// NDS ARM9 BIOS to install.
     /// Defaults to FreeBIOS, which is not compatible with DSi mode.
     std::unique_ptr<ARM9BIOSImage> ARM9BIOS = std::make_unique<ARM9BIOSImage>(bios_arm9_bin);

diff --git a/src/DSi.cpp b/src/DSi.cpp
@@ -74,8 +74,6 @@ const u32 NDMAModes[] =
     DSi(
         DSiArgs {
             NDSArgs {
-                nullptr,
-                nullptr,
                 bios_arm9_bin,
                 bios_arm7_bin,
                 Firmware(0),

diff --git a/src/NDS.cpp b/src/NDS.cpp
@@ -79,8 +79,6 @@ NDS* NDS::Current = nullptr;
 NDS::NDS() noexcept :
     NDS(
         NDSArgs {
-            nullptr,
-            nullptr,
             std::make_unique<ARM9BIOSImage>(bios_arm9_bin),
             std::make_unique<ARM7BIOSImage>(bios_arm7_bin),
             Firmware(0),
@@ -102,8 +100,8 @@ NDS::NDS(NDSArgs&& args, int type, void* userdata) noexcept :
     SPI(*this, std::move(args.Firmware)),
     RTC(*this),
     Wifi(*this),
-    NDSCartSlot(*this, std::move(args.NDSROM)),
-    GBACartSlot(*this, type == 1 ? nullptr : std::move(args.GBAROM)),
+    NDSCartSlot(*this, nullptr),
+    GBACartSlot(*this, nullptr),
     AREngine(*this),
     ARM9(*this, args.GDB, args.JIT.has_value()),
     ARM7(*this, args.GDB, args.JIT.has_value()),

diff --git a/src/frontend/qt_sdl/EmuInstance.cpp b/src/frontend/qt_sdl/EmuInstance.cpp
@@ -1296,10 +1296,6 @@ bool EmuInstance::updateConsole() noexcept
 #endif
 
     NDSArgs ndsargs {
-            //std::move(nextndscart),
-            //std::move(nextgbacart),
-            nullptr,
-            nullptr,
             std::move(arm9bios),
             std::move(arm7bios),
             std::move(*firmware),
@@ -1313,8 +1309,6 @@ bool EmuInstance::updateConsole() noexcept
     std::optional<DSiArgs> dsiargs = std::nullopt;
     if (consoleType == 1)
     {
-        ndsargs.GBAROM = nullptr;
-
         auto arm7ibios = loadDSiARM7BIOS();
         if (!arm7ibios)
             return false;