From 55d1eceb3ad649b5181a4bc7acbad507e5f4daa4 Mon Sep 17 00:00:00 2001 From: red031000 Date: Sat, 2 May 2020 19:06:15 +0100 Subject: [PATCH] split libpxi --- arm9/arm9.lcf | 3 ++- arm9/asm/{libpxi.s => PXI_fifo.s} | 8 +------- arm9/asm/PXI_init.s | 11 +++++++++++ arm9/global.inc | 1 + 4 files changed, 15 insertions(+), 8 deletions(-) rename arm9/asm/{libpxi.s => PXI_fifo.s} (97%) create mode 100644 arm9/asm/PXI_init.s diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf index b595e5f4e..e3956eecd 100644 --- a/arm9/arm9.lcf +++ b/arm9/arm9.lcf @@ -186,7 +186,8 @@ SECTIONS { SND_work.o (.text) SND_util.o (.text) SND_bank.o (.text) - libpxi.o (.text) + PXI_init.o (.text) + PXI_fifo.o (.text) libfs.o (.text) libdgt.o (.text) libcp.o (.text) diff --git a/arm9/asm/libpxi.s b/arm9/asm/PXI_fifo.s similarity index 97% rename from arm9/asm/libpxi.s rename to arm9/asm/PXI_fifo.s index ab3af5de4..0fd0b95d7 100644 --- a/arm9/asm/libpxi.s +++ b/arm9/asm/PXI_fifo.s @@ -1,13 +1,7 @@ .include "asm/macros.inc" .include "global.inc" - .section .text - arm_func_start PXI_Init -PXI_Init: ; 0x020CFBB0 - ldr ip, _020CFBB8 ; =PXI_InitFifo - bx r12 - .balign 4 -_020CFBB8: .word PXI_InitFifo + .text arm_func_start PXIi_HandlerRecvFifoNotEmpty PXIi_HandlerRecvFifoNotEmpty: ; 0x020CFBBC diff --git a/arm9/asm/PXI_init.s b/arm9/asm/PXI_init.s new file mode 100644 index 000000000..bc6123a38 --- /dev/null +++ b/arm9/asm/PXI_init.s @@ -0,0 +1,11 @@ + .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/global.inc b/arm9/global.inc index 37a16c3ed..9b0de82d3 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -3564,6 +3564,7 @@ .extern PMi_SetLEDAsync .extern PMi_WaitBusy .extern PXI_Init +.extern PXI_InitFifo .extern PXI_IsCallbackReady .extern PXI_SendWordByFifo .extern PXI_SetFifoRecvCallback