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

2 files changed, 3 insertions, 16 deletions

diff --git a/firmware/target/coldfire/timer-coldfire.c b/firmware/target/coldfire/timer-coldfire.c
index ef9fd9ea7a..0916ebedf7 100644
--- a/firmware/target/coldfire/timer-coldfire.c
+++ b/firmware/target/coldfire/timer-coldfire.c
@@ -37,7 +37,7 @@ void TIMER1(void)
     TER1 = 0xff; /* clear all events */
 }
 
-bool __timer_set(long cycles, bool start)
+bool timer_set(long cycles, bool start)
 {
     int phi = 0; /* bits for the prescaler */
     int prescale = 1;
@@ -87,7 +87,7 @@ bool __timer_set(long cycles, bool start)
     return true;
 }
 
-bool __timer_start(void)
+bool timer_start(void)
 {
     ICR2 = 0x90;       /* interrupt on level 4.0 */
     and_l(~(1<<10), &IMR);
@@ -95,7 +95,7 @@ bool __timer_start(void)
     return true;
 }
 
-void __timer_stop(void)
+void timer_stop(void)
 {
     TMR1 = 0;               /* disable timer 1 */
     or_l((1<<10), &IMR);    /* disable interrupt */
diff --git a/firmware/target/coldfire/timer-target.h b/firmware/target/coldfire/timer-target.h
index 29488887e8..3aff57de9e 100644
--- a/firmware/target/coldfire/timer-target.h
+++ b/firmware/target/coldfire/timer-target.h
@@ -21,20 +21,7 @@
 #ifndef TIMER_TARGET_H
 #define TIMER_TARGET_H
 
-bool __timer_set(long cycles, bool start);
-bool __timer_start(void);
-void __timer_stop(void);
-
 /* timer is based on busclk == cpuclk/2 */
 #define TIMER_FREQ (CPU_FREQ/2)
 
-#define __TIMER_SET(cycles, set) \
-    __timer_set(cycles, set)
-
-#define __TIMER_START() \
-    __timer_start()
-
-#define __TIMER_STOP(...) \
-    __timer_stop()
-
 #endif /* TIMER_TARGET_H */