From ea1fc9a0c36fea36cc5eced2316b321735ed1aa5 Mon Sep 17 00:00:00 2001 From: Egor Ananyin Date: Wed, 24 Jun 2020 20:19:35 +0300 Subject: OS_tick done --- arm7/lib/include/OS_timer.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 arm7/lib/include/OS_timer.h (limited to 'arm7/lib/include/OS_timer.h') diff --git a/arm7/lib/include/OS_timer.h b/arm7/lib/include/OS_timer.h new file mode 100644 index 00000000..697842fe --- /dev/null +++ b/arm7/lib/include/OS_timer.h @@ -0,0 +1,32 @@ +#ifndef POKEDIAMOND_OS_TIMER_H +#define POKEDIAMOND_OS_TIMER_H + +#include "consts.h" + +typedef enum +{ + OS_TIMER_PRESCALER_1 = (0UL << REG_OS_TM0CNT_H_PS_SHIFT), + OS_TIMER_PRESCALER_64 = (1UL << REG_OS_TM0CNT_H_PS_SHIFT), + OS_TIMER_PRESCALER_256 = (2UL << REG_OS_TM0CNT_H_PS_SHIFT), + OS_TIMER_PRESCALER_1024 = (3UL << REG_OS_TM0CNT_H_PS_SHIFT) +} OSTimerPrescaler; + +typedef enum +{ + OS_TIMER_0 = 0, + OS_TIMER_1 = 1, + OS_TIMER_2 = 2, + OS_TIMER_3 = 3 +} OSTimer; + +static inline void OS_SetTimerCount(OSTimer id, u16 count) +{ + *((REGType16 *)((u32)®_OS_TM0CNT_L + id * 4)) = count; +} + +static inline void OS_SetTimerControl(OSTimer id, u16 control) +{ + *((REGType16 *)((u32)®_OS_TM0CNT_H + id * 4)) = control; +} + +#endif \ No newline at end of file -- cgit v1.2.3 From 60d9344c63e43abd81ccca87891b2ccdc05c6f93 Mon Sep 17 00:00:00 2001 From: Egor Ananyin Date: Wed, 24 Jun 2020 20:20:23 +0300 Subject: eof --- arm7/lib/include/OS_timer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arm7/lib/include/OS_timer.h') diff --git a/arm7/lib/include/OS_timer.h b/arm7/lib/include/OS_timer.h index 697842fe..b00967ca 100644 --- a/arm7/lib/include/OS_timer.h +++ b/arm7/lib/include/OS_timer.h @@ -29,4 +29,4 @@ static inline void OS_SetTimerControl(OSTimer id, u16 control) *((REGType16 *)((u32)®_OS_TM0CNT_H + id * 4)) = control; } -#endif \ No newline at end of file +#endif -- cgit v1.2.3 From 2f08757512dc9a57c66226ccbc56852598917c14 Mon Sep 17 00:00:00 2001 From: Egor Ananyin Date: Wed, 24 Jun 2020 20:31:49 +0300 Subject: Shared things --- arm7/lib/include/OS_timer.h | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) (limited to 'arm7/lib/include/OS_timer.h') diff --git a/arm7/lib/include/OS_timer.h b/arm7/lib/include/OS_timer.h index b00967ca..fee42c6f 100644 --- a/arm7/lib/include/OS_timer.h +++ b/arm7/lib/include/OS_timer.h @@ -1,32 +1,6 @@ #ifndef POKEDIAMOND_OS_TIMER_H #define POKEDIAMOND_OS_TIMER_H -#include "consts.h" - -typedef enum -{ - OS_TIMER_PRESCALER_1 = (0UL << REG_OS_TM0CNT_H_PS_SHIFT), - OS_TIMER_PRESCALER_64 = (1UL << REG_OS_TM0CNT_H_PS_SHIFT), - OS_TIMER_PRESCALER_256 = (2UL << REG_OS_TM0CNT_H_PS_SHIFT), - OS_TIMER_PRESCALER_1024 = (3UL << REG_OS_TM0CNT_H_PS_SHIFT) -} OSTimerPrescaler; - -typedef enum -{ - OS_TIMER_0 = 0, - OS_TIMER_1 = 1, - OS_TIMER_2 = 2, - OS_TIMER_3 = 3 -} OSTimer; - -static inline void OS_SetTimerCount(OSTimer id, u16 count) -{ - *((REGType16 *)((u32)®_OS_TM0CNT_L + id * 4)) = count; -} - -static inline void OS_SetTimerControl(OSTimer id, u16 control) -{ - *((REGType16 *)((u32)®_OS_TM0CNT_H + id * 4)) = control; -} +#include "nitro/OS_timer_shared.h" #endif -- cgit v1.2.3