diff options
| author | Revo <projectrevotpp@hotmail.com> | 2020-04-23 21:54:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-23 21:54:16 -0400 |
| commit | bbd690eb994cb95f6b9c2235996278fe586f8de2 (patch) | |
| tree | 841c4b5f90756a14997b9743cda3aa8a3db57bcd /include/nitro/os_system.c | |
| parent | 0612b1de9f20f80ca082971d433942944350a9fe (diff) | |
| parent | 50fa41f8771a0868cdc4d894802e8620e3bbe722 (diff) | |
Merge pull request #22 from red031000/os_lib
fix match_asm for os_alloc.c
Diffstat (limited to 'include/nitro/os_system.c')
| -rw-r--r-- | include/nitro/os_system.c | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/include/nitro/os_system.c b/include/nitro/os_system.c index e34c4781..2ccb7fc1 100644 --- a/include/nitro/os_system.c +++ b/include/nitro/os_system.c @@ -4,31 +4,25 @@ #include "os_system.h" -OSIntrMode OS_DisableInterrupts() { - __asm { - mrs r0, cpsr - orr r1, r0, #HW_PSR_IRQ_DISABLE - msr cpsr_c, r1 - and r0, r0, #HW_PSR_IRQ_DISABLE - bx lr - } +asm OSIntrMode OS_DisableInterrupts() { + mrs r0, cpsr + orr r1, r0, #HW_PSR_IRQ_DISABLE + msr cpsr_c, r1 + and r0, r0, #HW_PSR_IRQ_DISABLE + bx lr } -OSIntrMode OS_RestoreInterrupts(OSIntrMode state) { - __asm { - mrs r1, cpsr - bic r2, r1, #HW_PSR_IRQ_DISABLE - orr r2, r2, r0 - msr cpsr_c, r2 - and r0, r1, #HW_PSR_IRQ_DISABLE - bx lr - } +asm OSIntrMode OS_RestoreInterrupts(OSIntrMode state) { + mrs r1, cpsr + bic r2, r1, #HW_PSR_IRQ_DISABLE + orr r2, r2, r0 + msr cpsr_c, r2 + and r0, r1, #HW_PSR_IRQ_DISABLE + bx lr } -OSProcMode OS_GetProcMode() { - __asm { +asm OSProcMode OS_GetProcMode() { mrs r0, cpsr and r0, r0, #HW_PSR_CPU_MODE_MASK bx lr - } }
\ No newline at end of file |