diff options
author | Egor Ananyin <ananinegor@gmail.com> | 2020-06-11 19:24:42 +0300 |
---|---|---|
committer | Egor Ananyin <ananinegor@gmail.com> | 2020-06-11 19:24:42 +0300 |
commit | c8c88744e6a5c28572fff793b0381660c3034c56 (patch) | |
tree | 3b6f1e7cccec12d88baaa8aa57b5816f65ce7c7f /arm9/lib/include/OS_tick.h | |
parent | 80d13d2c579f68b8c377f678948d4a41b1dc56c2 (diff) | |
parent | 688b3bcd67b47a4ddf593dc0244409b2c5aa10c7 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'arm9/lib/include/OS_tick.h')
-rw-r--r-- | arm9/lib/include/OS_tick.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arm9/lib/include/OS_tick.h b/arm9/lib/include/OS_tick.h index fb4ce7e6..f1c7145d 100644 --- a/arm9/lib/include/OS_tick.h +++ b/arm9/lib/include/OS_tick.h @@ -1,8 +1,12 @@ #ifndef POKEDIAMOND_OS_TICK_H #define POKEDIAMOND_OS_TICK_H -#include "nitro/types.h" +#include "consts.h" typedef u64 OSTick; +#define OS_SYSTEM_CLOCK HW_SYSTEM_CLOCK + +#define OS_MilliSecondsToTicks(msec) ((OSTick)(((OS_SYSTEM_CLOCK/1000) * (u64)(msec)) / 64)) + #endif //POKEDIAMOND_OS_TICK_H |