summaryrefslogtreecommitdiff
path: root/src/boot
diff options
context:
space:
mode:
authorDerek Hensley <hensley.derek58@gmail.com>2024-06-14 21:47:24 -0700
committerGitHub <noreply@github.com>2024-06-14 21:47:24 -0700
commit3705eaedac1d21318ee708993d366b30cdc0e8ad (patch)
treecd56b6eaa2e9f1ce8ab7d1a945f25b74e4b4c766 /src/boot
parent0b375cadb0af6f2d95844cc674f84be0b148ae10 (diff)
Small general cleanup (#1644)
* m2ctx.py * check warnings * vimode includes * bgcheck includes * padmgr includes * sprintf * z_std_dma * sys_ucode * z64voice * z64lib * z64effect_ss * segment_symbols.h * padutils * main * stdarg.h * fault * bzero * undefined_syms * z64rumble
Diffstat (limited to 'src/boot')
-rw-r--r--src/boot/O2/padutils.c2
-rw-r--r--src/boot/libc64/sprintf.c3
-rw-r--r--src/boot/z_std_dma.c1
3 files changed, 5 insertions, 1 deletions
diff --git a/src/boot/O2/padutils.c b/src/boot/O2/padutils.c
index 76bf91c0c..8460bc007 100644
--- a/src/boot/O2/padutils.c
+++ b/src/boot/O2/padutils.c
@@ -1,5 +1,7 @@
#include "padutils.h"
+#include "PR/os_libc.h"
+
void PadUtils_Init(Input* input) {
bzero(input, sizeof(Input));
}
diff --git a/src/boot/libc64/sprintf.c b/src/boot/libc64/sprintf.c
index 58f248414..a2cb2a7e1 100644
--- a/src/boot/libc64/sprintf.c
+++ b/src/boot/libc64/sprintf.c
@@ -1,5 +1,6 @@
#include "libc64/sprintf.h"
+#include "stdint.h"
#include "string.h"
void* proutPrintf(void* dst, const char* fmt, size_t size) {
@@ -20,7 +21,7 @@ int sprintf(char* dst, const char* fmt, ...) {
va_list args;
va_start(args, fmt);
- ans = _Printf(&proutPrintf, dst, fmt, args);
+ ans = _Printf(proutPrintf, dst, fmt, args);
if (ans > -1) {
dst[ans] = 0;
}
diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c
index 71e64ad69..8e68eafff 100644
--- a/src/boot/z_std_dma.c
+++ b/src/boot/z_std_dma.c
@@ -18,6 +18,7 @@
* There are some additional provisions to ensure that audio DMA is particularly high-speed, the audio data is assumed
* to be uncompressed and the request queue and address translation is skipped.
*/
+#include "prevent_bss_reordering.h"
#include "z64dma.h"
#include "carthandle.h"