diff options
| -rw-r--r-- | arm9/lib/include/OS_system.h | 8 | ||||
| -rw-r--r-- | arm9/lib/src/OS_system.c | 4 | ||||
| -rw-r--r-- | include-mw/function_target.h | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/arm9/lib/include/OS_system.h b/arm9/lib/include/OS_system.h index 20228cbf..93903315 100644 --- a/arm9/lib/include/OS_system.h +++ b/arm9/lib/include/OS_system.h @@ -17,19 +17,19 @@ typedef enum { OS_PROCMODE_SYS=31 } OSProcMode; -#pragma enumsalwaysint on +ENUMS_ALWAYS_INT_ON typedef enum { OS_INTRMODE_DISABLE_IRQ = HW_PSR_DISABLE_IRQ, OS_INTRMODE_DISABLE_FIQ = HW_PSR_DISABLE_FIQ, OS_INTRMODE_ENABLE = 0 } OSIntrMode; -#pragma enumsalwaysint reset +ENUMS_ALWAYS_INT_RESET OSIntrMode OS_EnableInterrupts(); OSIntrMode OS_DisableInterrupts(); -OSIntrMode OS_RestoreInterrupts(register OSIntrMode state); +OSIntrMode OS_RestoreInterrupts(OSIntrMode state); OSIntrMode OS_DisableInterrupts_IrqAndFiq(); -OSIntrMode OS_RestoreInterrupts_IrqAndFiq(register OSIntrMode state); +OSIntrMode OS_RestoreInterrupts_IrqAndFiq(OSIntrMode state); OSIntrMode OS_GetCpsrIrq(); OSProcMode OS_GetProcMode(); void OS_SpinWait(); diff --git a/arm9/lib/src/OS_system.c b/arm9/lib/src/OS_system.c index 5e891ad9..c2b08681 100644 --- a/arm9/lib/src/OS_system.c +++ b/arm9/lib/src/OS_system.c @@ -21,7 +21,7 @@ ARM_FUNC asm OSIntrMode OS_DisableInterrupts() { bx lr } -ARM_FUNC asm OSIntrMode OS_RestoreInterrupts(register OSIntrMode state) { +ARM_FUNC asm OSIntrMode OS_RestoreInterrupts(OSIntrMode state) { mrs r1, cpsr bic r2, r1, #HW_PSR_DISABLE_IRQ orr r2, r2, r0 @@ -38,7 +38,7 @@ ARM_FUNC asm OSIntrMode OS_DisableInterrupts_IrqAndFiq() { bx lr } -ARM_FUNC asm OSIntrMode OS_RestoreInterrupts_IrqAndFiq(register 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 diff --git a/include-mw/function_target.h b/include-mw/function_target.h index 2aaee87e..f37095f9 100644 --- a/include-mw/function_target.h +++ b/include-mw/function_target.h @@ -4,4 +4,8 @@ #define ARM_FUNC _Pragma("thumb off") #define THUMB_FUNC _Pragma("thumb on") +#define ENUMS_ALWAYS_INT_ON _Pragma("enumsalwaysint on") +#define ENUMS_ALWAYS_INT_OFF _Pragma("enumsalwaysint off") +#define ENUMS_ALWAYS_INT_RESET _Pragma("enumsalwaysint reset") + #endif //GUARD_FUNCTION_TARGET_H
\ No newline at end of file |