diff options
-rw-r--r-- | arm9/asm/MI_init.s | 17 | ||||
-rw-r--r-- | arm9/lib/include/MI_init.h | 6 | ||||
-rw-r--r-- | arm9/lib/src/MI_init.c | 11 | ||||
-rw-r--r-- | arm9/lib/src/OS_init.c | 2 | ||||
-rw-r--r-- | arm9/lib/src/OS_reset.c | 2 |
5 files changed, 19 insertions, 19 deletions
diff --git a/arm9/asm/MI_init.s b/arm9/asm/MI_init.s deleted file mode 100644 index 282dde3b..00000000 --- a/arm9/asm/MI_init.s +++ /dev/null @@ -1,17 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .text - - arm_func_start MI_Init -MI_Init: ; 0x020CE648 - stmdb sp!, {lr} - sub sp, sp, #0x4 - mov r0, #0x3 - bl MI_SetWramBank - mov r0, #0x0 - bl MI_StopDma - add sp, sp, #0x4 - ldmfd sp!, {lr} - bx lr - diff --git a/arm9/lib/include/MI_init.h b/arm9/lib/include/MI_init.h new file mode 100644 index 00000000..a338ab6b --- /dev/null +++ b/arm9/lib/include/MI_init.h @@ -0,0 +1,6 @@ +#ifndef POKEDIAMOND_MI_INIT_H +#define POKEDIAMOND_MI_INIT_H + +void MI_Init(void); + +#endif //POKEDIAMOND_MI_INIT_H diff --git a/arm9/lib/src/MI_init.c b/arm9/lib/src/MI_init.c new file mode 100644 index 00000000..266a5f2f --- /dev/null +++ b/arm9/lib/src/MI_init.c @@ -0,0 +1,11 @@ +#include "nitro/types.h" +#include "function_target.h" +#include "MI_dma.h" + +extern void MI_SetWramBank(u32 param0); + +ARM_FUNC void MI_Init(void) +{ + MI_SetWramBank(3); + MI_StopDma(0); +} diff --git a/arm9/lib/src/OS_init.c b/arm9/lib/src/OS_init.c index 5bd435e7..00355853 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" extern void PXI_Init(void); -extern void MI_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 a458a8fa..03781947 100644 --- a/arm9/lib/src/OS_reset.c +++ b/arm9/lib/src/OS_reset.c @@ -7,6 +7,7 @@ #include "OS_spinLock.h" #include "OS_cache.h" #include "sections.h" +#include "MI_dma.h" static u16 OSi_IsInitReset = 0; vu16 OSi_IsResetOccurred = 0; @@ -16,7 +17,6 @@ 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); extern void CARD_LockRom(u16 lockId); -extern void MI_StopDma(u32 dma); static void OSi_CommonCallback(PXIFifoTag tag, u32 data, BOOL err); static void OSi_SendToPxi(u16 data); |