From 565840008b8c12a58466b4da1545d6e42670a610 Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Tue, 31 Jan 2012 08:09:05 +0100 Subject: firmware/timer: Added HZ as global defintion for jiffies per second --- src/target/firmware/comm/timer.c | 8 +++----- src/target/firmware/include/comm/timer.h | 2 ++ 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/target/firmware') diff --git a/src/target/firmware/comm/timer.c b/src/target/firmware/comm/timer.c index b2026b94..ce4f06d3 100644 --- a/src/target/firmware/comm/timer.c +++ b/src/target/firmware/comm/timer.c @@ -33,8 +33,6 @@ static LLIST_HEAD(timer_list); unsigned long volatile jiffies; -#define TIMER_HZ 100 - #define time_after(a,b) \ (typecheck(unsigned long, a) && \ typecheck(unsigned long, b) && \ @@ -59,7 +57,7 @@ void osmo_timer_add(struct osmo_timer_list *timer) void osmo_timer_schedule(struct osmo_timer_list *timer, int milliseconds) { - timer->expires = jiffies + ((milliseconds * TIMER_HZ) / 1000); + timer->expires = jiffies + ((milliseconds * HZ) / 1000); osmo_timer_add(timer); } @@ -200,10 +198,10 @@ void timer_init(void) /* configure TIMER2 for our purpose */ hwtimer_enable(2, 1); /* The timer runs at 13MHz / 32, i.e. 406.25kHz */ -#if (TIMER_HZ == 100) +#if (HZ == 100) hwtimer_load(2, 4062); hwtimer_config(2, 0, 1); -#elif (TIMER_HZ == 10) +#elif (HZ == 10) /* prescaler 4, 1015 ticks until expiry */ hwtimer_load(2, 1015); hwtimer_config(2, 4, 1); diff --git a/src/target/firmware/include/comm/timer.h b/src/target/firmware/include/comm/timer.h index 877d47b5..1996f666 100644 --- a/src/target/firmware/include/comm/timer.h +++ b/src/target/firmware/include/comm/timer.h @@ -25,6 +25,8 @@ #include +#define HZ 100 + /** * Timer management: * - Create a struct osmo_timer_list -- cgit v1.2.3