- Reinitialize EXIRegs in reload stub.

emukidid · Feb 15, 2024 · 38e42b5 · 38e42b5
1 parent acd0805
commit 38e42b5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/cube/patches/stub/main.c b/cube/patches/stub/main.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (c) 2020-2021, Extrems <extrems@extremscorner.org>
+ * Copyright (c) 2020-2024, Extrems <extrems@extremscorner.org>
  * 
  * This file is part of Swiss.
  * 
@@ -26,7 +26,7 @@
 #include "eltorito.h"
 #include "pff.h"
 
-volatile uint32_t(*EXIRegs)[5] = (volatile uint32_t(*)[5])0x0C006800;
+volatile uint32_t(*EXIRegs)[5] = EXI;
 
 void run(void (*entry)(void));
 
@@ -36,8 +36,6 @@ void dly_us(UINT n)
 	while (OSDiffTick(OSGetTick(), start) < OSMicrosecondsToTicks(n));
 }
 
-uint32_t dvd_read(void *address, uint32_t length, uint32_t offset);
-
 static bool memeq(const void *a, const void *b, size_t size)
 {
 	const uint8_t *x = a;
@@ -51,6 +49,8 @@ static bool memeq(const void *a, const void *b, size_t size)
 	return true;
 }
 
+uint32_t dvd_read(void *address, uint32_t length, uint32_t offset);
+
 static void dvd_load(uint32_t offset)
 {
 	DOLImage image __attribute((aligned(32)));
@@ -142,6 +142,7 @@ static void pf_load(const char *path)
 void pf_main(void)
 {
 	FATFS fs;
+	EXIRegs = EXI;
 
 	for (int chan = 0; chan < EXI_CHANNEL_MAX; chan++, EXIRegs++) {
 		if (pf_mount(&fs) == FR_OK) {

diff --git a/cube/patches/stub/reboot.ld b/cube/patches/stub/reboot.ld
@@ -6,3 +6,5 @@ SECTIONS
 {
 	. = 0x01300000;
 }
+
+EXI = 0x0C006800;
diff --git a/cube/patches/stub/stub.ld b/cube/patches/stub/stub.ld
@@ -6,3 +6,5 @@ SECTIONS
 {
 	. = 0x00001800;
 }
+
+EXI = 0x0C006800;