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

dldiLoadFromBin function now works

Browse Source
This commit is contained in:
Robz8 2018-10-04 18:52:49 -06:00
parent 10ca991150
commit 4ed92df134
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
arm9/source/driveOperations.cpp
View File

@ -33,15 +33,16 @@ bool bothSDandFlashcard(void) {
} }
} }
DLDI_INTERFACE* dldiLoadFromBin (void* dldiAddr, u16 size) { DLDI_INTERFACE* dldiLoadFromBin (const u8 dldiAddr[]) {
DLDI_INTERFACE* device; DLDI_INTERFACE* device;
size_t dldiSize;
// Read in the DLDI header
if ((device = (DLDI_INTERFACE*)malloc (sizeof(DLDI_INTERFACE))) == NULL) { if ((device = (DLDI_INTERFACE*)malloc (sizeof(DLDI_INTERFACE))) == NULL) {
return NULL; return NULL;
} }
// Load entire DLDI memcpy(device, dldiAddr, sizeof(DLDI_INTERFACE));
memcpy(device, dldiAddr, size);
// Check that it is a valid DLDI // Check that it is a valid DLDI
if (!dldiIsValid (device)) { if (!dldiIsValid (device)) {
@ -49,6 +50,23 @@ DLDI_INTERFACE* dldiLoadFromBin (void* dldiAddr, u16 size) {
return NULL; return NULL;
} }
// Calculate actual size of DLDI
// Although the file may only go to the dldiEnd, the BSS section can extend past that
if (device->dldiEnd > device->bssEnd) {
dldiSize = (char*)device->dldiEnd - (char*)device->dldiStart;
} else {
dldiSize = (char*)device->bssEnd - (char*)device->dldiStart;
}
dldiSize = (dldiSize + 0x03) & ~0x03; // Round up to nearest integer multiple
// Load entire DLDI
free (device);
if ((device = (DLDI_INTERFACE*)malloc (dldiSize)) == NULL) {
return NULL;
}
memcpy(device, dldiAddr, dldiSize);
dldiFixDriverAddresses (device); dldiFixDriverAddresses (device);
if (device->ioInterface.features & FEATURE_SLOT_GBA) { if (device->ioInterface.features & FEATURE_SLOT_GBA) {
@ -109,10 +127,10 @@ void flashcardMount(void) {
// Read a DLDI driver specific to the cart // Read a DLDI driver specific to the cart
if (!memcmp(gamename, "R4DSULTRA", 9)) { if (!memcmp(gamename, "R4DSULTRA", 9)) {
io_dldi_data = dldiLoadFromBin((void*)r4idsn_sd_bin, r4idsn_sd_bin_size); io_dldi_data = dldiLoadFromBin(r4idsn_sd_bin);
fatMountSimple("fat", &io_dldi_data->ioInterface); fatMountSimple("fat", &io_dldi_data->ioInterface);
} else if (!memcmp(gameid, "YCEP", 4) || !memcmp(gameid, "AHZH", 4)) { } else if (!memcmp(gameid, "YCEP", 4) || !memcmp(gameid, "AHZH", 4)) {
io_dldi_data = dldiLoadFromBin((void*)ak2_sd_bin, ak2_sd_bin_size); io_dldi_data = dldiLoadFromBin(ak2_sd_bin);
fatMountSimple("fat", &io_dldi_data->ioInterface); fatMountSimple("fat", &io_dldi_data->ioInterface);
} }
} }