Rename TIMER_REGISTER macro to TIMER_START and TIMER_UNREGISTER to TIMER_STOP to reflect what they does exactly.

registering and unregistering are handled by the non target-specific functions of timer.c
Remove arguments from the new TIMER_START since they are unused by targets

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21553 a1c6a512-1295-4272-9138-f99709370657

17 files changed, 68 insertions, 78 deletions

diff --git a/firmware/target/arm/as3525/timer-as3525.c b/firmware/target/arm/as3525/timer-as3525.c
index 755438a..50f0e73 100644
--- a/firmware/target/arm/as3525/timer-as3525.c
+++ b/firmware/target/arm/as3525/timer-as3525.c
@@ -53,14 +53,14 @@ bool __timer_set(long cycles, bool start)
     return true;
 }
 
-bool __timer_register(void)
+bool __timer_start(void)
 {
     CGU_PERI |= CGU_TIMER1_CLOCK_ENABLE;    /* enable peripheral */
     VIC_INT_ENABLE |= INTERRUPT_TIMER1;
     return true;
 }
 
-void __timer_unregister(void)
+void __timer_stop(void)
 {
     TIMER1_CONTROL &= 0x10; /* disable timer 1 (don't modify bit 4) */
     VIC_INT_EN_CLEAR = INTERRUPT_TIMER1;  /* disable interrupt */
diff --git a/firmware/target/arm/as3525/timer-target.h b/firmware/target/arm/as3525/timer-target.h
index 21ee6e7..b1bdfed 100644
--- a/firmware/target/arm/as3525/timer-target.h
+++ b/firmware/target/arm/as3525/timer-target.h
@@ -22,19 +22,18 @@
 #define TIMER_TARGET_H
 
 bool __timer_set(long cycles, bool set);
-bool __timer_register(void);
-void __timer_unregister(void);
+bool __timer_start(void);
+void __timer_stop(void);
 
 #define TIMER_FREQ (24000000 / 16)
 
 #define __TIMER_SET(cycles, set) \
     __timer_set(cycles, set)
 
-#define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \
-                              int_prio, timer_callback) \
-    __timer_register()
+#define __TIMER_START() \
+    __timer_start()
 
-#define __TIMER_UNREGISTER(...) \
-    __timer_unregister()
+#define __TIMER_STOP(...) \
+    __timer_stop()
 
 #endif /* TIMER_TARGET_H */
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 5924438..ef5c911 100644
--- a/firmware/target/arm/at91sam/lyre_proto1/timer-lyre_proto1.c
+++ b/firmware/target/arm/at91sam/lyre_proto1/timer-lyre_proto1.c
@@ -67,7 +67,7 @@ bool __timer_set(long cycles, bool start)
     return false;
 }
 
-bool __timer_register(void)
+bool __timer_start(void)
 {
     bool retval = true;
     volatile unsigned long pimr = 0;
@@ -101,7 +101,7 @@ bool __timer_register(void)
     return retval;
 }
 
-void __timer_unregister(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 d16577b..b8298d3 100644
--- a/firmware/target/arm/at91sam/lyre_proto1/timer-target.h
+++ b/firmware/target/arm/at91sam/lyre_proto1/timer-target.h
@@ -26,17 +26,16 @@
 #define TIMER_FREQ (49156800/2)
 
 bool __timer_set(long cycles, bool set);
-bool __timer_register(void);
-void __timer_unregister(void);
+bool __timer_start(void);
+void __timer_stop(void);
 
 #define __TIMER_SET(cycles, set) \
     __timer_set(cycles, set)
 
-#define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \
-                              int_prio, timer_callback) \
-    __timer_register()
+#define __TIMER_START() \
+    __timer_start()
 
-#define __TIMER_UNREGISTER(...) \
-    __timer_unregister()
+#define __TIMER_STOP(...) \
+    __timer_stop()
 
 #endif /* TIMER_TARGET_H */
