diff options
| author | red031000 <rubenru09@aol.com> | 2020-05-26 01:54:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-26 01:54:32 +0100 |
| commit | 227da51c377f621f542ffdb52ef56bfb807f29ab (patch) | |
| tree | 31ec68ffd57f0d43df60f6885636cc12de782306 /arm9/lib/src/OS_reset.c | |
| parent | 895b0ad8b9c09a0b6b1de59de76ed4a258076f87 (diff) | |
| parent | 0985659425ab1a9035d85512e330cdc247b24e6b (diff) | |
Merge pull request #109 from red031000/master
OS_protectionUnit.c + warning fixes
Diffstat (limited to 'arm9/lib/src/OS_reset.c')
| -rw-r--r-- | arm9/lib/src/OS_reset.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arm9/lib/src/OS_reset.c b/arm9/lib/src/OS_reset.c index 02498962..b3aff389 100644 --- a/arm9/lib/src/OS_reset.c +++ b/arm9/lib/src/OS_reset.c @@ -11,15 +11,15 @@ static u16 OSi_IsInitReset = 0; vu16 OSi_IsResetOccurred = 0; -extern void PXI_Init(); +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); extern void CARD_LockRom(u16 lockId); extern void MI_StopDma(u32 dma); -extern void OSi_DoResetSystem(); //in itcm, should technically be in this file +extern void OSi_DoResetSystem(void); //in itcm, should technically be in this file -ARM_FUNC void OS_InitReset() { +ARM_FUNC void OS_InitReset(void) { if (OSi_IsInitReset) { return; } @@ -55,7 +55,7 @@ ARM_FUNC void OS_ResetSystem(u32 parameter) { MI_StopDma(2); MI_StopDma(3); (void)OS_SetIrqMask(0x40000); - OS_ResetRequestIrqMask((u32)~0); + (void)OS_ResetRequestIrqMask((u32)~0); *(u32 *)HW_RESET_PARAMETER_BUF = parameter; OSi_SendToPxi(OS_PXI_COMMAND_RESET); OSi_DoResetSystem(); //oh boy this is in itcm, that's gonna be fun to deal with Kappa |