diff options
| author | Egor Ananyin <ananinegor@gmail.com> | 2020-06-20 09:18:43 +0300 |
|---|---|---|
| committer | Egor Ananyin <ananinegor@gmail.com> | 2020-06-20 09:18:43 +0300 |
| commit | abd2d1e16494867989e710e5235c6425fa4e8c34 (patch) | |
| tree | 7eff3e1db566801104a8fc2672bbe57e06f7009e /arm9/lib/include/OS_alarm.h | |
| parent | 70556fc300ba85dad248d20b3c79c415e2ef88e5 (diff) | |
| parent | 12c17948602bf14535c91c530f214b99863e038e (diff) | |
conflicts
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 |