Compress NRIO DLDI driver to fit in bootstub (without loading from Ni…

…troFS)
DS-Homebrew · Nov 14, 2024 · 9c243aa · 9c243aa
1 parent d852daa
commit 9c243aa
Show file tree

Hide file tree

Showing 9 changed files with 1,496 additions and 375 deletions.
diff --git a/arm9/dldi-include/nrio_dldi.c → arm9/dldi-include-unused/nrio_dldi.c b/arm9/dldi-include/nrio_dldi.c → arm9/dldi-include-unused/nrio_dldi.c
@@ -1,4 +1,4 @@
-#include <nds.h>
+#include <nds/ndstypes.h>
 
 TWL_CODE ALIGN(4) unsigned char nrio_dldi[19724] = {
 	0xED, 0xA5, 0x8D, 0xBF, 0x20, 0x43, 0x68, 0x69, 0x73, 0x68, 0x6D, 0x00,

diff --git a/arm9/dldi-include/dldi-include.h b/arm9/dldi-include/dldi-include.h
@@ -3,7 +3,7 @@
 
 extern unsigned char ak2_dldi[];
 extern unsigned char r4tf_dldi[];
-extern unsigned char nrio_dldi[];
+extern unsigned char nrio_lz77[];
 
 // extern unsigned char dstwo_dldi[];
 // extern unsigned char ttio_dldi[];

diff --git a/arm9/dldi-include/nrio_lz77.c b/arm9/dldi-include/nrio_lz77.c
diff --git a/arm9/source/driveOperations.cpp b/arm9/source/driveOperations.cpp
@@ -350,6 +350,35 @@ TWL_CODE void dldiLoadFromBin (const u8 dldiAddr[]) {
 	dldiRelocateBinary ((data_t*)dldiAddr, dldiSize);
 }
 
+TWL_CODE void dldiLoadFromLzss (const u8 dldiLzss[], const u32 len) {
+	*(u32*)0x02FF8000 = 0x53535A4C;
+	tonccpy((u32*)0x02FF8004, dldiLzss, len);
+
+	u32* dldiAddr = new u32[0x8000/sizeof(u32)];
+	LZ77_Decompress((u8*)0x02FF8004, (u8*)dldiAddr);
+
+	// Check that it is a valid DLDI
+	if (!dldiIsValid ((DLDI_INTERFACE*)dldiAddr)) {
+		delete[] dldiAddr;
+		return;
+	}
+
+	DLDI_INTERFACE* device = (DLDI_INTERFACE*)dldiAddr;
+	size_t dldiSize;
+
+	// 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
+
+	dldiRelocateBinary ((data_t*)dldiAddr, dldiSize);
+	delete[] dldiAddr;
+}
+
 TWL_CODE bool UpdateCardInfo(char* gameid, char* gamename) {
 	cardReadHeader((uint8*)0x02000000);
 	tonccpy(&nds, (void*)0x02000000, sizeof(sNDSHeader));
@@ -416,7 +445,7 @@ TWL_CODE bool twl_flashcardMount(void) {
 			dldiLoadFromBin(r4tf_dldi);
 			fatMountSimple("fat", dldiGet());
 		} else if (!memcmp(gameid, "DSGB", 4)) {
-			dldiLoadFromBin(nrio_dldi);
+			dldiLoadFromLzss(nrio_lz77, 0x30DD);
 			fatMountSimple("fat", dldiGet());
 		} /* else if (!memcmp(gameid, "ALXX", 4)) { // SuperCard DSTWO
 			dldiLoadFromBin(dstwo_dldi);

diff --git a/arm9/source/dumpOperations.cpp b/arm9/source/dumpOperations.cpp
@@ -7,7 +7,7 @@
 #include "fileOperations.h"
 #include "font.h"
 #include "gba.h"
-#include "lzss.h"
+#include "lzss_enc.h"
 #include "main.h"
 #include "ndsheaderbanner.h"
 #include "read_card.h"