diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-06-12 14:39:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-12 14:39:00 -0400 |
| commit | 09514ee0e6982c61d884682b4b747a4383f0d1b8 (patch) | |
| tree | fe67fb209023d19114ca07efa71f1846dd030911 /arm9/lib/include/OS_interrupt.h | |
| parent | 2d8d454dfe8691f4cd1077c50ab6f3c286c28ce1 (diff) | |
| parent | c4263506fa96acc210d1cf356023a3ffde805a0b (diff) | |
Merge branch 'master' into pikalax_work
Diffstat (limited to 'arm9/lib/include/OS_interrupt.h')
| -rw-r--r-- | arm9/lib/include/OS_interrupt.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arm9/lib/include/OS_interrupt.h b/arm9/lib/include/OS_interrupt.h index 6ffa3a10..ec58a636 100644 --- a/arm9/lib/include/OS_interrupt.h +++ b/arm9/lib/include/OS_interrupt.h @@ -1,7 +1,8 @@ -#ifndef POKEDIAMOND_OS_INTERRUPT_H -#define POKEDIAMOND_OS_INTERRUPT_H +#ifndef POKEDIAMOND_ARM9_OS_INTERRUPT_H +#define POKEDIAMOND_ARM9_OS_INTERRUPT_H #include "nitro/types.h" +#include "nitro/OS_interrupt_shared.h" typedef void (*OSIrqFunction) (void); @@ -12,8 +13,6 @@ typedef struct void* arg; } OSIrqCallbackInfo; -typedef u32 OSIrqMask; - extern OSIrqFunction OS_IRQTable[]; extern OSIrqCallbackInfo OSi_IrqCallbackInfo[8]; @@ -28,4 +27,4 @@ OSIrqMask OS_DisableIrqMask(OSIrqMask mask); OSIrqMask OS_ResetRequestIrqMask(OSIrqMask mask); void OS_SetIrqStackChecker(void); -#endif //POKEDIAMOND_OS_INTERRUPT_H +#endif //POKEDIAMOND_ARM9_OS_INTERRUPT_H |