diff options
| -rw-r--r-- | include/carthandle.h | 8 | ||||
| -rw-r--r-- | include/variables.h | 1 | ||||
| -rw-r--r-- | spec | 4 | ||||
| -rw-r--r-- | src/boot/O2/sprintf.c (renamed from src/libultra/libc/sprintf.c) | 0 | ||||
| -rw-r--r-- | src/boot/boot_main.c | 2 | ||||
| -rw-r--r-- | src/boot/carthandle.c | 3 | ||||
| -rw-r--r-- | src/boot/viconfig.c | 2 | ||||
| -rw-r--r-- | src/boot/z_std_dma.c | 2 | ||||
| -rw-r--r-- | tools/disasm/files.txt | 2 |
9 files changed, 18 insertions, 6 deletions
diff --git a/include/carthandle.h b/include/carthandle.h new file mode 100644 index 000000000..72d0821e5 --- /dev/null +++ b/include/carthandle.h @@ -0,0 +1,8 @@ +#ifndef CARTHANDLE_H +#define CARTHANDLE_H + +#include "ultra64.h" + +extern OSPiHandle* gCartHandle; + +#endif diff --git a/include/variables.h b/include/variables.h index 2b088fa0c..7b1313415 100644 --- a/include/variables.h +++ b/include/variables.h @@ -10,7 +10,6 @@ extern u16 gFramebuffer1[SCREEN_HEIGHT][SCREEN_WIDTH]; // at 0x80000500 extern u8 D_80025D00[]; // data -extern OSPiHandle* gCartHandle; extern size_t gDmaMgrDmaBuffSize; extern vs32 gIrqMgrResetStatus; extern volatile OSTime sIrqMgrResetTime; @@ -17,7 +17,7 @@ beginseg include "build/data/boot/rspboot.data.o" include "build/src/boot/idle.o" include "build/src/boot/viconfig.o" - include "build/data/boot/viconfig.data.o" + include "build/src/boot/carthandle.o" include "build/src/boot/z_std_dma.o" include "build/src/boot/yaz0.o" include "build/src/boot/irqmgr.o" @@ -42,7 +42,7 @@ beginseg include "build/src/boot/O2/system_malloc.o" include "build/src/boot/O2/rand.o" include "build/src/boot/O2/__osMalloc.o" - include "build/src/libultra/libc/sprintf.o" + include "build/src/boot/O2/sprintf.o" include "build/src/boot/O2/printutils.o" include "build/src/boot/O2/sleep.o" include "build/asm/boot/setcause.text.o" diff --git a/src/libultra/libc/sprintf.c b/src/boot/O2/sprintf.c index 773b982ff..773b982ff 100644 --- a/src/libultra/libc/sprintf.c +++ b/src/boot/O2/sprintf.c diff --git a/src/boot/boot_main.c b/src/boot/boot_main.c index cc2097f0f..0f95871ea 100644 --- a/src/boot/boot_main.c +++ b/src/boot/boot_main.c @@ -1,5 +1,5 @@ #include "prevent_bss_reordering.h" -#include "global.h" +#include "carthandle.h" #include "idle.h" #include "stack.h" #include "stackcheck.h" diff --git a/src/boot/carthandle.c b/src/boot/carthandle.c new file mode 100644 index 000000000..9a4cf542d --- /dev/null +++ b/src/boot/carthandle.c @@ -0,0 +1,3 @@ +#include "carthandle.h" + +OSPiHandle* gCartHandle = NULL; diff --git a/src/boot/viconfig.c b/src/boot/viconfig.c index ccba4e932..1b9f1135c 100644 --- a/src/boot/viconfig.c +++ b/src/boot/viconfig.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "libc/stdbool.h" #include "idle.h" void ViConfig_UpdateVi(u32 black) { diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index ac4992264..5b5265629 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -1,8 +1,10 @@ #include "prevent_bss_reordering.h" #include "global.h" +#include "carthandle.h" #include "fault.h" #include "stack.h" #include "stackcheck.h" +#include "z64dma.h" #include "z64thread.h" size_t gDmaMgrDmaBuffSize = 0x2000; diff --git a/tools/disasm/files.txt b/tools/disasm/files.txt index 23539f5f0..e170e97e3 100644 --- a/tools/disasm/files.txt +++ b/tools/disasm/files.txt @@ -247,7 +247,7 @@ # .data section 0x800969C0 : "rspboot", 0x80096B20 : "idle", - 0x80096B40 : "viconfig", + 0x80096B40 : "carthandle", 0x80096B50 : "z_std_dma", 0x80096B60 : "irqmgr", 0x80096B80 : "fault", |