diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-20 14:59:56 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-20 14:59:56 -0400 |
| commit | d1d3fce4b6be10ed7186a6c36bc27fe575b593db (patch) | |
| tree | 4f31107f4446b69106acb0673a383dfdaf88473e /arm9/lib/src/OS_reset.c | |
| parent | 6103ab0ca0962682095e58779079cb4c8c054b14 (diff) | |
| parent | de389305733545e2b6fac6c8dcb33d76a7446481 (diff) | |
Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work
Diffstat (limited to 'arm9/lib/src/OS_reset.c')
| -rw-r--r-- | arm9/lib/src/OS_reset.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arm9/lib/src/OS_reset.c b/arm9/lib/src/OS_reset.c index c21d20ab..d4254ce3 100644 --- a/arm9/lib/src/OS_reset.c +++ b/arm9/lib/src/OS_reset.c @@ -6,6 +6,7 @@ #include "OS_reset.h" #include "MB_mb.h" #include "OS_terminate_proc.h" +#include "OS_interrupt.h" extern u16 OSi_IsInitReset; extern vu16 OSi_IsResetOccurred; @@ -15,8 +16,6 @@ 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); -extern void OS_SetIrqMask(u32 mask); -extern void OS_ResetRequestIrqMask(u32 mask); extern void OSi_DoResetSystem(); //in itcm, should technically be in this file ARM_FUNC void OS_InitReset() { @@ -54,7 +53,7 @@ ARM_FUNC void OS_ResetSystem(u32 parameter) { MI_StopDma(1); MI_StopDma(2); MI_StopDma(3); - OS_SetIrqMask(0x40000); + (void)OS_SetIrqMask(0x40000); OS_ResetRequestIrqMask((u32)~0); *(u32 *)HW_RESET_PARAMETER_BUF = parameter; OSi_SendToPxi(OS_PXI_COMMAND_RESET); |