diff options
| author | red031000 <rubenru09@aol.com> | 2020-07-27 01:11:45 +0100 |
|---|---|---|
| committer | red031000 <rubenru09@aol.com> | 2020-07-27 01:11:45 +0100 |
| commit | 7c2a848ecccb95d010d8c0836c5d9c6a96b39da0 (patch) | |
| tree | d650d996f8fa9b741b1075d8b897d73c8e7034a7 /arm9/lib/src/OS_system.c | |
| parent | 23873ed88f9920db6ed463fa02157686264369bd (diff) | |
some cleanups
Diffstat (limited to 'arm9/lib/src/OS_system.c')
| -rw-r--r-- | arm9/lib/src/OS_system.c | 53 |
1 files changed, 29 insertions, 24 deletions
diff --git a/arm9/lib/src/OS_system.c b/arm9/lib/src/OS_system.c index de6b187a..f5f5faba 100644 --- a/arm9/lib/src/OS_system.c +++ b/arm9/lib/src/OS_system.c @@ -1,12 +1,9 @@ -// -// Created by mart on 4/23/20. -// - #include "OS_system.h" #include "OS_irqHandler.h" #include "syscall.h" -ARM_FUNC asm OSIntrMode OS_EnableInterrupts(void) { +ARM_FUNC asm OSIntrMode OS_EnableInterrupts(void) +{ mrs r0, cpsr bic r1, r0, #HW_PSR_DISABLE_IRQ msr cpsr_c, r1 @@ -14,24 +11,27 @@ ARM_FUNC asm OSIntrMode OS_EnableInterrupts(void) { bx lr } -ARM_FUNC asm OSIntrMode OS_DisableInterrupts(void) { - mrs r0, cpsr - orr r1, r0, #HW_PSR_DISABLE_IRQ - msr cpsr_c, r1 - and r0, r0, #HW_PSR_DISABLE_IRQ - bx lr +ARM_FUNC asm OSIntrMode OS_DisableInterrupts(void) +{ + mrs r0, cpsr + orr r1, r0, #HW_PSR_DISABLE_IRQ + msr cpsr_c, r1 + and r0, r0, #HW_PSR_DISABLE_IRQ + bx lr } -ARM_FUNC asm OSIntrMode OS_RestoreInterrupts(OSIntrMode state) { - mrs r1, cpsr - bic r2, r1, #HW_PSR_DISABLE_IRQ - orr r2, r2, r0 - msr cpsr_c, r2 - and r0, r1, #HW_PSR_DISABLE_IRQ - bx lr +ARM_FUNC asm OSIntrMode OS_RestoreInterrupts(OSIntrMode state) +{ + mrs r1, cpsr + bic r2, r1, #HW_PSR_DISABLE_IRQ + orr r2, r2, r0 + msr cpsr_c, r2 + and r0, r1, #HW_PSR_DISABLE_IRQ + bx lr } -ARM_FUNC asm OSIntrMode OS_DisableInterrupts_IrqAndFiq(void) { +ARM_FUNC asm OSIntrMode OS_DisableInterrupts_IrqAndFiq(void) +{ mrs r0, cpsr orr r1, r0, #HW_PSR_DISABLE_IRQ_FIQ msr cpsr_c, r1 @@ -39,7 +39,8 @@ ARM_FUNC asm OSIntrMode OS_DisableInterrupts_IrqAndFiq(void) { bx lr } -ARM_FUNC asm OSIntrMode OS_RestoreInterrupts_IrqAndFiq(OSIntrMode state) { +ARM_FUNC asm OSIntrMode OS_RestoreInterrupts_IrqAndFiq(OSIntrMode state) +{ mrs r1, cpsr bic r2, r1, #HW_PSR_DISABLE_IRQ_FIQ orr r2, r2, r0 @@ -48,25 +49,29 @@ ARM_FUNC asm OSIntrMode OS_RestoreInterrupts_IrqAndFiq(OSIntrMode state) { bx lr } -ARM_FUNC asm OSIntrMode OS_GetCpsrIrq(void) { +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(void) { +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(u32 cycles) { +ARM_FUNC asm void OS_SpinWait(u32 cycles) +{ subs r0, r0, #0x4 bhs OS_SpinWait bx lr } -ARM_FUNC void OS_WaitVBlankIntr(void) { +ARM_FUNC void OS_WaitVBlankIntr(void) +{ SVC_WaitByLoop(0x1); OS_WaitIrq(TRUE, OS_IE_V_BLANK); } |