Small boot cleanup (#1475)

include/carthandle.h

@@ -0,0 +1,8 @@
+#ifndef CARTHANDLE_H
+#define CARTHANDLE_H
+
+#include "ultra64.h"
+
+extern OSPiHandle* gCartHandle;
+
+#endif

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;

spec

@@ -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"

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"

src/boot/carthandle.c

@@ -0,0 +1,3 @@
+#include "carthandle.h"
+
+OSPiHandle* gCartHandle = NULL;

src/boot/viconfig.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "libc/stdbool.h"
 #include "idle.h"
 
 void ViConfig_UpdateVi(u32 black) {

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;

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",