diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-06 10:17:48 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-06 10:17:48 -0400 |
| commit | 287997378d2531af6c610721f2be2424ca4cbfa3 (patch) | |
| tree | a52d852aeac6ea91103dc5b4ce9dad2fee375bc6 /arm9/lib/include/OS_system.h | |
| parent | 3e3328342369ac8143a442c5b85ad56ce587b195 (diff) | |
| parent | cae6ef601c8d2892c078eb77327e4552f3c8bf64 (diff) | |
Merge branch 'master' of https://github.com/martmists/pokediamond into pikalax_work
Diffstat (limited to 'arm9/lib/include/OS_system.h')
| -rw-r--r-- | arm9/lib/include/OS_system.h | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/arm9/lib/include/OS_system.h b/arm9/lib/include/OS_system.h index a5426c17..37dbbd76 100644 --- a/arm9/lib/include/OS_system.h +++ b/arm9/lib/include/OS_system.h @@ -3,24 +3,7 @@ #include "function_target.h" #include "consts.h" - -typedef enum { - OS_PROCMODE_USER=16, - OS_PROCMODE_FIQ=17, - OS_PROCMODE_IRQ=18, - OS_PROCMODE_SVC=19, - OS_PROCMODE_ABORT=23, - OS_PROCMODE_UNDEF=27, - OS_PROCMODE_SYS=31 -} OSProcMode; - -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; -ENUMS_ALWAYS_INT_RESET +#include "nitro/OS_system_shared.h" OSIntrMode OS_EnableInterrupts(void); OSIntrMode OS_DisableInterrupts(void); |