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/imx31/gigabeat-s/timer-imx31.c b/firmware/target/arm/imx31/gigabeat-s/timer-imx31.c
index 5e53e4a55e..f3f78a1ee1 100644
--- a/firmware/target/arm/imx31/gigabeat-s/timer-imx31.c
+++ b/firmware/target/arm/imx31/gigabeat-s/timer-imx31.c
@@ -52,7 +52,7 @@ static void stop_timer(bool clock_off)
     }
 }
 
-bool _timer_set(long cycles, bool start)
+bool timer_set(long cycles, bool start)
 {
     /* Maximum cycle count expressible in the cycles parameter is 2^31-1
      * and the modulus counter is capable of 2^32-1 and as a result there is
@@ -86,7 +86,7 @@ bool _timer_set(long cycles, bool start)
     return true;
 }
 
-bool _timer_start(void)
+bool timer_start(void)
 {
     int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS);
 
@@ -104,7 +104,7 @@ bool _timer_start(void)
     return true;
 }
 
-void _timer_stop(void)
+void timer_stop(void)
 {
     int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS);
     /* Halt timer if running - stop module clock */
diff --git a/firmware/target/arm/imx31/gigabeat-s/timer-target.h b/firmware/target/arm/imx31/gigabeat-s/timer-target.h
index f019a45519..9d5520aa6d 100644
--- a/firmware/target/arm/imx31/gigabeat-s/timer-target.h
+++ b/firmware/target/arm/imx31/gigabeat-s/timer-target.h
@@ -24,17 +24,4 @@
 /* timer is based on ipg_clk */
 #define TIMER_FREQ (66000000)
 
-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 */