Add support for 32KB DLDI drivers outside of B4DS mode

Does not work in DSi mode yet

Author: RocketRobz

retail/Makefile

@@ -72,7 +72,7 @@ endif
 export GAME_ICON := $(CURDIR)/$(ASSETS)/icon.bmp
 
 #.PHONY: cardengine_arm7 cardengine_arm9 bootloader BootStrap clean
-.PHONY: all dist release nightly bootloader bootloader1 bootloader2 bootloaderi bootloaderi1 bootloaderi2 cardengine_arm7 cardengine_arm7_music cardengine_arm9_igm cardengine_arm9_igm_extmem cardengine_arm9 cardengine_arm9_32 cardengine_arm9_start cardengine_arm9_start_foto cardengine_arm9_alt cardengine_arm9_alt_gsdd cardengine_arm9_alt2 cardengine_arm9_alt3 cardengine_arm9_extmem cardengine_arm9_extmem_gsdd cardengine_arm9_extmem_start cardengine_arm9_extmem_foto cardenginei_arm7 cardenginei_arm7_alt cardenginei_arm7_twlsdk cardenginei_arm7_twlsdk3 cardenginei_arm7_dsiware cardenginei_arm7_dsiware3 cardenginei_arm7_cheat cardenginei_arm9_igm cardenginei_arm9 cardenginei_arm9_alt cardenginei_arm9_alt2 cardenginei_arm9_dlp cardenginei_arm9_gsdd cardenginei_arm9_gsdd_alt cardenginei_arm9_dldi cardenginei_arm9_gsdd_dldi cardenginei_arm9_twlsdk cardenginei_arm9_twlsdk3 cardenginei_arm9_twlsdk_dldi cardenginei_arm9_twlsdk3_dldi cardenginei_arm9_dsiware cardenginei_arm9_dsiware3 preLoadSettings apfix libnds32 arm7/$(TARGET).elf arm9/$(TARGET).elf clean
+.PHONY: all dist release nightly bootloader bootloader1 bootloader2 bootloaderi bootloaderi1 bootloaderi2 cardengine_arm7 cardengine_arm7_music cardengine_arm9_igm cardengine_arm9_igm_extmem cardengine_arm9 cardengine_arm9_32 cardengine_arm9_start cardengine_arm9_start_foto cardengine_arm9_alt cardengine_arm9_alt_gsdd cardengine_arm9_alt2 cardengine_arm9_alt3 cardengine_arm9_extmem cardengine_arm9_extmem_gsdd cardengine_arm9_extmem_start cardengine_arm9_extmem_foto cardenginei_arm7 cardenginei_arm7_alt cardenginei_arm7_twlsdk cardenginei_arm7_twlsdk3 cardenginei_arm7_dsiware cardenginei_arm7_dsiware3 cardenginei_arm7_cheat cardenginei_arm9_igm cardenginei_arm9 cardenginei_arm9_sdk20 cardenginei_arm9_dlp cardenginei_arm9_gsdd cardenginei_arm9_dldi cardenginei_arm9_sdk20_dldi cardenginei_arm9_gsdd_dldi cardenginei_arm9_twlsdk cardenginei_arm9_twlsdk3 cardenginei_arm9_twlsdk_dldi cardenginei_arm9_twlsdk3_dldi cardenginei_arm9_dsiware cardenginei_arm9_dsiware3 preLoadSettings apfix libnds32 arm7/$(TARGET).elf arm9/$(TARGET).elf clean
 
 all:	$(OUTPUT)
 
@@ -121,7 +121,7 @@ bootloader2:
 	@$(MAKE) -C bootloader2
 
 #---------------------------------------------------------------------------------		
