summaryrefslogtreecommitdiff
path: root/arm7/lib/src
diff options
context:
space:
mode:
authorEgor Ananyin <ananinegor@gmail.com>2020-06-24 20:31:49 +0300
committerEgor Ananyin <ananinegor@gmail.com>2020-06-24 20:31:49 +0300
commit2f08757512dc9a57c66226ccbc56852598917c14 (patch)
tree1bc802dd9aaaa5408765b7810ae5a4ad95c93ab9 /arm7/lib/src
parent60d9344c63e43abd81ccca87891b2ccdc05c6f93 (diff)
Shared things
Diffstat (limited to 'arm7/lib/src')
-rw-r--r--arm7/lib/src/OS_tick.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arm7/lib/src/OS_tick.c b/arm7/lib/src/OS_tick.c
index 063b05c9..e45b6833 100644
--- a/arm7/lib/src/OS_tick.c
+++ b/arm7/lib/src/OS_tick.c
@@ -1,12 +1,13 @@
#include "OS_interrupt.h"
#include "OS_system.h"
#include "OS_tick.h"
+#include "OS_timer.h"
#include "function_target.h"
extern void OSi_SetTimerReserved(u32);
static u16 OSi_UseTick;
-static u64 OSi_TickCounter;
+static OSTick OSi_TickCounter;
static BOOL OSi_NeedResetTimer;
ARM_FUNC void OS_InitTick(void) {
@@ -38,7 +39,7 @@ ARM_FUNC void OSi_CountUpTick(void) {
OSi_EnterTimerCallback(0, (void(*)(void*))OSi_CountUpTick, NULL);
}
-ARM_FUNC u64 OS_GetTick(void) {
+ARM_FUNC OSTick OS_GetTick(void) {
OSIntrMode prev = OS_DisableInterrupts();
vu16 countL = *(REGType16 *)((u32)&reg_OS_TM0CNT_L + OS_TIMER_0 * 4);
vu64 countH = OSi_TickCounter & 0xffffffffffffULL;