Switch to the original DSTWO DLDI driver if alternate version is found

RocketRobz · RocketRobz · commit 9394c2aa8cf8 · 2026-03-20T16:09:28.000-06:00
diff --git a/settings/bootloader/source/boot.c b/settings/bootloader/source/boot.c
@@ -453,12 +453,11 @@ int main (void) {
 			const u16 dldiFileSize = 1 << *(u8*)0x02FF418D;
 			tonccpy((u32*)0x06000000, (u32*)0x02FF4180, dldiFileSize);
 			dldiRelocateBinary();
-
 			toncset((u32*)0x02FF4000, 0, 0x8180); // Clear bootstub + DLDI driver
 		} else if (*(u32*)0x02FF8004 == 0x69684320) { // DLDI ' Chi' string
 			const u16 dldiFileSize = 1 << *(u8*)0x02FF800D;
 			tonccpy((u32*)0x06000000, (u32*)0x02FF8000, (dldiFileSize > 0x4000) ? 0x4000 : dldiFileSize);
-			dldiClearBss();
+			dldiRelocateBinary();
 		} else if (*(u32*)0x02FF8000 == 0x53535A4C) { // LZ77 flag
 			dldiDecompressBinary();
 		} else {
diff --git a/settings/bootloader/source/dldi_patcher.c b/settings/bootloader/source/dldi_patcher.c
@@ -326,17 +326,4 @@ void dldiRelocateBinary (void) {
 	writeAddr (pDH, DO_bss_start, readAddr (pDH, DO_bss_start) + relocationOffset);
 	writeAddr (pDH, DO_bss_end, readAddr (pDH, DO_bss_end) + relocationOffset);
 }
-
-void dldiClearBss (void) {
-	data_t *pDH = _dldi_start;
-
-	addr_t ddmemSize = (1 << pDH[DO_driverSize]);			// Size of range that offsets can be in the DLDI file
-
-	if (ddmemSize <= 0x4000) return; // For <= 16KB DLDI file, BSS has already been cleared
-
-	if (pDH[DO_fixSections] & FIX_BSS) { 
-		// Initialise the BSS to 0
-		toncset (&pDH[readAddr(pDH, DO_bss_start)] , 0, readAddr(pDH, DO_bss_end) - readAddr(pDH, DO_bss_start));
-	}
-}
 #endif
diff --git a/settings/bootloader/source/dldi_patcher.h b/settings/bootloader/source/dldi_patcher.h
@@ -30,6 +30,5 @@ typedef unsigned char data_t;
 bool dldiPatchBinary (data_t *binData, u32 binSize);
 void dldiDecompressBinary (void);
 void dldiRelocateBinary (void);
-void dldiClearBss (void);
 
 #endif // DLDI_PATCHER_H
diff --git a/title/arm9/source/main.cpp b/title/arm9/source/main.cpp
@@ -2355,7 +2355,15 @@ int titleMode(void)
 		4: Run temporary DSiWare
 	*/
 
-	if (((strcmp(io_dldi_data->friendlyName, "NAND FLASH CARD LIBFATNRIO") == 0) || (io_dldi_data->ioInterface.ioType == 0x4F49524E)) && (*(u32*)0x02FF8000 != 0x53535A4C)) {
+	if (strcmp(io_dldi_data->friendlyName, "DSTWO(Slot-1)") == 0) {
+		const u32* u32_io_dldi_data = (u32*)(io_dldi_data);
+		if (u32_io_dldi_data[0xD0/4] == 0xBF80074C) { // If alternate DLDI driver is found...
+			// Use original DLDI driver once bootloader runs
+			FILE* file = fopen("nitro:/dldi/dstwo.dldi", "rb");
+			fread((void*)0x02FF8000, 1, 0x800, file);
+			fclose(file);
+		}
+	} else if (((strcmp(io_dldi_data->friendlyName, "NAND FLASH CARD LIBFATNRIO") == 0) || (io_dldi_data->ioInterface.ioType == 0x4F49524E)) && (*(u32*)0x02FF8000 != 0x53535A4C)) {
 		FILE* file = fopen("nitro:/dldi/nrio.lz77", "rb");
 		fread((void*)0x02FF8004, 1, 0x3FFC, file);
 		fclose(file);
diff --git a/title/bootloader/source/boot.c b/title/bootloader/source/boot.c
@@ -641,12 +641,11 @@ int main (void) {
 			const u16 dldiFileSize = 1 << *(u8*)0x02FF418D;
 			tonccpy((u32*)0x06000000, (u32*)0x02FF4180, dldiFileSize);
 			dldiRelocateBinary();
-
 			toncset((u32*)0x02FF4000, 0, 0x8180); // Clear bootstub + DLDI driver
 		} else if (*(u32*)0x02FF8004 == 0x69684320) { // DLDI ' Chi' string
 			const u16 dldiFileSize = 1 << *(u8*)0x02FF800D;
 			tonccpy((u32*)0x06000000, (u32*)0x02FF8000, (dldiFileSize > 0x4000) ? 0x4000 : dldiFileSize);
-			dldiClearBss();
+			dldiRelocateBinary();
 		} else if (*(u32*)0x02FF8000 == 0x53535A4C) { // LZ77 flag
 			dldiDecompressBinary();
 		} else {
diff --git a/title/bootloader/source/dldi_patcher.c b/title/bootloader/source/dldi_patcher.c
@@ -326,17 +326,4 @@ void dldiRelocateBinary (void) {
 	writeAddr (pDH, DO_bss_start, readAddr (pDH, DO_bss_start) + relocationOffset);
 	writeAddr (pDH, DO_bss_end, readAddr (pDH, DO_bss_end) + relocationOffset);
 }
-
-void dldiClearBss (void) {
-	data_t *pDH = _dldi_start;
-
-	addr_t ddmemSize = (1 << pDH[DO_driverSize]);			// Size of range that offsets can be in the DLDI file
-
-	if (ddmemSize <= 0x4000) return; // For <= 16KB DLDI file, BSS has already been cleared
-
-	if (pDH[DO_fixSections] & FIX_BSS) { 
-		// Initialise the BSS to 0
-		toncset (&pDH[readAddr(pDH, DO_bss_start)] , 0, readAddr(pDH, DO_bss_end) - readAddr(pDH, DO_bss_start));
-	}
-}
 #endif
diff --git a/title/bootloader/source/dldi_patcher.h b/title/bootloader/source/dldi_patcher.h
@@ -30,6 +30,5 @@ typedef unsigned char data_t;
 bool dldiPatchBinary (data_t *binData, u32 binSize);
 void dldiDecompressBinary (void);
 void dldiRelocateBinary (void);
-void dldiClearBss (void);
 
 #endif // DLDI_PATCHER_H
diff --git a/title/nitrofiles/dldi/dstwo.dldi b/title/nitrofiles/dldi/dstwo.dldi
diff --git a/universal/bootloader_app/source/boot.c b/universal/bootloader_app/source/boot.c
@@ -394,12 +394,11 @@ int main (void) {
 			const u16 dldiFileSize = 1 << *(u8*)0x02FF418D;
 			tonccpy((u32*)0x06000000, (u32*)0x02FF4180, dldiFileSize);
 			dldiRelocateBinary();
-
 			toncset((u32*)0x02FF4000, 0, 0x8180); // Clear bootstub + DLDI driver
 		} else if (*(u32*)0x02FF8004 == 0x69684320) { // DLDI ' Chi' string
 			const u16 dldiFileSize = 1 << *(u8*)0x02FF800D;
 			tonccpy((u32*)0x06000000, (u32*)0x02FF8000, (dldiFileSize > 0x4000) ? 0x4000 : dldiFileSize);
-			dldiClearBss();
+			dldiRelocateBinary();
 		} else if (*(u32*)0x02FF8000 == 0x53535A4C) { // LZ77 flag
 			dldiDecompressBinary();
 		} else {
diff --git a/universal/bootloader_app/source/dldi_patcher.c b/universal/bootloader_app/source/dldi_patcher.c
@@ -326,17 +326,4 @@ void dldiRelocateBinary (void) {
 	writeAddr (pDH, DO_bss_start, readAddr (pDH, DO_bss_start) + relocationOffset);
 	writeAddr (pDH, DO_bss_end, readAddr (pDH, DO_bss_end) + relocationOffset);
 }
-
-void dldiClearBss (void) {
-	data_t *pDH = _dldi_start;
-
-	addr_t ddmemSize = (1 << pDH[DO_driverSize]);			// Size of range that offsets can be in the DLDI file
-
-	if (ddmemSize <= 0x4000) return; // For <= 16KB DLDI file, BSS has already been cleared
-
-	if (pDH[DO_fixSections] & FIX_BSS) { 
-		// Initialise the BSS to 0
-		toncset (&pDH[readAddr(pDH, DO_bss_start)] , 0, readAddr(pDH, DO_bss_end) - readAddr(pDH, DO_bss_start));
-	}
-}
 #endif
diff --git a/universal/bootloader_app/source/dldi_patcher.h b/universal/bootloader_app/source/dldi_patcher.h
@@ -30,6 +30,5 @@ typedef unsigned char data_t;
 bool dldiPatchBinary (data_t *binData, u32 binSize);
 void dldiDecompressBinary (void);
 void dldiRelocateBinary (void);
-void dldiClearBss (void);
 
 #endif // DLDI_PATCHER_H
diff --git a/universal/bootloader_menu/source/boot.c b/universal/bootloader_menu/source/boot.c
@@ -584,12 +584,11 @@ int main (void) {
 			const u16 dldiFileSize = 1 << *(u8*)0x02FF418D;
 			tonccpy((u32*)0x06000000, (u32*)0x02FF4180, dldiFileSize);
 			dldiRelocateBinary();
-
 			toncset((u32*)0x02FF4000, 0, 0x8180); // Clear bootstub + DLDI driver
 		} else if (*(u32*)0x02FF8004 == 0x69684320) { // DLDI ' Chi' string
 			const u16 dldiFileSize = 1 << *(u8*)0x02FF800D;
 			tonccpy((u32*)0x06000000, (u32*)0x02FF8000, (dldiFileSize > 0x4000) ? 0x4000 : dldiFileSize);
-			dldiClearBss();
+			dldiRelocateBinary();
 		} else if (*(u32*)0x02FF8000 == 0x53535A4C) { // LZ77 flag
 			dldiDecompressBinary();
 		} else {
diff --git a/universal/bootloader_menu/source/dldi_patcher.c b/universal/bootloader_menu/source/dldi_patcher.c
@@ -326,17 +326,4 @@ void dldiRelocateBinary (void) {
 	writeAddr (pDH, DO_bss_start, readAddr (pDH, DO_bss_start) + relocationOffset);
 	writeAddr (pDH, DO_bss_end, readAddr (pDH, DO_bss_end) + relocationOffset);
 }
-
-void dldiClearBss (void) {
-	data_t *pDH = _dldi_start;
-
-	addr_t ddmemSize = (1 << pDH[DO_driverSize]);			// Size of range that offsets can be in the DLDI file
-
-	if (ddmemSize <= 0x4000) return; // For <= 16KB DLDI file, BSS has already been cleared
-
-	if (pDH[DO_fixSections] & FIX_BSS) { 
-		// Initialise the BSS to 0
-		toncset (&pDH[readAddr(pDH, DO_bss_start)] , 0, readAddr(pDH, DO_bss_end) - readAddr(pDH, DO_bss_start));
-	}
-}
 #endif
diff --git a/universal/bootloader_menu/source/dldi_patcher.h b/universal/bootloader_menu/source/dldi_patcher.h
@@ -30,6 +30,5 @@ typedef unsigned char data_t;
 bool dldiPatchBinary (data_t *binData, u32 binSize);
 void dldiDecompressBinary (void);
 void dldiRelocateBinary (void);
-void dldiClearBss (void);
 
 #endif // DLDI_PATCHER_H
diff --git a/universal/source/nds_loader/nds_loader_arm9.c b/universal/source/nds_loader/nds_loader_arm9.c
@@ -162,17 +162,6 @@ static void writeAddr (data_t *mem, addr_t offset, addr_t value) {
 
 static bool dldiPatchLoader (void)
 {
-	addr_t memOffset;			// Offset of DLDI after the file is loaded into memory
-	addr_t relocationOffset;	// Value added to all offsets within the patch to fix it properly
-	addr_t ddmemOffset;			// Original offset used in the DLDI file
-	addr_t ddmemStart;			// Start of range that offsets can be in the DLDI file
-	addr_t ddmemEnd;			// End of range that offsets can be in the DLDI file
-	addr_t ddmemSize;			// Size of range that offsets can be in the DLDI file
-
-	addr_t addrIter;
-
-	size_t dldiFileSize = 0;
-
 	data_t *pDH = (data_t*)(io_dldi_data);
 
 	data_t *pAH = (data_t*)0x02FF8000;
@@ -183,77 +172,12 @@ static bool dldiPatchLoader (void)
 	}
 
 	if (*(u32*)0x02FF8004 == 0x69684320 || *(u32*)0x02FF8000 == 0x53535A4C) {
-		return true; // Skip patching for existing or compressed DLDI file
+		return true; // Existing or compressed DLDI file is already in place
 	}
 
-	dldiFileSize = 1 << pDH[DO_driverSize];
-
-	/* memOffset = readAddr (pAH, DO_text_start);
-	if (memOffset == 0) {
-			memOffset = readAddr (pAH, DO_startup) - DO_code;
-	} */
-	memOffset = 0x06000000;
-	ddmemOffset = readAddr (pDH, DO_text_start);
-	relocationOffset = memOffset - ddmemOffset;
-
-	ddmemStart = readAddr (pDH, DO_text_start);
-	ddmemSize = (1 << pDH[DO_driverSize]);
-	ddmemEnd = ddmemStart + ddmemSize;
-
-	// Remember how much space is actually reserved
-	pDH[DO_allocatedSpace] = pAH[DO_allocatedSpace];
-	// Copy the DLDI patch into the application
+	size_t dldiFileSize = 1 << pDH[DO_driverSize];
 	tonccpy (pAH, pDH, (dldiFileSize > 0x4000) ? 0x4000 : dldiFileSize);
 
-	// Fix the section pointers in the header
-	writeAddr (pAH, DO_text_start, readAddr (pAH, DO_text_start) + relocationOffset);
-	writeAddr (pAH, DO_data_end, readAddr (pAH, DO_data_end) + relocationOffset);
-	writeAddr (pAH, DO_glue_start, readAddr (pAH, DO_glue_start) + relocationOffset);
-	writeAddr (pAH, DO_glue_end, readAddr (pAH, DO_glue_end) + relocationOffset);
-	writeAddr (pAH, DO_got_start, readAddr (pAH, DO_got_start) + relocationOffset);
-	writeAddr (pAH, DO_got_end, readAddr (pAH, DO_got_end) + relocationOffset);
-	writeAddr (pAH, DO_bss_start, readAddr (pAH, DO_bss_start) + relocationOffset);
-	writeAddr (pAH, DO_bss_end, readAddr (pAH, DO_bss_end) + relocationOffset);
-	// Fix the function pointers in the header
-	writeAddr (pAH, DO_startup, readAddr (pAH, DO_startup) + relocationOffset);
-	writeAddr (pAH, DO_isInserted, readAddr (pAH, DO_isInserted) + relocationOffset);
-	writeAddr (pAH, DO_readSectors, readAddr (pAH, DO_readSectors) + relocationOffset);
-	writeAddr (pAH, DO_writeSectors, readAddr (pAH, DO_writeSectors) + relocationOffset);
-	writeAddr (pAH, DO_clearStatus, readAddr (pAH, DO_clearStatus) + relocationOffset);
-	writeAddr (pAH, DO_shutdown, readAddr (pAH, DO_shutdown) + relocationOffset);
-
-	if (pDH[DO_fixSections] & FIX_ALL) {
-		// Search through and fix pointers within the data section of the file
-		for (addrIter = (readAddr(pDH, DO_text_start) - ddmemStart); addrIter < (readAddr(pDH, DO_data_end) - ddmemStart); addrIter++) {
-			if ((ddmemStart <= readAddr(pAH, addrIter)) && (readAddr(pAH, addrIter) < ddmemEnd)) {
-				writeAddr (pAH, addrIter, readAddr(pAH, addrIter) + relocationOffset);
-			}
-		}
-	}
-
-	if (pDH[DO_fixSections] & FIX_GLUE) {
-		// Search through and fix pointers within the glue section of the file
-		for (addrIter = (readAddr(pDH, DO_glue_start) - ddmemStart); addrIter < (readAddr(pDH, DO_glue_end) - ddmemStart); addrIter++) {
-			if ((ddmemStart <= readAddr(pAH, addrIter)) && (readAddr(pAH, addrIter) < ddmemEnd)) {
-				writeAddr (pAH, addrIter, readAddr(pAH, addrIter) + relocationOffset);
-			}
-		}
-	}
-
-	if (pDH[DO_fixSections] & FIX_GOT) {
-		// Search through and fix pointers within the Global Offset Table section of the file
-		for (addrIter = (readAddr(pDH, DO_got_start) - ddmemStart); addrIter < (readAddr(pDH, DO_got_end) - ddmemStart); addrIter++) {
-			if ((ddmemStart <= readAddr(pAH, addrIter)) && (readAddr(pAH, addrIter) < ddmemEnd)) {
-				writeAddr (pAH, addrIter, readAddr(pAH, addrIter) + relocationOffset);
-			}
-		}
-	}
-
-	if (/* clearBSS && */ (pDH[DO_fixSections] & FIX_BSS) && dldiFileSize <= 0x4000) {
-		// Initialise the BSS to 0, only if the disc is being re-inited
-		toncset (&pAH[readAddr(pDH, DO_bss_start) - ddmemStart] , 0, readAddr(pDH, DO_bss_end) - readAddr(pDH, DO_bss_start));
-	}
-
 	return true;
 }
 
