diff options
| author | Revo <projectrevotpp@hotmail.com> | 2020-06-19 23:07:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-19 23:07:18 -0400 |
| commit | 0c8b5417cee5ff73f9db4b691c7549e82fdc30bd (patch) | |
| tree | fe0e454b0b267045c891a796040a3b83267724e8 /arm9/lib/include/OS_tick.h | |
| parent | b138e415a2c6b4e42a08e776cd482d91d50bbc2a (diff) | |
| parent | 12c17948602bf14535c91c530f214b99863e038e (diff) | |
Merge branch 'master' into pikalax_work
Diffstat (limited to 'arm9/lib/include/OS_tick.h')
| -rw-r--r-- | arm9/lib/include/OS_tick.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/arm9/lib/include/OS_tick.h b/arm9/lib/include/OS_tick.h index 3dba9818..59c43b10 100644 --- a/arm9/lib/include/OS_tick.h +++ b/arm9/lib/include/OS_tick.h @@ -1,14 +1,9 @@ -#ifndef POKEDIAMOND_OS_TICK_H -#define POKEDIAMOND_OS_TICK_H +#ifndef POKEDIAMOND_ARM9_OS_TICK_H +#define POKEDIAMOND_ARM9_OS_TICK_H #include "consts.h" #include "OS_timer.h" - -typedef u64 OSTick; - -#define OS_SYSTEM_CLOCK HW_SYSTEM_CLOCK - -#define OS_MilliSecondsToTicks(msec) ((OSTick)(((OS_SYSTEM_CLOCK/1000) * (u64)(msec)) / 64)) +#include "nitro/OS_tick_shared.h" #define OSi_TICK_TIMERCONTROL (REG_OS_TM0CNT_H_E_MASK | REG_OS_TM0CNT_H_I_MASK | OS_TIMER_PRESCALER_64) @@ -18,4 +13,4 @@ static void OSi_CountUpTick(void); OSTick OS_GetTick(void); u16 OS_GetTickLo(void); -#endif //POKEDIAMOND_OS_TICK_H +#endif //POKEDIAMOND_ARM9_OS_TICK_H |