-bootloaderi: cardenginei_arm7 cardenginei_arm7_alt cardenginei_arm7_twlsdk cardenginei_arm7_twlsdk3 cardenginei_arm7_dsiware cardenginei_arm7_dsiware3 cardenginei_arm7_cheat cardenginei_arm9_igm cardenginei_arm9 cardenginei_arm9_alt cardenginei_arm9_alt2 cardenginei_arm9_dlp cardenginei_arm9_gsdd cardenginei_arm9_gsdd_alt cardenginei_arm9_dldi cardenginei_arm9_gsdd_dldi cardenginei_arm9_twlsdk cardenginei_arm9_twlsdk3 cardenginei_arm9_twlsdk_dldi cardenginei_arm9_twlsdk3_dldi cardenginei_arm9_dsiware cardenginei_arm9_dsiware3
+bootloaderi: cardenginei_arm7 cardenginei_arm7_alt cardenginei_arm7_twlsdk cardenginei_arm7_twlsdk3 cardenginei_arm7_dsiware cardenginei_arm7_dsiware3 cardenginei_arm7_cheat cardenginei_arm9_igm cardenginei_arm9 cardenginei_arm9_sdk20 cardenginei_arm9_dlp cardenginei_arm9_gsdd cardenginei_arm9_dldi cardenginei_arm9_sdk20_dldi cardenginei_arm9_gsdd_dldi cardenginei_arm9_twlsdk cardenginei_arm9_twlsdk3 cardenginei_arm9_twlsdk_dldi cardenginei_arm9_twlsdk3_dldi cardenginei_arm9_dsiware cardenginei_arm9_dsiware3
 	@$(MAKE) -C bootloaderi
 
 #---------------------------------------------------------------------------------		
@@ -233,12 +233,8 @@ cardenginei_arm9:
 	@$(MAKE) -C cardenginei/arm9
 
 #---------------------------------------------------------------------------------		
-cardenginei_arm9_alt:
-	@$(MAKE) -C cardenginei/arm9_alt
-
-#---------------------------------------------------------------------------------		
-cardenginei_arm9_alt2:
-	@$(MAKE) -C cardenginei/arm9_alt2
+cardenginei_arm9_sdk20:
+	@$(MAKE) -C cardenginei/arm9_sdk20
 
 #---------------------------------------------------------------------------------		
 cardenginei_arm9_dlp:
@@ -248,14 +244,14 @@ cardenginei_arm9_dlp:
 cardenginei_arm9_gsdd:
 	@$(MAKE) -C cardenginei/arm9_gsdd
 
-#---------------------------------------------------------------------------------		
-cardenginei_arm9_gsdd_alt:
-	@$(MAKE) -C cardenginei/arm9_gsdd_alt
-
 #---------------------------------------------------------------------------------		
 cardenginei_arm9_dldi:
 	@$(MAKE) -C cardenginei/arm9_dldi
 
+#---------------------------------------------------------------------------------		
+cardenginei_arm9_sdk20_dldi:
+	@$(MAKE) -C cardenginei/arm9_sdk20_dldi
+
 #---------------------------------------------------------------------------------		
 cardenginei_arm9_gsdd_dldi:
 	@$(MAKE) -C cardenginei/arm9_gsdd_dldi
@@ -329,12 +325,11 @@ clean:
 	@$(MAKE) -C cardenginei/arm7_cheatonly clean
 	@$(MAKE) -C cardenginei/arm9_igm clean
 	@$(MAKE) -C cardenginei/arm9 clean
-	@$(MAKE) -C cardenginei/arm9_alt clean
-	@$(MAKE) -C cardenginei/arm9_alt2 clean
+	@$(MAKE) -C cardenginei/arm9_sdk20 clean
 	@$(MAKE) -C cardenginei/arm9_dlp clean
 	@$(MAKE) -C cardenginei/arm9_gsdd clean
-	@$(MAKE) -C cardenginei/arm9_gsdd_alt clean
 	@$(MAKE) -C cardenginei/arm9_dldi clean
+	@$(MAKE) -C cardenginei/arm9_sdk20_dldi clean
 	@$(MAKE) -C cardenginei/arm9_gsdd_dldi clean
 	@$(MAKE) -C cardenginei/arm9_twlsdk clean
 	@$(MAKE) -C cardenginei/arm9_twlsdk_dldi clean

