From 1a870ca810a46303d5620bc4cdb095fce6d240c1 Mon Sep 17 00:00:00 2001 From: RocketRobz Date: Wed, 10 Oct 2018 17:09:29 -0600 Subject: [PATCH] Revert back to io_dldi_data from loadedDldi --- arm9/source/driveOperations.cpp | 42 ++++++++++++--------------------- 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/arm9/source/driveOperations.cpp b/arm9/source/driveOperations.cpp index c623d9e..294846f 100644 --- a/arm9/source/driveOperations.cpp +++ b/arm9/source/driveOperations.cpp @@ -7,7 +7,6 @@ #include "dldi-include.h" static sNDSHeader nds; -const DLDI_INTERFACE* loadedDldi; u8 stored_SCFG_MC = 0; @@ -150,33 +149,26 @@ TWL_CODE bool twl_flashcardMount(void) { // Read a DLDI driver specific to the cart if (!memcmp(gameid, "ASMA", 4)) { - loadedDldi = dldiLoadFromBin(r4tf_dldi); - loadedDldi->ioInterface.startup(); - fatMountSimple("fat", &loadedDldi->ioInterface); - } else if (!memcmp(gamename, "TOP TF/SD DS", 12) || !memcmp(gameid, "A76E", 4)) { - loadedDldi = dldiLoadFromBin(ttio_dldi); - loadedDldi->ioInterface.startup(); - fatMountSimple("fat", &loadedDldi->ioInterface); + io_dldi_data = dldiLoadFromBin(r4tf_dldi); + fatMountSimple("fat", &io_dldi_data->ioInterface); + } else if (!memcmp(gamename, "TOP TF/SD DS", 12) || !memcmp(gameid, "A76E", 4)) { + io_dldi_data = dldiLoadFromBin(ttio_dldi); + fatMountSimple("fat", &io_dldi_data->ioInterface); } else if (!memcmp(gamename, "PASS", 4) && !memcmp(gameid, "ASME", 4)) { - loadedDldi = dldiLoadFromBin(CycloEvo_dldi); - loadedDldi->ioInterface.startup(); - fatMountSimple("fat", &loadedDldi->ioInterface); + io_dldi_data = dldiLoadFromBin(CycloEvo_dldi); + fatMountSimple("fat", &io_dldi_data->ioInterface); } else if (!memcmp(gamename, "D!S!XTREME", 12) && !memcmp(gameid, "AYIE", 4)) { - loadedDldi = dldiLoadFromBin(dsx_dldi); - loadedDldi->ioInterface.startup(); - fatMountSimple("fat", &loadedDldi->ioInterface); + io_dldi_data = dldiLoadFromBin(dsx_dldi); + fatMountSimple("fat", &io_dldi_data->ioInterface); } else if (!memcmp(gamename, "QMATETRIAL", 9) || !memcmp(gamename, "R4DSULTRA", 9)) { - loadedDldi = dldiLoadFromBin(r4idsn_sd_dldi); - loadedDldi->ioInterface.startup(); - fatMountSimple("fat", &loadedDldi->ioInterface); + io_dldi_data = dldiLoadFromBin(r4idsn_sd_dldi); + fatMountSimple("fat", &io_dldi_data->ioInterface); } else if (!memcmp(gameid, "ACEK", 4) || !memcmp(gameid, "YCEP", 4) || !memcmp(gameid, "AHZH", 4)) { - loadedDldi = dldiLoadFromBin(ak2_sd_dldi); - loadedDldi->ioInterface.startup(); - fatMountSimple("fat", &loadedDldi->ioInterface); + io_dldi_data = dldiLoadFromBin(ak2_sd_dldi); + fatMountSimple("fat", &io_dldi_data->ioInterface); } else if (!memcmp(gameid, "ALXX", 4)) { - loadedDldi = dldiLoadFromBin(dstwo_dldi); - loadedDldi->ioInterface.startup(); - fatMountSimple("fat", &loadedDldi->ioInterface); + io_dldi_data = dldiLoadFromBin(dstwo_dldi); + fatMountSimple("fat", &io_dldi_data->ioInterface); } if (flashcardFound()) { @@ -208,10 +200,6 @@ bool flashcardMount(void) { void flashcardUnmount(void) { fatUnmount("fat"); - if (isDSiMode()) { - loadedDldi->ioInterface.shutdown(); - dldiFree((DLDI_INTERFACE*)loadedDldi); - } fatLabel[0] = '\0'; flashcardMounted = false; }