move PXI function declarations from OS_reset to their respective headers

4 files changed, 29 insertions, 25 deletions

diff --git a/arm7/lib/include/PXI_fifo.h b/arm7/lib/include/PXI_fifo.h
index 6d634f72..27f6b005 100644
--- a/arm7/lib/include/PXI_fifo.h
+++ b/arm7/lib/include/PXI_fifo.h
@@ -3,4 +3,7 @@
 
 #include "nitro/PXI_fifo_shared.h"
 
+s32 PXI_SendWordByFifo(s32 fifotag, u32 data, BOOL err);
+void PXI_SetFifoRecvCallback(s32 fifotag, PXIFifoCallback callback);
+
 #endif //POKEDIAMOND_ARM7_PXI_FIFO_H
diff --git a/arm7/lib/src/OS_reset.c b/arm7/lib/src/OS_reset.c
index e0f380f8..13d59bfa 100644
--- a/arm7/lib/src/OS_reset.c
+++ b/arm7/lib/src/OS_reset.c
@@ -2,6 +2,7 @@
 #include "OS_reset.h"
 #include "OS_interrupt.h"
 #include "OS_terminate_proc.h"
+#include "PXI_fifo.h"
 
 static u16 OSi_IsInitReset = 0;
 vu16 OSi_IsResetOccurred = 0;
@@ -10,8 +11,6 @@ extern void MI_StopDma(u32 dma);
 extern OSIrqMask OS_SetIrqMask(OSIrqMask mask);
 extern OSIrqMask OS_ResetRequestIrqMask(OSIrqMask mask);
 extern void SND_Shutdown(void);
-extern void PXI_SetFifoRecvCallback(u32 param1, void* callback);
-extern u32 PXI_SendWordByFifo(u32 param1, u32 data, u32 param2);
 extern void FUN_038073EC(void); //OSi_DoResetSystem, in wram
 
 ARM_FUNC void OS_InitReset(void)
diff --git a/arm9/lib/NitroSDK/include/PXI_fifo.h b/arm9/lib/NitroSDK/include/PXI_fifo.h
index b1ca33f3..815da961 100644
--- a/arm9/lib/NitroSDK/include/PXI_fifo.h
+++ b/arm9/lib/NitroSDK/include/PXI_fifo.h
@@ -4,29 +4,6 @@
 #include "nitro/PXI_fifo_shared.h"
 #include "nitro/types.h"
 
-typedef enum
-{
-    PXI_FIFO_SUCCESS = 0,
-    PXI_FIFO_FAIL_SEND_ERR = -1,
-    PXI_FIFO_FAIL_SEND_FULL = -2,
-    PXI_FIFO_FAIL_RECV_ERR = -3,
-    PXI_FIFO_FAIL_RECV_EMPTY = -4,
-    PXI_FIFO_NO_CALLBACK_ENTRY = -5
-} PXIFifoStatus;
-
-typedef void (*PXIFifoCallback) (PXIFifoTag tag, u32 data, BOOL err);
-
-typedef union
-{
-    struct
-    {
-        u32 tag:5;
-        u32 err:1;
-        u32 data:26;
-    } e;
-    u32 raw;
-} PXIFifoMessage;
-
 void PXI_InitFifo(void);
 void PXI_SetFifoRecvCallback(s32 fifotag, PXIFifoCallback callback);
 BOOL PXI_IsCallbackReady(s32 fifotag, PXIProc proc);
diff --git a/include/nitro/PXI_fifo_shared.h b/include/nitro/PXI_fifo_shared.h
index 297625a1..a4ed454f 100644
--- a/include/nitro/PXI_fifo_shared.h
+++ b/include/nitro/PXI_fifo_shared.h
@@ -13,6 +13,8 @@
 #ifndef POKEDIAMOND_PXI_FIFO_SHARED_H
 #define POKEDIAMOND_PXI_FIFO_SHARED_H
 
+#include "nitro/types.h"
+
 typedef enum
 {
     PXI_PROC_ARM9 = 0,
@@ -40,4 +42,27 @@ typedef enum {
     PXI_MAX_FIFO_TAG = 32              // MAX FIFO TAG
 } PXIFifoTag;
 
+typedef enum
+{
+    PXI_FIFO_SUCCESS = 0,
+    PXI_FIFO_FAIL_SEND_ERR = -1,
+    PXI_FIFO_FAIL_SEND_FULL = -2,
+    PXI_FIFO_FAIL_RECV_ERR = -3,
+    PXI_FIFO_FAIL_RECV_EMPTY = -4,
+    PXI_FIFO_NO_CALLBACK_ENTRY = -5
+} PXIFifoStatus;
+
+typedef union
+{
+    struct
+    {
+        u32 tag:5;
+        u32 err:1;
+        u32 data:26;
+    } e;
+    u32 raw;
+} PXIFifoMessage;
+
+typedef void (*PXIFifoCallback) (PXIFifoTag tag, u32 data, BOOL err);
+
 #endif //POKEDIAMOND_PXI_FIFO_SHARED_H