diff options
| author | Louis Hampton <roastveg@hotmail.co.uk> | 2020-06-20 19:01:00 +0100 |
|---|---|---|
| committer | Louis Hampton <roastveg@hotmail.co.uk> | 2020-06-20 19:01:00 +0100 |
| commit | 3cf5ef0a661c62a94766e2c08025bb7ecb785b2a (patch) | |
| tree | 7fa9fc230a0517f65876613318f043f3c14b8f63 /arm9/lib/include/OS_alarm.h | |
| parent | 59f6bdfa9a7645d3e2e9d1ac0bde5af3ad77e8b2 (diff) | |
| parent | 6298426d9ad4c59a875b0a90a0facfa1a3a513cc (diff) | |
Merge branch 'master' of https://github.com/roastveg/pokediamond
Diffstat (limited to 'arm9/lib/include/OS_alarm.h')
| -rw-r--r-- | arm9/lib/include/OS_alarm.h | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/arm9/lib/include/OS_alarm.h b/arm9/lib/include/OS_alarm.h index a9734d1b..ebdf01ba 100644 --- a/arm9/lib/include/OS_alarm.h +++ b/arm9/lib/include/OS_alarm.h @@ -1,28 +1,13 @@ -#ifndef POKEDIAMOND_OS_ALARM_H -#define POKEDIAMOND_OS_ALARM_H +#ifndef POKEDIAMOND_ARM9_OS_ALARM_H +#define POKEDIAMOND_ARM9_OS_ALARM_H #include "nitro/types.h" #include "OS_thread.h" #include "OS_tick.h" - -typedef void (*OSAlarmHandler) (void *); - -struct OSiAlarm -{ - OSAlarmHandler handler; - void *arg; - - u32 tag; - OSTick fire; - OSAlarm *prev; - OSAlarm *next; - - OSTick period; - OSTick start; -}; +#include "nitro/OS_alarm_shared.h" void OS_CancelAlarm(OSAlarm *alarm); void OS_CreateAlarm(OSAlarm *alarm); void OS_SetAlarm(OSAlarm *alarm, OSTick tick, OSAlarmHandler handler, void *arg); -#endif //POKEDIAMOND_OS_ALARM_H +#endif //POKEDIAMOND_ARM9_OS_ALARM_H |