change everything to use a common types file

3 files changed, 21 insertions, 18 deletions

diff --git a/include/rvl/NdevExi2AD/DebuggerDriver.h b/include/rvl/NdevExi2AD/DebuggerDriver.h
index 38892315..be907319 100644
--- a/include/rvl/NdevExi2AD/DebuggerDriver.h
+++ b/include/rvl/NdevExi2AD/DebuggerDriver.h
@@ -2,24 +2,24 @@
 #define RVL_SDK_NDEV_EXI2_AD_DEBUGGER_DRIVER_H
 #include "rvl/NdevExi2AD/exi2.h"
 #include "rvl/OS.h"
-#include "rvl/types.h"
+#include <common.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-void DBInitComm(u8** flagOut, OSInterruptHandler handler);
+void DBInitComm(u8 **flagOut, OSInterruptHandler handler);
 void DBInitInterrupts(void);
 u32 DBQueryData(void);
-BOOL DBRead(void* dst, u32 size);
-BOOL DBWrite(const void* src, u32 size);
+BOOL DBRead(void *dst, u32 size);
+BOOL DBWrite(const void *src, u32 size);
 void DBOpen(void);
 void DBClose(void);
 
-static inline BOOL __DBReadMailbox(u32* mailOut) {
+static inline BOOL __DBReadMailbox(u32 *mailOut) {
     return __DBEXIReadReg(0x34000200, mailOut, sizeof(*mailOut));
 }
 
-static inline BOOL __DBRead(u32 ofs, void* dest, u32 size) {
+static inline BOOL __DBRead(u32 ofs, void *dest, u32 size) {
     return __DBEXIReadRam(((ofs + 0xD10000) * 0x40) & 0x3FFFFF00, dest, size);
 }
 
@@ -27,9 +27,8 @@ static inline BOOL __DBWriteMailbox(u32 mail) {
     return __DBEXIWriteReg(0xB4000100, &mail, sizeof(mail));
 }
 
-static inline BOOL __DBWrite(u32 ofs, const void* src, u32 size) {
-    return __DBEXIWriteRam(
-        (((ofs + 0xD10000) * 0x40) & 0x3FFFFF00) | 0x80000000, src, size);
+static inline BOOL __DBWrite(u32 ofs, const void *src, u32 size) {
+    return __DBEXIWriteRam((((ofs + 0xD10000) * 0x40) & 0x3FFFFF00) | 0x80000000, src, size);
 }
 
 #ifdef __cplusplus
diff --git a/include/rvl/NdevExi2AD/ODEMU.h b/include/rvl/NdevExi2AD/ODEMU.h
index 1f77ab31..8de6ddb7 100644
--- a/include/rvl/NdevExi2AD/ODEMU.h
+++ b/include/rvl/NdevExi2AD/ODEMU.h
@@ -1,6 +1,6 @@
 #ifndef RVL_SDK_NDEV_EXI2_AD_ODEMU_H
 #define RVL_SDK_NDEV_EXI2_AD_ODEMU_H
-#include "rvl/types.h"
+#include <common.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -9,7 +9,9 @@ static inline u32 ODEMUGenMailData(u32 ofs, u32 size) {
     return (ofs & 0xff) << 0x10 | 0x1f000000 | size & 0x1fff;
 }
 
-static inline u32 ODEMUGetPage(u32 mail) { return (mail & 0xFF0000) >> 16; }
+static inline u32 ODEMUGetPage(u32 mail) {
+    return (mail & 0xFF0000) >> 16;
+}
 
 static inline u32 ODEMUGetPc2NngcOffset(u32 mail) {
     if (!(ODEMUGetPage(mail) & 0x1)) {
@@ -23,7 +25,9 @@ static inline BOOL ODEMUIsValidMail(u32 mail) {
     return (mail & 0x1F000000) == 0x1F000000;
 }
 
-static inline u32 ODEMUGetSize(u32 mail) { return mail & 0x1FFF; }
+static inline u32 ODEMUGetSize(u32 mail) {
+    return mail & 0x1FFF;
+}
 
 #ifdef __cplusplus
 }
diff --git a/include/rvl/NdevExi2AD/exi2.h b/include/rvl/NdevExi2AD/exi2.h
index 64eed826..d240bce3 100644
--- a/include/rvl/NdevExi2AD/exi2.h
+++ b/include/rvl/NdevExi2AD/exi2.h
@@ -1,16 +1,16 @@
 #ifndef RVL_SDK_NDEV_EXI2_AD_EXI2_H
 #define RVL_SDK_NDEV_EXI2_AD_EXI2_H
-#include "rvl/types.h"
+#include <common.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-BOOL __EXI2Imm(void* mem, s32 size, u32 type);
+BOOL __EXI2Imm(void *mem, s32 size, u32 type);
 void __DBEXIInit(void);
-BOOL __DBEXIReadReg(u32 cmd, void* mem, s32 size);
-BOOL __DBEXIWriteReg(u32 cmd, const void* mem, s32 size);
-BOOL __DBEXIReadRam(u32 cmd, void* mem, s32 size);
-BOOL __DBEXIWriteRam(u32 cmd, const void* mem, s32 size);
+BOOL __DBEXIReadReg(u32 cmd, void *mem, s32 size);
+BOOL __DBEXIWriteReg(u32 cmd, const void *mem, s32 size);
+BOOL __DBEXIReadRam(u32 cmd, void *mem, s32 size);
+BOOL __DBEXIWriteRam(u32 cmd, const void *mem, s32 size);
 
 #ifdef __cplusplus
 }