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/arm/at91sam/lyre_proto1/timer-lyre_proto1.c b/firmware/target/arm/at91sam/lyre_proto1/timer-lyre_proto1.c
index ef5c911..1b620e9 100644
--- a/firmware/target/arm/at91sam/lyre_proto1/timer-lyre_proto1.c
+++ b/firmware/target/arm/at91sam/lyre_proto1/timer-lyre_proto1.c
@@ -48,7 +48,7 @@ void pitc_handler(void)
     }
 }
 
-bool __timer_set(long cycles, bool start)
+bool timer_set(long cycles, bool start)
 {
     if (cycles < 1000) /* Max value on PITC?? */
     {
@@ -67,7 +67,7 @@ bool __timer_set(long cycles, bool start)
     return false;
 }
 
-bool __timer_start(void)
+bool timer_start(void)
 {
     bool retval = true;
     volatile unsigned long pimr = 0;
@@ -101,7 +101,7 @@ bool __timer_start(void)
     return retval;
 }
 
-void __timer_stop(void)
+void timer_stop(void)
 {
     volatile unsigned long pimr = 0;
 
diff --git a/firmware/target/arm/at91sam/lyre_proto1/timer-target.h b/firmware/target/arm/at91sam/lyre_proto1/timer-target.h
index b8298d3..d077313 100644
--- a/firmware/target/arm/at91sam/lyre_proto1/timer-target.h
+++ b/firmware/target/arm/at91sam/lyre_proto1/timer-target.h
@@ -25,17 +25,4 @@
 /* timer is based on PCLK and minimum division is 2 */
 #define TIMER_FREQ (49156800/2)
 
-bool __timer_set(long cycles, bool set);
-bool __timer_start(void);
-void __timer_stop(void);
-
-#define __TIMER_SET(cycles, set) \
-    __timer_set(cycles, set)
-
-#define __TIMER_START() \
-    __timer_start()
-
-#define __TIMER_STOP(...) \
-    __timer_stop()
-
 #endif /* TIMER_TARGET_H */