From c5dedd7d762f48e940ecc0bd17dd2173d59a92e1 Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Mon, 29 Jun 2009 14:29:57 +0000 Subject: Remove the TIMER_* macros and declare target-specific functions in timer.h git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21559 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/sh/archos/timer-archos.c | 6 +++--- firmware/target/sh/archos/timer-target.h | 13 ------------- 2 files changed, 3 insertions(+), 16 deletions(-) (limited to 'firmware/target/sh/archos') diff --git a/firmware/target/sh/archos/timer-archos.c b/firmware/target/sh/archos/timer-archos.c index c61318f721..07d63ed3a8 100644 --- a/firmware/target/sh/archos/timer-archos.c +++ b/firmware/target/sh/archos/timer-archos.c @@ -32,7 +32,7 @@ void IMIA4(void) and_b(~0x01, &TSR4); /* clear the interrupt */ } -bool __timer_set(long cycles, bool start) +bool timer_set(long cycles, bool start) { int phi = 0; /* bits for the prescaler */ int prescale = 1; @@ -71,14 +71,14 @@ bool __timer_set(long cycles, bool start) return true; } -bool __timer_start(void) +bool timer_start(void) { IPRD = (IPRD & 0xFF0F) | 1 << 4; /* interrupt priority */ or_b(0x10, &TSTR); /* start timer 4 */ return true; } -void __timer_stop(void) +void timer_stop(void) { and_b(~0x10, &TSTR); /* stop the timer 4 */ IPRD = (IPRD & 0xFF0F); /* disable interrupt */ diff --git a/firmware/target/sh/archos/timer-target.h b/firmware/target/sh/archos/timer-target.h index 89dfe57eb3..6cdd442917 100644 --- a/firmware/target/sh/archos/timer-target.h +++ b/firmware/target/sh/archos/timer-target.h @@ -23,19 +23,6 @@ #include "config.h" -bool __timer_set(long cycles, bool start); -bool __timer_start(void); -void __timer_stop(void); - #define TIMER_FREQ CPU_FREQ -#define __TIMER_SET(cycles, set) \ - __timer_set(cycles, set) - -#define __TIMER_START() \ - __timer_start() - -#define __TIMER_STOP(...) \ - __timer_stop() - #endif /* TIMER_TARGET_H */ -- cgit v1.2.3