diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-26 09:42:03 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-26 09:42:03 -0400 |
| commit | 8c8a5a07c5e6b1a2d0d0592a30be31ccd140fc1e (patch) | |
| tree | c23120a706d012bd19c4c2584af5009fd2016ecf /arm9/lib/src/OS_system.c | |
| parent | e643eddc0def8e4851a4195e8ed4de06c847f52d (diff) | |
| parent | 227da51c377f621f542ffdb52ef56bfb807f29ab (diff) | |
Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work
Diffstat (limited to 'arm9/lib/src/OS_system.c')
| -rw-r--r-- | arm9/lib/src/OS_system.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arm9/lib/src/OS_system.c b/arm9/lib/src/OS_system.c index 5379433b..1d257679 100644 --- a/arm9/lib/src/OS_system.c +++ b/arm9/lib/src/OS_system.c @@ -5,7 +5,7 @@ #include "OS_system.h" #include "syscall.h" -ARM_FUNC asm OSIntrMode OS_EnableInterrupts() { +ARM_FUNC asm OSIntrMode OS_EnableInterrupts(void) { mrs r0, cpsr bic r1, r0, #HW_PSR_DISABLE_IRQ msr cpsr_c, r1 @@ -13,7 +13,7 @@ ARM_FUNC asm OSIntrMode OS_EnableInterrupts() { bx lr } -ARM_FUNC asm OSIntrMode OS_DisableInterrupts() { +ARM_FUNC asm OSIntrMode OS_DisableInterrupts(void) { mrs r0, cpsr orr r1, r0, #HW_PSR_DISABLE_IRQ msr cpsr_c, r1 @@ -30,7 +30,7 @@ ARM_FUNC asm OSIntrMode OS_RestoreInterrupts(OSIntrMode state) { bx lr } -ARM_FUNC asm OSIntrMode OS_DisableInterrupts_IrqAndFiq() { +ARM_FUNC asm OSIntrMode OS_DisableInterrupts_IrqAndFiq(void) { mrs r0, cpsr orr r1, r0, #HW_PSR_DISABLE_IRQ_FIQ msr cpsr_c, r1 @@ -47,25 +47,25 @@ ARM_FUNC asm OSIntrMode OS_RestoreInterrupts_IrqAndFiq(OSIntrMode state) { bx lr } -ARM_FUNC asm OSIntrMode OS_GetCpsrIrq() { +ARM_FUNC asm OSIntrMode OS_GetCpsrIrq(void) { mrs r0, cpsr and r0, r0, #HW_PSR_DISABLE_IRQ bx lr } -ARM_FUNC asm OSProcMode OS_GetProcMode() { +ARM_FUNC asm OSProcMode OS_GetProcMode(void) { mrs r0, cpsr and r0, r0, #HW_PSR_CPU_MODE_MASK bx lr } -ARM_FUNC asm void OS_SpinWait() { +ARM_FUNC asm void OS_SpinWait(void) { subs r0, r0, #0x4 bhs OS_SpinWait bx lr } -ARM_FUNC void OS_WaitVBlankIntr() { +ARM_FUNC void OS_WaitVBlankIntr(void) { SVC_WaitByLoop(0x1); OS_WaitIrq(TRUE, OS_IE_V_BLANK); } |