Bug fix

DS-Homebrew · Nov 11, 2024 · f6de3ea · f6de3ea
1 parent 13ca33c
commit f6de3ea
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/settings/bootloader/source/boot.c b/settings/bootloader/source/boot.c
@@ -449,10 +449,12 @@ int main (void) {
 #endif
 	if (wantToPatchDLDI) {
 		toncset((u32*)0x06000000, 0, 0x8000);
-		if (*(u32*)0x02FF4184 == 0x69684320) { // DLDI ' Chi' string + bootloader in DLDI driver space
+		if (*(u32*)0x02FF4184 == 0x69684320) { // DLDI ' Chi' string in bootstub space + bootloader in DLDI driver space
 			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);

diff --git a/title/bootloader/source/boot.c b/title/bootloader/source/boot.c
@@ -637,10 +637,12 @@ int main (void) {
 #endif
 	if (wantToPatchDLDI) {
 		toncset((u32*)0x06000000, 0, 0x8000);
-		if (*(u32*)0x02FF4184 == 0x69684320) { // DLDI ' Chi' string + bootloader in DLDI driver space
+		if (*(u32*)0x02FF4184 == 0x69684320) { // DLDI ' Chi' string in bootstub space + bootloader in DLDI driver space
 			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);

diff --git a/universal/bootloader_app/source/boot.c b/universal/bootloader_app/source/boot.c
@@ -390,10 +390,12 @@ int main (void) {
 #endif
 	if (wantToPatchDLDI) {
 		toncset((u32*)0x06000000, 0, 0x8000);
-		if (*(u32*)0x02FF4184 == 0x69684320) { // DLDI ' Chi' string + bootloader in DLDI driver space
+		if (*(u32*)0x02FF4184 == 0x69684320) { // DLDI ' Chi' string in bootstub space + bootloader in DLDI driver space
 			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);

diff --git a/universal/bootloader_menu/source/boot.c b/universal/bootloader_menu/source/boot.c
@@ -581,10 +581,12 @@ int main (void) {
 #endif
 	if (wantToPatchDLDI) {
 		toncset((u32*)0x06000000, 0, 0x8000);
-		if (*(u32*)0x02FF4184 == 0x69684320) { // DLDI ' Chi' string + bootloader in DLDI driver space
+		if (*(u32*)0x02FF4184 == 0x69684320) { // DLDI ' Chi' string in bootstub space + bootloader in DLDI driver space
 			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);