arm9 PXI_init

5 files changed, 17 insertions, 13 deletions

diff --git a/arm9/asm/PXI_init.s b/arm9/asm/PXI_init.s
deleted file mode 100644
index bc6123a3..00000000
--- a/arm9/asm/PXI_init.s
+++ /dev/null
@@ -1,11 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-
-    .text
-
-	arm_func_start PXI_Init
-PXI_Init: ; 0x020CFBB0
-	ldr ip, _020CFBB8 ; =PXI_InitFifo
-	bx r12
-	.balign 4
-_020CFBB8: .word PXI_InitFifo
diff --git a/arm9/lib/include/PXI_init.h b/arm9/lib/include/PXI_init.h
new file mode 100644
index 00000000..5c330c9c
--- /dev/null
+++ b/arm9/lib/include/PXI_init.h
@@ -0,0 +1,6 @@
+#ifndef POKEDIAMOND_PXI_INIT_H
+#define POKEDIAMOND_PXI_INIT_H
+
+void PXI_Init(void);
+
+#endif //POKEDIAMOND_PXI_INIT_H
diff --git a/arm9/lib/src/OS_init.c b/arm9/lib/src/OS_init.c
index 00355853..83e8a7d9 100644
--- a/arm9/lib/src/OS_init.c
+++ b/arm9/lib/src/OS_init.c
@@ -1,8 +1,8 @@
 #include "function_target.h"
 #include "OS_init.h"
 #include "MI_init.h"
+#include "PXI_init.h"
 
-extern void PXI_Init(void);
 extern void CTRDG_Init(void);
 extern void CARD_Init(void);
 extern void PM_Init(void);
diff --git a/arm9/lib/src/OS_reset.c b/arm9/lib/src/OS_reset.c
index 2e333bb8..7331a7b0 100644
--- a/arm9/lib/src/OS_reset.c
+++ b/arm9/lib/src/OS_reset.c
@@ -9,11 +9,11 @@
 #include "sections.h"
 #include "MI_dma.h"
 #include "CARD_common.h"
+#include "PXI_init.h"
 
 static u16 OSi_IsInitReset = 0;
 vu16 OSi_IsResetOccurred = 0;
 
-extern void PXI_Init(void);
 extern u32 PXI_IsCallbackReady(u32 param1, u32 param2);
 extern void PXI_SetFifoRecvCallback(u32 param1, void* callback);
 extern u32 PXI_SendWordByFifo(u32 param1, u32 data, u32 param2);
diff --git a/arm9/lib/src/PXI_init.c b/arm9/lib/src/PXI_init.c
new file mode 100644
index 00000000..f079ca3d
--- /dev/null
+++ b/arm9/lib/src/PXI_init.c
@@ -0,0 +1,9 @@
+#include "PXI_init.h"
+#include "function_target.h"
+
+extern void PXI_InitFifo(void);
+
+ARM_FUNC void PXI_Init(void)
+{
+    PXI_InitFifo();
+}