retail/arm9/source/conf_sd.cpp

@@ -1434,19 +1434,6 @@ int loadFromSD(configuration* conf, const char *bootstrapPath) {
 		} else {
 			conf->dsiWramAccess = true;
 		}
-		bool ce9Wram = conf->dsiWramAccess;
-		if (ce9Wram) {
-			if (strncmp(romTid, "HND", 3) == 0 // DS Download Play
-			|| strncmp(romTid, "ADA", 3) == 0 // Diamond
-			|| strncmp(romTid, "APA", 3) == 0 // Pearl
-			|| strncmp(romTid, "Y3E", 3) == 0 // 2006-Nen 10-Gatsu Taikenban Soft
-			|| strncmp(romTid, "CPU", 3) == 0 // Platinum
-			|| strncmp(romTid, "IPK", 3) == 0 // HG
-			|| strncmp(romTid, "IPG", 3) == 0 // SS
-			) {
-				ce9Wram = false;
-			}
-		}
 		if (conf->dsiWramAccess) {
 			conf->valueBits2 |= BIT(5);
 			u32 wordBak = *(vu32*)0x03700000;
@@ -1529,12 +1516,22 @@ int loadFromSD(configuration* conf, const char *bootstrapPath) {
 						LZ77_Decompress(lz77ImageBuffer, (u8*)CARDENGINEI_ARM9_BUFFERED_LOCATION);
 					}
 					fclose(cebin);
+
+					if (!dlp && !gsdd) {
+						// Load ce9 binary (SDK 2.0)
+						cebin = fopen("nitro:/cardenginei_arm9_sdk20_dldi.lz77", "rb");
+						if (cebin) {
+							fread(lz77ImageBuffer, 1, sizeof_lz77ImageBuffer, cebin);
+							LZ77_Decompress(lz77ImageBuffer, (u8*)CARDENGINEI_ARM9_BUFFERED_LOCATION2);
+						}
+						fclose(cebin);
+					}
 				} else {
-					const char* ce9Path = ce9Wram ? "nitro:/cardenginei_arm9.lz77" : "nitro:/cardenginei_arm9_alt.lz77";
+					const char* ce9Path = "nitro:/cardenginei_arm9.lz77";
 					if (dlp) {
 						ce9Path = "nitro:/cardenginei_arm9_dlp.lz77";
 					} else if (gsdd) {
-						ce9Path = ce9Wram ? "nitro:/cardenginei_arm9_gsdd.lz77" : "nitro:/cardenginei_arm9_gsdd_alt.lz77";
+						ce9Path = "nitro:/cardenginei_arm9_gsdd.lz77";
 					}
 
 					// Load ce9 binary
@@ -1545,9 +1542,9 @@ int loadFromSD(configuration* conf, const char *bootstrapPath) {
 					}
 					fclose(cebin);
 
-					if (!ce9Wram && !dlp && !gsdd) {
-						// Load ce9 binary (alt 2)
-						cebin = fopen("nitro:/cardenginei_arm9_alt2.lz77", "rb");
+					if (!dlp && !gsdd) {
+						// Load ce9 binary (SDK 2.0)
+						cebin = fopen("nitro:/cardenginei_arm9_sdk20.lz77", "rb");
 						if (cebin) {
 							fread(lz77ImageBuffer, 1, sizeof_lz77ImageBuffer, cebin);
 							LZ77_Decompress(lz77ImageBuffer, (u8*)CARDENGINEI_ARM9_BUFFERED_LOCATION2);

retail/bootloaderi/include/dldi_patcher.h

@@ -27,6 +27,6 @@
 
 typedef signed int addr_t;
 typedef unsigned char data_t;
-bool dldiPatchBinary (data_t *binData, u32 binSize);
+bool dldiPatchBinary (data_t *binData, u32 binSize, data_t *binDataWram);
 
 #endif // DLDI_PATCHER_H

retail/bootloaderi/source/arm7/dldi_patcher.c

@@ -97,7 +97,7 @@ static const data_t dldiMagicString[] = "\xED\xA5\x8D\xBF Chishm";	// Normal DLD
 
 extern const u32 __myio_dldi;
 
-bool dldiPatchBinary (data_t *binData, u32 binSize) {
+bool dldiPatchBinary (data_t *binData, u32 binSize, data_t *binDataWram) {
 
 	addr_t memOffset;			// Offset of DLDI after the file is loaded into memory
 	addr_t patchOffset;			// Position of patch destination in the file
@@ -133,9 +133,14 @@ bool dldiPatchBinary (data_t *binData, u32 binSize) {
 
 	dldiFileSize = 1 << pDH[DO_driverSize];
 
-	memOffset = readAddr (pAH, DO_text_start);
-	if (memOffset == 0) {
-			memOffset = readAddr (pAH, DO_startup) - DO_code;
+	if (binDataWram) {
+		pAH = binDataWram;
+		memOffset = (addr_t)binDataWram;
+	} else {
+		memOffset = readAddr (pAH, DO_text_start);
+		if (memOffset == 0) {
+				memOffset = readAddr (pAH, DO_startup) - DO_code;
+		}
 	}
 	ddmemOffset = readAddr (pDH, DO_text_start);
 	relocationOffset = memOffset - ddmemOffset;
@@ -167,7 +172,7 @@ bool dldiPatchBinary (data_t *binData, u32 binSize) {
 	writeAddr (pAH, DO_shutdown, readAddr (pAH, DO_shutdown) + relocationOffset);
 
 	// Put the correct DLDI magic string back into the DLDI header
-	tonccpy (pAH, dldiMagicString, sizeof (dldiMagicString));
+	// tonccpy (pAH, dldiMagicString, sizeof (dldiMagicString));
 
 	if (pDH[DO_fixSections] & FIX_ALL) { 
 		// Search through and fix pointers within the data section of the file
@@ -201,6 +206,11 @@ bool dldiPatchBinary (data_t *binData, u32 binSize) {
 		toncset (&pAH[readAddr(pDH, DO_bss_start) - ddmemStart] , 0, readAddr(pDH, DO_bss_end) - readAddr(pDH, DO_bss_start));
 	}*/
 
+	if (binDataWram) {
+		data_t* pAH2 = &(binData[patchOffset]);
+		tonccpy (pAH2, pAH, DO_code);
+	}
+
 	return true;
 }
 #endif

retail/bootloaderi/source/arm7/main.arm7.c

@@ -133,6 +133,8 @@ extern u8 romRead_LED;
 extern u8 dmaRomRead_LED;
 extern u8 soundFreq;
 
+extern u8 _io_dldi_size;
+
 bool useTwlCfg = false;
 u8 twlCfgCountry = 0;
 int twlCfgLang = 0;
@@ -2096,9 +2098,9 @@ int arm7_main(void) {
 
 		// dbg_printf("Trying to patch the card...\n");
 
-		u16 ce9size = 0;
+		const u16 ce9size = 0x8000;
 		ce7Location = *(u32*)CARDENGINEI_ARM7_BUFFERED_LOCATION;
-		u32 ce7Size = 0x11C00;
+		u32 ce7Size = 0x13400;
 
 		const bool useSdk5ce7 = (isSdk5(moduleParams) && ROMsupportsDsiMode(&dsiHeaderTemp.ndshdr) && dsiModeConfirmed);
 		if (useSdk5ce7) {
@@ -2133,7 +2135,7 @@ int arm7_main(void) {
 
 		tonccpy((u32*)ce7Location, (u32*)CARDENGINEI_ARM7_BUFFERED_LOCATION, ce7Size);
 		if (gameOnFlashcard || saveOnFlashcard) {
-			if (!dldiPatchBinary((data_t*)ce7Location, ce7Size-0x400)) {
+			if (!dldiPatchBinary((data_t*)ce7Location, ce7Size-0x400, 0)) {
 				dbg_printf("ce7 DLDI patch failed\n");
 				errorOutput();
 			}
@@ -2149,33 +2151,22 @@ int arm7_main(void) {
 
 		if (ROMsupportsDsiMode(ndsHeader) && dsiModeConfirmed) {
 			ce9Location = *(u32*)CARDENGINEI_ARM9_SDK5_BUFFERED_LOCATION;
-			ce9size = 0x7800;
 			tonccpy((u32*)ce9Location, (u32*)CARDENGINEI_ARM9_SDK5_BUFFERED_LOCATION, ce9size);
-			if (gameOnFlashcard) {
-				if (!dldiPatchBinary((data_t*)ce9Location, ce9size)) {
-					dbg_printf("ce9 DLDI patch failed\n");
-					errorOutput();
-				}
-			}
-		} else if (gameOnFlashcard) {
-			ce9Location = CARDENGINEI_ARM9_LOCATION_DSI_WRAM;
-			ce9size = 0x7000;
-			tonccpy((u32*)CARDENGINEI_ARM9_LOCATION_DSI_WRAM, (u32*)CARDENGINEI_ARM9_BUFFERED_LOCATION, ce9size);
-			if (!dldiPatchBinary((data_t*)ce9Location, ce9size)) {
-				dbg_printf("ce9 DLDI patch failed\n");
-				errorOutput();
-			}
 		} else {
-			const bool ce9DsiWram = (*(u32*)CARDENGINEI_ARM9_BUFFERED_LOCATION == CARDENGINEI_ARM9_LOCATION_DSI_WRAM);
-			const u32* ce9Src = (u32*)((!ce9DsiWram && !laterSdk) ? CARDENGINEI_ARM9_BUFFERED_LOCATION2 : CARDENGINEI_ARM9_BUFFERED_LOCATION);
+			const u32* ce9Src = (u32*)(!laterSdk ? CARDENGINEI_ARM9_BUFFERED_LOCATION2 : CARDENGINEI_ARM9_BUFFERED_LOCATION);
 			ce9Location = *ce9Src;
-			ce9size = 0x5000;
 			tonccpy((u32*)ce9Location, ce9Src, ce9size);
 		}
+		if (gameOnFlashcard) {
+			if (!dldiPatchBinary((data_t*)ce9Location, ce9size, (data_t*)((ROMsupportsDsiMode(ndsHeader) && dsiModeConfirmed && _io_dldi_size < 0xF) ? ce9Location+0x3800 : CARDENGINEI_ARM9_LOCATION_DSI_WRAM))) {
+				dbg_printf("ce9 DLDI patch failed\n");
+				errorOutput();
+			}
+		}
 		patchHiHeapPointer(moduleParams, ndsHeader);
 
 		toncset((u32*)CARDENGINEI_ARM9_BUFFERED_LOCATION, 0, 0x10000);
-		toncset((u32*)CARDENGINEI_ARM7_BUFFERED_LOCATION, 0, 0x11C00);
+		toncset((u32*)CARDENGINEI_ARM7_BUFFERED_LOCATION, 0, 0x13400);
 
 		errorCode = patchCardNds(
 			(cardengineArm7*)ce7Location,

retail/bootloaderi/source/arm7/my_dldi.s

@@ -24,6 +24,7 @@
 	.arm
 	.global __mydldi_start
 	.global __myio_dldi
+	.global _io_dldi_size
 @---------------------------------------------------------------------------------
 .equ FEATURE_MEDIUM_CANREAD,		0x00000001
 .equ FEATURE_MEDIUM_CANWRITE,		0x00000002
@@ -43,6 +44,7 @@ __mydldi_start:
 #endif
 	.asciz	" Chishm"		@ Identifying Magic string (8 bytes with null terminator)
 	.byte	0x01			@ Version number
+_io_dldi_size:
 	.byte	0x0f		@ 32KiB	@ Log [base-2] of the size of this driver in bytes.
 	.byte	0x00			@ Sections to fix
 	.byte 	0x0f		@ 32KiB	@ Log [base-2] of the allocated space in bytes.

retail/cardenginei/arm7/cardengine.ld.in

@@ -6,7 +6,7 @@ OUTPUT_ARCH(arm)
 
 MEMORY {
 
-	vram	: ORIGIN = CARDENGINEI_ARM7_LOCATION, LENGTH = 70K /* WRAM A */
+	vram	: ORIGIN = CARDENGINEI_ARM7_LOCATION, LENGTH = 76K /* WRAM A */
 }
 
 __vram_start	=	ORIGIN(vram);

retail/cardenginei/arm7/source/cardengine.c

@@ -224,7 +224,7 @@ static void unlaunchSetFilename(bool boot) {
 			#ifdef TWLSDK
 			*(u8*)(0x02000838+i2) = *(u8*)(ce7+0x8400+i);		// Unlaunch Device:/Path/Filename.ext (16bit Unicode,end by 0000h)
 			#else
-			*(u8*)(0x02000838+i2) = *(u8*)(ce7+0x11800+i);	// Unlaunch Device:/Path/Filename.ext (16bit Unicode,end by 0000h)
+			*(u8*)(0x02000838+i2) = *(u8*)(ce7+0x13000+i);	// Unlaunch Device:/Path/Filename.ext (16bit Unicode,end by 0000h)
 			#endif
 			i2 += 2;
 		}
@@ -262,9 +262,9 @@ static void readSrBackendId(void) {
 	*(u32*)(0x02000314) = *(u32*)(ce7+0x8504);
 	*(u32*)(0x02000318) = /* *(u32*)(ce7+0x8504) == 0x00030000 ? 0x13 : */ 0x17;
 	#else
-	*(u32*)(0x02000310) = *(u32*)(ce7+0x11900);
-	*(u32*)(0x02000314) = *(u32*)(ce7+0x11904);
-	*(u32*)(0x02000318) = /* *(u32*)(ce7+0x11904) == 0x00030000 ? 0x13 : */ 0x17;
+	*(u32*)(0x02000310) = *(u32*)(ce7+0x13100);
+	*(u32*)(0x02000314) = *(u32*)(ce7+0x13104);
+	*(u32*)(0x02000318) = /* *(u32*)(ce7+0x13104) == 0x00030000 ? 0x13 : */ 0x17;
 	#endif
 	*(u32*)(0x0200031C) = 0;
 	*(u16*)(0x02000306) = swiCRC16(0xFFFF, (void*)0x02000308, 0x18);
@@ -466,9 +466,9 @@ void reset(void) {
 		*(u32*)0x02000000 = BIT(3);
 		*(u32*)0x02000004 = 0x54455352; // 'RSET'
 		if (consoleModel < 2) {
-			(*(u32*)(ce7+0x11900) == 0 && (valueBits & b_dsiSD)) ? unlaunchSetFilename(false) : unlaunchSetHiyaFilename();
+			(*(u32*)(ce7+0x13100) == 0 && (valueBits & b_dsiSD)) ? unlaunchSetFilename(false) : unlaunchSetHiyaFilename();
 		}
-		if (*(u32*)(ce7+0x11900) == 0 && (valueBits & b_dsiSD)) {
+		if (*(u32*)(ce7+0x13100) == 0 && (valueBits & b_dsiSD)) {
 			tonccpy((u32*)0x02000300, sr_data_srloader, 0x20);
 		} else {
 			// Use different SR backend ID
@@ -768,7 +768,7 @@ void forceGameReboot(void) {
 			#ifdef TWLSDK
 			(*(u32*)(ce7+0x8500) == 0) ? unlaunchSetFilename(false) : unlaunchSetHiyaFilename();
 			#else
-			(*(u32*)(ce7+0x11900) == 0) ? unlaunchSetFilename(false) : unlaunchSetHiyaFilename();
+			(*(u32*)(ce7+0x13100) == 0) ? unlaunchSetFilename(false) : unlaunchSetHiyaFilename();
 			#endif
 		}
 		waitFrames(5);							// Wait for DSi screens to stabilize
@@ -784,7 +784,7 @@ void forceGameReboot(void) {
 	//if (doBak) restoreSdBakData();
 	if (*(u32*)(ce7+0x8500) == 0 && (valueBits & b_dsiSD))
 	#else
-	if (*(u32*)(ce7+0x11900) == 0 && (valueBits & b_dsiSD))
+	if (*(u32*)(ce7+0x13100) == 0 && (valueBits & b_dsiSD))
 	#endif
 	{
 		tonccpy((u32*)0x02000300, sr_data_srloader, 0x20);
@@ -933,18 +933,18 @@ void returnToLoader(bool reboot) {
 #else
 	IPC_SendSync(0x8);
 	if (consoleModel >= 2) {
-		if (*(u32*)(ce7+0x11900) == 0 && (valueBits & b_dsiSD))
+		if (*(u32*)(ce7+0x13100) == 0 && (valueBits & b_dsiSD))
 		{
 			tonccpy((u32*)0x02000300, sr_data_srloader, 0x020);
 		}
-		else if (*(char*)(ce7+0x11903) == 'H' || *(char*)(ce7+0x11903) == 'K')
+		else if (*(char*)(ce7+0x13103) == 'H' || *(char*)(ce7+0x13103) == 'K')
 		{
 			// Use different SR backend ID
 			readSrBackendId();
 		}
 		waitFrames(1);
 	} else {
-		if (*(u32*)(ce7+0x11900) == 0 && (valueBits & b_dsiSD))
+		if (*(u32*)(ce7+0x13100) == 0 && (valueBits & b_dsiSD))
 		{
 			unlaunchSetFilename(true);
 		} else {

retail/cardenginei/arm7/source/my_dldi.s

@@ -42,13 +42,13 @@ __mydldi_start:
 #ifdef TWLSDK
 	.byte	0x0d		@ 8KiB	@ Log [base-2] of the size of this driver in bytes.
 #else
-	.byte	0x0e		@ 16KiB	@ Log [base-2] of the size of this driver in bytes.
+	.byte	0x0f		@ 32KiB	@ Log [base-2] of the size of this driver in bytes.
 #endif
 	.byte	0x00			@ Sections to fix
 #ifdef TWLSDK
 	.byte 	0x0d		@ 8KiB	@ Log [base-2] of the allocated space in bytes.
 #else
-	.byte 	0x0e		@ 16KiB	@ Log [base-2] of the allocated space in bytes.
+	.byte 	0x0f		@ 32KiB	@ Log [base-2] of the allocated space in bytes.
 #endif
 
 @---------------------------------------------------------------------------------
@@ -100,7 +100,7 @@ _DLDI_shutdown:
 #ifdef TWLSDK
 	.space (__mydldi_start + 8192) - .	@ Fill to 8KiB
 #else
-	.space (__mydldi_start + 16384) - .	@ Fill to 16KiB
+	.space (__mydldi_start + 32768) - .	@ Fill to 32KiB
 #endif
 
 _dldi_end:

retail/cardenginei/arm7_alt/cardengine.ld.in

@@ -6,7 +6,7 @@ OUTPUT_ARCH(arm)
 
 MEMORY {
 
-	vram	: ORIGIN = CARDENGINEI_ARM7_LOCATION_ALT, LENGTH = 70K /* WRAM A */
+	vram	: ORIGIN = CARDENGINEI_ARM7_LOCATION_ALT, LENGTH = 76K /* WRAM A */
 }
 
 __vram_start	=	ORIGIN(vram);