diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-20 09:19:42 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-20 09:19:42 -0400 |
| commit | a16371f513daf21948e372a3955f4cfa0d89a141 (patch) | |
| tree | 7029add9f3cd169307e1023a4b0ae7552b9afeff /arm9/lib/include/OS_alarm.h | |
| parent | 1386f29730b42a640fde1d568255dc10be4ac759 (diff) | |
| parent | 0c8b5417cee5ff73f9db4b691c7549e82fdc30bd (diff) | |
Merge branch 'pikalax_work' of github.com:PikalaxALT/pokediamond into pikalax_work
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 |