summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDragorn421 <Dragorn421@users.noreply.github.com>2024-11-08 02:27:19 +0100
committerGitHub <noreply@github.com>2024-11-07 17:27:19 -0800
commitfcc5cf828ded5d362b2e63a8868374a50df405ed (patch)
tree530d7d6d8690599593f6588b04d10441e364b5c7 /include
parent9cd9099a0431b369be39f111bf57051f544bead3 (diff)
libu64 (#1705)
* libu64 * libu64 -O2 * Add libu64.md
Diffstat (limited to 'include')
-rw-r--r--include/libu64/debug.h (renamed from include/debug.h)4
-rw-r--r--include/libu64/gfxprint.h (renamed from include/gfxprint.h)4
-rw-r--r--include/libu64/loadfragment.h (renamed from include/loadfragment.h)4
-rw-r--r--include/libu64/pad.h (renamed from include/padutils.h)4
-rw-r--r--include/libu64/padsetup.h8
-rw-r--r--include/libu64/stackcheck.h (renamed from include/stackcheck.h)4
-rw-r--r--include/libu64/system_heap.h (renamed from include/system_heap.h)4
-rw-r--r--include/padmgr.h3
-rw-r--r--include/z64.h4
-rw-r--r--include/z64actor.h2
-rw-r--r--include/z64game.h2
11 files changed, 25 insertions, 18 deletions
diff --git a/include/debug.h b/include/libu64/debug.h
index 96d3d11c7..5bcae690c 100644
--- a/include/debug.h
+++ b/include/libu64/debug.h
@@ -1,5 +1,5 @@
-#ifndef DEBUG_H
-#define DEBUG_H
+#ifndef LIBU64_DEBUG_H
+#define LIBU64_DEBUG_H
void _dbg_hungup(const char* file, int lineNum);
void Reset(void);
diff --git a/include/gfxprint.h b/include/libu64/gfxprint.h
index bcd61221b..78819151e 100644
--- a/include/gfxprint.h
+++ b/include/libu64/gfxprint.h
@@ -1,5 +1,5 @@
-#ifndef GFXPRINT_H
-#define GFXPRINT_H
+#ifndef LIBU64_GFXPRINT_H
+#define LIBU64_GFXPRINT_H
#include "ultra64.h"
diff --git a/include/loadfragment.h b/include/libu64/loadfragment.h
index 642db25d6..7a3e5a7d9 100644
--- a/include/loadfragment.h
+++ b/include/libu64/loadfragment.h
@@ -1,5 +1,5 @@
-#ifndef LOADFRAGMENT_H
-#define LOADFRAGMENT_H
+#ifndef LIBU64_LOADFRAGMENT_H
+#define LIBU64_LOADFRAGMENT_H
#include "PR/ultratypes.h"
#include "stdint.h"
diff --git a/include/padutils.h b/include/libu64/pad.h
index 77d3dc1cd..db9e6e419 100644
--- a/include/padutils.h
+++ b/include/libu64/pad.h
@@ -1,5 +1,5 @@
-#ifndef PADUTILS_H
-#define PADUTILS_H
+#ifndef LIBU64_PAD_H
+#define LIBU64_PAD_H
#include "PR/os_cont.h"
diff --git a/include/libu64/padsetup.h b/include/libu64/padsetup.h
new file mode 100644
index 000000000..0aab4a729
--- /dev/null
+++ b/include/libu64/padsetup.h
@@ -0,0 +1,8 @@
+#ifndef LIBU64_PADSETUP_H
+#define LIBU64_PADSETUP_H
+
+#include "ultra64.h"
+
+s32 PadSetup_Init(OSMesgQueue* mq, u8* outMask, OSContStatus* status);
+
+#endif
diff --git a/include/stackcheck.h b/include/libu64/stackcheck.h
index aeb55df28..7bf5b78fb 100644
--- a/include/stackcheck.h
+++ b/include/libu64/stackcheck.h
@@ -1,5 +1,5 @@
-#ifndef STACKCHECK_H
-#define STACKCHECK_H
+#ifndef LIBU64_STACKCHECK_H
+#define LIBU64_STACKCHECK_H
#include "ultra64.h"
diff --git a/include/system_heap.h b/include/libu64/system_heap.h
index df572b82b..7f8aa9d7e 100644
--- a/include/system_heap.h
+++ b/include/libu64/system_heap.h
@@ -1,5 +1,5 @@
-#ifndef SYSTEM_HEAP_H
-#define SYSTEM_HEAP_H
+#ifndef LIBU64_SYSTEM_HEAP_H
+#define LIBU64_SYSTEM_HEAP_H
#include "stddef.h"
#include "PR/ultratypes.h"
diff --git a/include/padmgr.h b/include/padmgr.h
index a012f1450..4f5dac3b3 100644
--- a/include/padmgr.h
+++ b/include/padmgr.h
@@ -6,7 +6,7 @@
#include "stdbool.h"
#include "irqmgr.h"
-#include "padutils.h"
+#include "libu64/pad.h"
typedef enum {
/* 0 */ PADMGR_CONT_NONE,
@@ -54,7 +54,6 @@ typedef struct PadMgr {
// Initialization
-s32 PadSetup_Init(OSMesgQueue* mq, u8* outMask, OSContStatus* status);
void PadMgr_Init(OSMesgQueue* siEvtQ, IrqMgr* irqMgr, OSId threadId, OSPri pri, void* stack);
// Fetching inputs
diff --git a/include/z64.h b/include/z64.h
index 30cf75ed4..9d85ddfab 100644
--- a/include/z64.h
+++ b/include/z64.h
@@ -16,13 +16,13 @@
#include "controller.h"
#include "gfx.h"
#include "gfx_setupdl.h"
-#include "gfxprint.h"
+#include "libu64/gfxprint.h"
#include "ichain.h"
#include "irqmgr.h"
#include "main.h"
#include "message_data_static.h"
#include "padmgr.h"
-#include "padutils.h"
+#include "libu64/pad.h"
#include "rand.h"
#include "regs.h"
#include "scheduler.h"
diff --git a/include/z64actor.h b/include/z64actor.h
index 0fe152ede..47f0c5506 100644
--- a/include/z64actor.h
+++ b/include/z64actor.h
@@ -4,7 +4,7 @@
#include "PR/ultratypes.h"
#include "stdbool.h"
#include "color.h"
-#include "padutils.h"
+#include "libu64/pad.h"
#include "z64actor_dlftbls.h"
#include "z64math.h"
#include "z64animation.h"
diff --git a/include/z64game.h b/include/z64game.h
index c581ec1ac..21d314c7e 100644
--- a/include/z64game.h
+++ b/include/z64game.h
@@ -7,7 +7,7 @@
#include "stdint.h"
#include "gamealloc.h"
#include "padmgr.h"
-#include "padutils.h"
+#include "libu64/pad.h"
#include "romfile.h"
#include "tha.h"
#include "unk.h"