summaryrefslogtreecommitdiff
path: root/include/padmgr.h
diff options
context:
space:
mode:
authorAnghelo Carvajal <angheloalf95@gmail.com>2023-09-02 15:34:29 -0400
committerGitHub <noreply@github.com>2023-09-02 15:34:29 -0400
commit4fa13e4132cf8adb2f07bb34927e62e525c8cc79 (patch)
tree5f00c923350f9386a7f46b0c50b888c878d7eacf /include/padmgr.h
parent9cceea48f31bdeea1c2933a1f64a74b60b80f17a (diff)
Move libultra function declarations to libultra headers (#1196)
* Delete unused headers * Move PR and io to ultra64 * move headers to ultra64 * more cleanups * more reorganizing * i think that should be all * format * ifdef guards cleanup * Add IO_READ and IO_WRITE macros for future use * warnings * review Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com> * warnings again * warn * ifdef guards * fix merge * fix merge * fix merge * bss * padutils.h * bss * bss * bss * fix merge * bss * bss * bss * fix merge * fixes * fixes * bss * bss * fix merge * fix * fix * fix includepaths * fix paths * bss * fix * ultra64/ -> PR/ * header guards * fix ehader guards * fix * fix++ * format * bss is borken * prevent 2 * :despair: * bss * rename assert to dbg_hungup * fix * a * fix * bss * fix * bss * bss --------- Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Diffstat (limited to 'include/padmgr.h')
-rw-r--r--include/padmgr.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/include/padmgr.h b/include/padmgr.h
index 7cb3cc800..59157dd81 100644
--- a/include/padmgr.h
+++ b/include/padmgr.h
@@ -2,15 +2,9 @@
#define PADMGR_H
#include "libc/stdbool.h"
-#include "io/controller.h"
+#include "ultra64.h"
#include "irqmgr.h"
-
-typedef struct Input {
- /* 0x00 */ OSContPad cur;
- /* 0x06 */ OSContPad prev;
- /* 0x0C */ OSContPad press; // X/Y store delta from last frame
- /* 0x12 */ OSContPad rel; // X/Y store adjusted
-} Input; // size = 0x18
+#include "padutils.h"
typedef enum {
/* 0 */ PADMGR_CONT_NONE,