diff --git a/firmware/target/arm/imx31/gigabeat-s/timer-imx31.c b/firmware/target/arm/imx31/gigabeat-s/timer-imx31.c
index d97743b..5e53e4a 100644
--- a/firmware/target/arm/imx31/gigabeat-s/timer-imx31.c
+++ b/firmware/target/arm/imx31/gigabeat-s/timer-imx31.c
@@ -86,7 +86,7 @@ bool _timer_set(long cycles, bool start)
     return true;
 }
 
-bool _timer_register(void)
+bool _timer_start(void)
 {
     int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS);
 
@@ -104,7 +104,7 @@ bool _timer_register(void)
     return true;
 }
 
-void _timer_unregister(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 2443b8c..f019a45 100644
--- a/firmware/target/arm/imx31/gigabeat-s/timer-target.h
+++ b/firmware/target/arm/imx31/gigabeat-s/timer-target.h
@@ -25,17 +25,16 @@
 #define TIMER_FREQ (66000000)
 
 bool _timer_set(long cycles, bool set);
-bool _timer_register(void);
-void _timer_unregister(void);
+bool _timer_start(void);
+void _timer_stop(void);
 
 #define __TIMER_SET(cycles, set) \
     _timer_set(cycles, set)
 
-#define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \
-                              int_prio, timer_callback) \
-    _timer_register()
+#define __TIMER_START() \
+    _timer_start()
 
-#define __TIMER_UNREGISTER(...) \
-    _timer_unregister()
+#define __TIMER_STOP(...) \
+    _timer_stop()
 
 #endif /* TIMER_TARGET_H */
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/timer-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/timer-meg-fx.c
index 7f50235..884b080 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/timer-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/timer-meg-fx.c
@@ -87,7 +87,7 @@ bool __timer_set(long cycles, bool start)
     return retval;
 }
 
-bool __timer_register(void)
+bool __timer_start(void)
 {
     bool retval = true;
 
@@ -122,7 +122,7 @@ bool __timer_register(void)
     return retval;
 }
 
-void __timer_unregister(void)
+void __timer_stop(void)
 {
     int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS);
     stop_timer();
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/timer-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/timer-target.h
index b5652a3..7008334 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/timer-target.h
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/timer-target.h
@@ -26,17 +26,16 @@
 #define TIMER234_PRESCALE 21
 
 bool __timer_set(long cycles, bool set);
-bool __timer_register(void);
-void __timer_unregister(void);
+bool __timer_start(void);
+void __timer_stop(void);
 
 #define __TIMER_SET(cycles, set) \
     __timer_set(cycles, set)
 
-#define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \
-                              int_prio, timer_callback) \
-    __timer_register()
+#define __TIMER_START() \
+    __timer_start()
 
-#define __TIMER_UNREGISTER(...) \
-    __timer_unregister()
+#define __TIMER_STOP(...) \
+    __timer_stop()
 
 #endif /* TIMER_TARGET_H */
diff --git a/firmware/target/arm/tcc77x/timer-target.h b/firmware/target/arm/tcc77x/timer-target.h
index 991d949..ace31ac 100644
--- a/firmware/target/arm/tcc77x/timer-target.h
+++ b/firmware/target/arm/tcc77x/timer-target.h
@@ -25,17 +25,16 @@
 #define TIMER_FREQ (12000000)
 
 bool __timer_set(long cycles, bool set);
-bool __timer_register(void);
-void __timer_unregister(void);
+bool __timer_start(void);
+void __timer_stop(void);
 
 #define __TIMER_SET(cycles, set) \
     __timer_set(cycles, set)
 
-#define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \
-                              int_prio, timer_callback) \
-    __timer_register()
+#define __TIMER_START() \
+    __timer_start()
 
-#define __TIMER_UNREGISTER(...) \
-    __timer_unregister()
+#define __TIMER_STOP(...) \
+    __timer_stop()
 
 #endif /* TIMER_TARGET_H */
diff --git a/firmware/target/arm/tcc77x/timer-tcc77x.c b/firmware/target/arm/tcc77x/timer-tcc77x.c
index 924ddda..ddf4445 100644
--- a/firmware/target/arm/tcc77x/timer-tcc77x.c
+++ b/firmware/target/arm/tcc77x/timer-tcc77x.c
@@ -37,14 +37,14 @@ bool __timer_set(long cycles, bool start)
     return false;
 }
 
-bool __timer_register(void)
+bool __timer_start(void)
 {
     #warning function not implemented
     
     return false;
 }
 
-void __timer_unregister(void)
+void __timer_stop(void)
 {
     #warning function not implemented
 }
diff --git a/firmware/target/arm/tcc780x/timer-target.h b/firmware/target/arm/tcc780x/timer-target.h
index 10090ce..d6a8c4b 100644
--- a/firmware/target/arm/tcc780x/timer-target.h
+++ b/firmware/target/arm/tcc780x/timer-target.h
@@ -25,17 +25,16 @@
 #define TIMER_FREQ (2000000)
 
 bool __timer_set(long cycles, bool set);
-bool __timer_register(void);
-void __timer_unregister(void);
+bool __timer_start(void);
+void __timer_stop(void);
 
 #define __TIMER_SET(cycles, set) \
     __timer_set(cycles, set)
 
-#define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \
-                              int_prio, timer_callback) \
-    __timer_register()
+#define __TIMER_START() \
+    __timer_start()
 
-#define __TIMER_UNREGISTER(...) \
-    __timer_unregister()
+#define __TIMER_STOP(...) \
+    __timer_stop()
 
 #endif /* TIMER_TARGET_H */
diff --git a/firmware/target/arm/tcc780x/timer-tcc780x.c b/firmware/target/arm/tcc780x/timer-tcc780x.c
index a6c8c1c..ddd3b1d 100644
--- a/firmware/target/arm/tcc780x/timer-tcc780x.c
+++ b/firmware/target/arm/tcc780x/timer-tcc780x.c
@@ -62,7 +62,7 @@ bool __timer_set(long cycles, bool start)
     return true;
 }
 
-bool __timer_register(void)
+bool __timer_start(void)
 {
     int oldstatus = disable_interrupt_save(IRQ_STATUS);
     
@@ -73,7 +73,7 @@ bool __timer_register(void)
     return true;
 }
 
-void __timer_unregister(void)
+void __timer_stop(void)
 {
     int oldstatus = disable_interrupt_save(IRQ_STATUS);
     
diff --git a/firmware/target/arm/tms320dm320/timer-dm320.c b/firmware/target/arm/tms320dm320/timer-dm320.c
index ff9beab..9357ffa 100644
--- a/firmware/target/arm/tms320dm320/timer-dm320.c
+++ b/firmware/target/arm/tms320dm320/timer-dm320.c
@@ -82,7 +82,7 @@ static void stop_timer(void)
     IO_CLK_MOD2 &= ~CLK_MOD2_TMR0; //disable TIMER0 clock
 }
 
-bool __timer_register(void)
+bool __timer_start(void)
 {
     int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS);
     
@@ -100,7 +100,7 @@ bool __timer_register(void)
     return true;
 }
 
-void __timer_unregister(void)
+void __timer_stop(void)
 {
     int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS);
     stop_timer();
diff --git a/firmware/target/arm/tms320dm320/timer-target.h b/firmware/target/arm/tms320dm320/timer-target.h
index e8f96ef..9f3ffdf 100644
--- a/firmware/target/arm/tms320dm320/timer-target.h
+++ b/firmware/target/arm/tms320dm320/timer-target.h
@@ -25,17 +25,16 @@
 #define TIMER_FREQ (27000000)
 
 bool __timer_set(long cycles, bool set);
-bool __timer_register(void);
-void __timer_unregister(void);
+bool __timer_start(void);
+void __timer_stop(void);
 
 #define __TIMER_SET(cycles, set) \
     __timer_set(cycles, set)
 
-#define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \
-                              int_prio, timer_callback) \
-    __timer_register()
+#define __TIMER_START() \
+    __timer_start()
 
-#define __TIMER_UNREGISTER(...) \
-    __timer_unregister()
+#define __TIMER_STOP(...) \
+    __timer_stop()
 
 #endif /* TIMER_TARGET_H */
diff --git a/firmware/target/mips/ingenic_jz47xx/timer-jz4740.c b/firmware/target/mips/ingenic_jz47xx/timer-jz4740.c
index 54ea17a..8258f7b 100644
--- a/firmware/target/mips/ingenic_jz47xx/timer-jz4740.c
+++ b/firmware/target/mips/ingenic_jz47xx/timer-jz4740.c
@@ -79,14 +79,14 @@ bool __timer_set(long cycles, bool start)
     return true;
 }
 
-bool __timer_register(void)
+bool __timer_start(void)
 {
     __tcu_start_counter(1);
 
     return true;
 }
 
-void __timer_unregister(void)
+void __timer_stop(void)
 {
     unsigned int old_irq = disable_irq_save();
     __tcu_stop_counter(1);
diff --git a/firmware/target/mips/ingenic_jz47xx/timer-target.h b/firmware/target/mips/ingenic_jz47xx/timer-target.h
index 40942d4..2e07244 100644
--- a/firmware/target/mips/ingenic_jz47xx/timer-target.h
+++ b/firmware/target/mips/ingenic_jz47xx/timer-target.h
@@ -27,17 +27,16 @@
 #define TIMER_FREQ (CFG_EXTAL) /* For full precision! */
 
 bool __timer_set(long cycles, bool set);
-bool __timer_register(void);
-void __timer_unregister(void);
+bool __timer_start(void);
+void __timer_stop(void);
 
 #define __TIMER_SET(cycles, set) \
     __timer_set(cycles, set)
 
-#define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \
-                              int_prio, timer_callback) \
-    __timer_register()
+#define __TIMER_START() \
+    __timer_start()
 
-#define __TIMER_UNREGISTER(...) \
-    __timer_unregister()
+#define __TIMER_STOP(...) \
+    __timer_stop()
 
 #endif /* __TIMER_H_ */
diff --git a/firmware/timer.c b/firmware/timer.c
index bcaacba..e5a6090 100644
--- a/firmware/timer.c
+++ b/firmware/timer.c
@@ -39,9 +39,8 @@ static long SHAREDBSS_ATTR cycles_new = 0;
 /* Define these if not defined by target to make the #else cases compile
  * even if the target doesn't have them implemented. */
 #define __TIMER_SET(cycles, set) false
-#define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \
-                         int_prio, timer_callback) false
-#define __TIMER_UNREGISTER(...)
+#define __TIMER_START() false
+#define __TIMER_STOP(...)
 #endif
 
 /* interrupt handler */
@@ -288,8 +287,7 @@ bool timer_register(int reg_prio, void (*unregister_callback)(void),
     irq_enable_int(IRQ_TIMER1);
     return true;
 #else
-    return __TIMER_REGISTER(reg_prio, unregister_callback, cycles,
-                            int_prio, timer_callback);
+    return __TIMER_START();
 #endif
     /* Cover for targets that don't use all these */
     (void)reg_prio;
@@ -321,7 +319,7 @@ void timer_unregister(void)
     TIMER1.ctrl &= ~0x80;  /* disable timer 1 */
     irq_disable_int(IRQ_TIMER1);
 #else
-    __TIMER_UNREGISTER();
+    __TIMER_STOP();
 #endif
     pfn_timer = NULL;
     pfn_unregister = NULL;