rvtr/GodMode9i
1
Fork 0
mirror of https://github.com/rvtr/GodMode9i.git synced 2025-11-02 00:11:07 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve AK2i secondary drive mounting (?) (#136)

Browse Source 
* Improve AK2i secondary drive mounting (?)

* Ensure correct bus owner when getting DLDI
This commit is contained in:
Pk11 2022-01-03 20:37:12 -06:00 committed by GitHub
parent 574e5b26a6
commit e8c3a8596b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
arm9/source/driveOperations.cpp
View File

@ -226,6 +226,15 @@ TWL_CODE bool UpdateCardInfo(char* gameid, char* gamename) {
return true; return true;
} }
const DISC_INTERFACE *dldiGet(void) {
if(io_dldi_data->ioInterface.features & FEATURE_SLOT_GBA)
sysSetCartOwner(BUS_OWNER_ARM9);
if(io_dldi_data->ioInterface.features & FEATURE_SLOT_NDS)
sysSetCardOwner(BUS_OWNER_ARM9);
return &io_dldi_data->ioInterface;
}
TWL_CODE bool twl_flashcardMount(void) { TWL_CODE bool twl_flashcardMount(void) {
if (REG_SCFG_MC != 0x11) { if (REG_SCFG_MC != 0x11) {
sysSetCardOwner (BUS_OWNER_ARM9); sysSetCardOwner (BUS_OWNER_ARM9);
@ -265,25 +274,25 @@ TWL_CODE bool twl_flashcardMount(void) {
// Read a DLDI driver specific to the cart // Read a DLDI driver specific to the cart
if (!memcmp(gameid, "ASMA", 4)) { if (!memcmp(gameid, "ASMA", 4)) {
io_dldi_data = dldiLoadFromBin(r4tf_dldi); io_dldi_data = dldiLoadFromBin(r4tf_dldi);
fatMountSimple("fat", dldiGetInternal()); fatMountSimple("fat", dldiGet());
} else if (!memcmp(gamename, "TOP TF/SD DS", 12) || !memcmp(gameid, "A76E", 4)) { } else if (!memcmp(gamename, "TOP TF/SD DS", 12) || !memcmp(gameid, "A76E", 4)) {
io_dldi_data = dldiLoadFromBin(tt_sd_dldi); io_dldi_data = dldiLoadFromBin(tt_sd_dldi);
fatMountSimple("fat", dldiGetInternal()); fatMountSimple("fat", dldiGet());
} else /*if (!memcmp(gamename, "PASS", 4) && !memcmp(gameid, "ASME", 4)) { } else /*if (!memcmp(gamename, "PASS", 4) && !memcmp(gameid, "ASME", 4)) {
io_dldi_data = dldiLoadFromBin(CycloEvo_dldi); io_dldi_data = dldiLoadFromBin(CycloEvo_dldi);
fatMountSimple("fat", dldiGetInternal()); fatMountSimple("fat", dldiGet());
} else*/ if (!memcmp(gamename, "D!S!XTREME", 10) && !memcmp(gameid, "AYIE", 4)) { } else*/ if (!memcmp(gamename, "D!S!XTREME", 10) && !memcmp(gameid, "AYIE", 4)) {
io_dldi_data = dldiLoadFromBin(dsx_dldi); io_dldi_data = dldiLoadFromBin(dsx_dldi);
fatMountSimple("fat", dldiGetInternal()); fatMountSimple("fat", dldiGet());
} else if (!memcmp(gamename, "QMATETRIAL", 9) || !memcmp(gamename, "R4DSULTRA", 9)) { } else if (!memcmp(gamename, "QMATETRIAL", 9) || !memcmp(gamename, "R4DSULTRA", 9)) {
io_dldi_data = dldiLoadFromBin(r4idsn_sd_dldi); io_dldi_data = dldiLoadFromBin(r4idsn_sd_dldi);
fatMountSimple("fat", dldiGetInternal()); fatMountSimple("fat", dldiGet());
} else if (!memcmp(gameid, "ACEK", 4) || !memcmp(gameid, "YCEP", 4) || !memcmp(gameid, "AHZH", 4) || !memcmp(gameid, "CHPJ", 4) || !memcmp(gameid, "ADLP", 4)) { } else if (!memcmp(gameid, "ACEK", 4) || !memcmp(gameid, "YCEP", 4) || !memcmp(gameid, "AHZH", 4) || !memcmp(gameid, "CHPJ", 4) || !memcmp(gameid, "ADLP", 4)) {
io_dldi_data = dldiLoadFromBin(ak2_sd_dldi); io_dldi_data = dldiLoadFromBin(ak2_sd_dldi);
fatMountSimple("fat", dldiGetInternal()); fatMountSimple("fat", dldiGet());
} /*else if (!memcmp(gameid, "ALXX", 4)) { } /*else if (!memcmp(gameid, "ALXX", 4)) {
io_dldi_data = dldiLoadFromBin(dstwo_dldi); io_dldi_data = dldiLoadFromBin(dstwo_dldi);
fatMountSimple("fat", dldiGetInternal()); fatMountSimple("fat", dldiGet());
}*/ }*/
if (flashcardFound()) { if (flashcardFound()) {
@ -424,7 +433,7 @@ bool driveWritable(Drive drive) {
case Drive::sdCard: case Drive::sdCard:
return __my_io_dsisd()->features & FEATURE_MEDIUM_CANWRITE; return __my_io_dsisd()->features & FEATURE_MEDIUM_CANWRITE;
case Drive::flashcard: case Drive::flashcard:
return dldiGetInternal()->features & FEATURE_MEDIUM_CANWRITE; return dldiGet()->features & FEATURE_MEDIUM_CANWRITE;
case Drive::ramDrive: case Drive::ramDrive:
return io_ram_drive.features & FEATURE_MEDIUM_CANWRITE; return io_ram_drive.features & FEATURE_MEDIUM_CANWRITE;
case Drive::nand: case Drive::nand: