diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2009-06-29 14:28:56 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2009-06-29 14:28:56 +0000 |
commit | e0640c3c4b6d238e38155c863e542335ce57a425 (patch) | |
tree | ec0d956f861090a91021aee1d360e4a2c6449670 | |
parent | 15e40dd3a6ac8e9df88b77c0dbd9a90870ad91e6 (diff) | |
download | rockbox-e0640c3c4b6d238e38155c863e542335ce57a425.tar.gz rockbox-e0640c3c4b6d238e38155c863e542335ce57a425.zip |
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
-rw-r--r-- | firmware/target/arm/as3525/timer-as3525.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/as3525/timer-target.h | 13 | ||||
-rw-r--r-- | firmware/target/arm/at91sam/lyre_proto1/timer-lyre_proto1.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/at91sam/lyre_proto1/timer-target.h | 13 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/timer-imx31.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/timer-target.h | 13 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/timer-meg-fx.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/timer-target.h | 13 | ||||
-rw-r--r-- | firmware/target/arm/tcc77x/timer-target.h | 13 | ||||
-rw-r--r-- | firmware/target/arm/tcc77x/timer-tcc77x.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/tcc780x/timer-target.h | 13 | ||||
-rw-r--r-- | firmware/target/arm/tcc780x/timer-tcc780x.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/timer-dm320.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/timer-target.h | 13 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/timer-jz4740.c | 4 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/timer-target.h | 13 | ||||
-rw-r--r-- | firmware/timer.c | 10 |
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 755438a1f8..50f0e73158 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) | |||
53 | return true; | 53 | return true; |
54 | } | 54 | } |
55 | 55 | ||
56 | bool __timer_register(void) | 56 | bool __timer_start(void) |
57 | { | 57 | { |
58 | CGU_PERI |= CGU_TIMER1_CLOCK_ENABLE; /* enable peripheral */ | 58 | CGU_PERI |= CGU_TIMER1_CLOCK_ENABLE; /* enable peripheral */ |
59 | VIC_INT_ENABLE |= INTERRUPT_TIMER1; | 59 | VIC_INT_ENABLE |= INTERRUPT_TIMER1; |
60 | return true; | 60 | return true; |
61 | } | 61 | } |
62 | 62 | ||
63 | void __timer_unregister(void) | 63 | void __timer_stop(void) |
64 | { | 64 | { |
65 | TIMER1_CONTROL &= 0x10; /* disable timer 1 (don't modify bit 4) */ | 65 | TIMER1_CONTROL &= 0x10; /* disable timer 1 (don't modify bit 4) */ |
66 | VIC_INT_EN_CLEAR = INTERRUPT_TIMER1; /* disable interrupt */ | 66 | 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 21ee6e7804..b1bdfed78f 100644 --- a/firmware/target/arm/as3525/timer-target.h +++ b/firmware/target/arm/as3525/timer-target.h | |||
@@ -22,19 +22,18 @@ | |||
22 | #define TIMER_TARGET_H | 22 | #define TIMER_TARGET_H |
23 | 23 | ||
24 | bool __timer_set(long cycles, bool set); | 24 | bool __timer_set(long cycles, bool set); |
25 | bool __timer_register(void); | 25 | bool __timer_start(void); |
26 | void __timer_unregister(void); | 26 | void __timer_stop(void); |
27 | 27 | ||
28 | #define TIMER_FREQ (24000000 / 16) | 28 | #define TIMER_FREQ (24000000 / 16) |
29 | 29 | ||
30 | #define __TIMER_SET(cycles, set) \ | 30 | #define __TIMER_SET(cycles, set) \ |
31 | __timer_set(cycles, set) | 31 | __timer_set(cycles, set) |
32 | 32 | ||
33 | #define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \ | 33 | #define __TIMER_START() \ |
34 | int_prio, timer_callback) \ | 34 | __timer_start() |
35 | __timer_register() | ||
36 | 35 | ||
37 | #define __TIMER_UNREGISTER(...) \ | 36 | #define __TIMER_STOP(...) \ |
38 | __timer_unregister() | 37 | __timer_stop() |
39 | 38 | ||
40 | #endif /* TIMER_TARGET_H */ | 39 | #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 5924438d10..ef5c91169d 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) | |||
67 | return false; | 67 | return false; |
68 | } | 68 | } |
69 | 69 | ||
70 | bool __timer_register(void) | 70 | bool __timer_start(void) |
71 | { | 71 | { |
72 | bool retval = true; | 72 | bool retval = true; |
73 | volatile unsigned long pimr = 0; | 73 | volatile unsigned long pimr = 0; |
@@ -101,7 +101,7 @@ bool __timer_register(void) | |||
101 | return retval; | 101 | return retval; |
102 | } | 102 | } |
103 | 103 | ||
104 | void __timer_unregister(void) | 104 | void __timer_stop(void) |
105 | { | 105 | { |
106 | volatile unsigned long pimr = 0; | 106 | volatile unsigned long pimr = 0; |
107 | 107 | ||
diff --git a/firmware/target/arm/at91sam/lyre_proto1/timer-target.h b/firmware/target/arm/at91sam/lyre_proto1/timer-target.h index d16577b0de..b8298d3d77 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 @@ | |||
26 | #define TIMER_FREQ (49156800/2) | 26 | #define TIMER_FREQ (49156800/2) |
27 | 27 | ||
28 | bool __timer_set(long cycles, bool set); | 28 | bool __timer_set(long cycles, bool set); |
29 | bool __timer_register(void); | 29 | bool __timer_start(void); |
30 | void __timer_unregister(void); | 30 | void __timer_stop(void); |
31 | 31 | ||
32 | #define __TIMER_SET(cycles, set) \ | 32 | #define __TIMER_SET(cycles, set) \ |
33 | __timer_set(cycles, set) | 33 | __timer_set(cycles, set) |
34 | 34 | ||
35 | #define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \ | 35 | #define __TIMER_START() \ |
36 | int_prio, timer_callback) \ | 36 | __timer_start() |
37 | __timer_register() | ||
38 | 37 | ||
39 | #define __TIMER_UNREGISTER(...) \ | 38 | #define __TIMER_STOP(...) \ |
40 | __timer_unregister() | 39 | __timer_stop() |
41 | 40 | ||
42 | #endif /* TIMER_TARGET_H */ | 41 | #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 d97743b0b8..5e53e4a55e 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) | |||
86 | return true; | 86 | return true; |
87 | } | 87 | } |
88 | 88 | ||
89 | bool _timer_register(void) | 89 | bool _timer_start(void) |
90 | { | 90 | { |
91 | int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS); | 91 | int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS); |
92 | 92 | ||
@@ -104,7 +104,7 @@ bool _timer_register(void) | |||
104 | return true; | 104 | return true; |
105 | } | 105 | } |
106 | 106 | ||
107 | void _timer_unregister(void) | 107 | void _timer_stop(void) |
108 | { | 108 | { |
109 | int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS); | 109 | int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS); |
110 | /* Halt timer if running - stop module clock */ | 110 | /* 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 2443b8ce95..f019a45519 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 @@ | |||
25 | #define TIMER_FREQ (66000000) | 25 | #define TIMER_FREQ (66000000) |
26 | 26 | ||
27 | bool _timer_set(long cycles, bool set); | 27 | bool _timer_set(long cycles, bool set); |
28 | bool _timer_register(void); | 28 | bool _timer_start(void); |
29 | void _timer_unregister(void); | 29 | void _timer_stop(void); |
30 | 30 | ||
31 | #define __TIMER_SET(cycles, set) \ | 31 | #define __TIMER_SET(cycles, set) \ |
32 | _timer_set(cycles, set) | 32 | _timer_set(cycles, set) |
33 | 33 | ||
34 | #define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \ | 34 | #define __TIMER_START() \ |
35 | int_prio, timer_callback) \ | 35 | _timer_start() |
36 | _timer_register() | ||
37 | 36 | ||
38 | #define __TIMER_UNREGISTER(...) \ | 37 | #define __TIMER_STOP(...) \ |
39 | _timer_unregister() | 38 | _timer_stop() |
40 | 39 | ||
41 | #endif /* TIMER_TARGET_H */ | 40 | #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 7f5023585c..884b0803a2 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) | |||
87 | return retval; | 87 | return retval; |
88 | } | 88 | } |
89 | 89 | ||
90 | bool __timer_register(void) | 90 | bool __timer_start(void) |
91 | { | 91 | { |
92 | bool retval = true; | 92 | bool retval = true; |
93 | 93 | ||
@@ -122,7 +122,7 @@ bool __timer_register(void) | |||
122 | return retval; | 122 | return retval; |
123 | } | 123 | } |
124 | 124 | ||
125 | void __timer_unregister(void) | 125 | void __timer_stop(void) |
126 | { | 126 | { |
127 | int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS); | 127 | int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS); |
128 | stop_timer(); | 128 | 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 b5652a3365..700833486d 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 @@ | |||
26 | #define TIMER234_PRESCALE 21 | 26 | #define TIMER234_PRESCALE 21 |
27 | 27 | ||
28 | bool __timer_set(long cycles, bool set); | 28 | bool __timer_set(long cycles, bool set); |
29 | bool __timer_register(void); | 29 | bool __timer_start(void); |
30 | void __timer_unregister(void); | 30 | void __timer_stop(void); |
31 | 31 | ||
32 | #define __TIMER_SET(cycles, set) \ | 32 | #define __TIMER_SET(cycles, set) \ |
33 | __timer_set(cycles, set) | 33 | __timer_set(cycles, set) |
34 | 34 | ||
35 | #define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \ | 35 | #define __TIMER_START() \ |
36 | int_prio, timer_callback) \ | 36 | __timer_start() |
37 | __timer_register() | ||
38 | 37 | ||
39 | #define __TIMER_UNREGISTER(...) \ | 38 | #define __TIMER_STOP(...) \ |
40 | __timer_unregister() | 39 | __timer_stop() |
41 | 40 | ||
42 | #endif /* TIMER_TARGET_H */ | 41 | #endif /* TIMER_TARGET_H */ |
diff --git a/firmware/target/arm/tcc77x/timer-target.h b/firmware/target/arm/tcc77x/timer-target.h index 991d949447..ace31ac886 100644 --- a/firmware/target/arm/tcc77x/timer-target.h +++ b/firmware/target/arm/tcc77x/timer-target.h | |||
@@ -25,17 +25,16 @@ | |||
25 | #define TIMER_FREQ (12000000) | 25 | #define TIMER_FREQ (12000000) |
26 | 26 | ||
27 | bool __timer_set(long cycles, bool set); | 27 | bool __timer_set(long cycles, bool set); |
28 | bool __timer_register(void); | 28 | bool __timer_start(void); |
29 | void __timer_unregister(void); | 29 | void __timer_stop(void); |
30 | 30 | ||
31 | #define __TIMER_SET(cycles, set) \ | 31 | #define __TIMER_SET(cycles, set) \ |
32 | __timer_set(cycles, set) | 32 | __timer_set(cycles, set) |
33 | 33 | ||
34 | #define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \ | 34 | #define __TIMER_START() \ |
35 | int_prio, timer_callback) \ | 35 | __timer_start() |
36 | __timer_register() | ||
37 | 36 | ||
38 | #define __TIMER_UNREGISTER(...) \ | 37 | #define __TIMER_STOP(...) \ |
39 | __timer_unregister() | 38 | __timer_stop() |
40 | 39 | ||
41 | #endif /* TIMER_TARGET_H */ | 40 | #endif /* TIMER_TARGET_H */ |
diff --git a/firmware/target/arm/tcc77x/timer-tcc77x.c b/firmware/target/arm/tcc77x/timer-tcc77x.c index 924ddda625..ddf44454c2 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) | |||
37 | return false; | 37 | return false; |
38 | } | 38 | } |
39 | 39 | ||
40 | bool __timer_register(void) | 40 | bool __timer_start(void) |
41 | { | 41 | { |
42 | #warning function not implemented | 42 | #warning function not implemented |
43 | 43 | ||
44 | return false; | 44 | return false; |
45 | } | 45 | } |
46 | 46 | ||
47 | void __timer_unregister(void) | 47 | void __timer_stop(void) |
48 | { | 48 | { |
49 | #warning function not implemented | 49 | #warning function not implemented |
50 | } | 50 | } |
diff --git a/firmware/target/arm/tcc780x/timer-target.h b/firmware/target/arm/tcc780x/timer-target.h index 10090ceddc..d6a8c4b0aa 100644 --- a/firmware/target/arm/tcc780x/timer-target.h +++ b/firmware/target/arm/tcc780x/timer-target.h | |||
@@ -25,17 +25,16 @@ | |||
25 | #define TIMER_FREQ (2000000) | 25 | #define TIMER_FREQ (2000000) |
26 | 26 | ||
27 | bool __timer_set(long cycles, bool set); | 27 | bool __timer_set(long cycles, bool set); |
28 | bool __timer_register(void); | 28 | bool __timer_start(void); |
29 | void __timer_unregister(void); | 29 | void __timer_stop(void); |
30 | 30 | ||
31 | #define __TIMER_SET(cycles, set) \ | 31 | #define __TIMER_SET(cycles, set) \ |
32 | __timer_set(cycles, set) | 32 | __timer_set(cycles, set) |
33 | 33 | ||
34 | #define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \ | 34 | #define __TIMER_START() \ |
35 | int_prio, timer_callback) \ | 35 | __timer_start() |
36 | __timer_register() | ||
37 | 36 | ||
38 | #define __TIMER_UNREGISTER(...) \ | 37 | #define __TIMER_STOP(...) \ |
39 | __timer_unregister() | 38 | __timer_stop() |
40 | 39 | ||
41 | #endif /* TIMER_TARGET_H */ | 40 | #endif /* TIMER_TARGET_H */ |
diff --git a/firmware/target/arm/tcc780x/timer-tcc780x.c b/firmware/target/arm/tcc780x/timer-tcc780x.c index a6c8c1c060..ddd3b1d694 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) | |||
62 | return true; | 62 | return true; |
63 | } | 63 | } |
64 | 64 | ||
65 | bool __timer_register(void) | 65 | bool __timer_start(void) |
66 | { | 66 | { |
67 | int oldstatus = disable_interrupt_save(IRQ_STATUS); | 67 | int oldstatus = disable_interrupt_save(IRQ_STATUS); |
68 | 68 | ||
@@ -73,7 +73,7 @@ bool __timer_register(void) | |||
73 | return true; | 73 | return true; |
74 | } | 74 | } |
75 | 75 | ||
76 | void __timer_unregister(void) | 76 | void __timer_stop(void) |
77 | { | 77 | { |
78 | int oldstatus = disable_interrupt_save(IRQ_STATUS); | 78 | int oldstatus = disable_interrupt_save(IRQ_STATUS); |
79 | 79 | ||
diff --git a/firmware/target/arm/tms320dm320/timer-dm320.c b/firmware/target/arm/tms320dm320/timer-dm320.c index ff9beab96c..9357ffa9de 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) | |||
82 | IO_CLK_MOD2 &= ~CLK_MOD2_TMR0; //disable TIMER0 clock | 82 | IO_CLK_MOD2 &= ~CLK_MOD2_TMR0; //disable TIMER0 clock |
83 | } | 83 | } |
84 | 84 | ||
85 | bool __timer_register(void) | 85 | bool __timer_start(void) |
86 | { | 86 | { |
87 | int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS); | 87 | int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS); |
88 | 88 | ||
@@ -100,7 +100,7 @@ bool __timer_register(void) | |||
100 | return true; | 100 | return true; |
101 | } | 101 | } |
102 | 102 | ||
103 | void __timer_unregister(void) | 103 | void __timer_stop(void) |
104 | { | 104 | { |
105 | int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS); | 105 | int oldstatus = disable_interrupt_save(IRQ_FIQ_STATUS); |
106 | stop_timer(); | 106 | stop_timer(); |
diff --git a/firmware/target/arm/tms320dm320/timer-target.h b/firmware/target/arm/tms320dm320/timer-target.h index e8f96ef793..9f3ffdf712 100644 --- a/firmware/target/arm/tms320dm320/timer-target.h +++ b/firmware/target/arm/tms320dm320/timer-target.h | |||
@@ -25,17 +25,16 @@ | |||
25 | #define TIMER_FREQ (27000000) | 25 | #define TIMER_FREQ (27000000) |
26 | 26 | ||
27 | bool __timer_set(long cycles, bool set); | 27 | bool __timer_set(long cycles, bool set); |
28 | bool __timer_register(void); | 28 | bool __timer_start(void); |
29 | void __timer_unregister(void); | 29 | void __timer_stop(void); |
30 | 30 | ||
31 | #define __TIMER_SET(cycles, set) \ | 31 | #define __TIMER_SET(cycles, set) \ |
32 | __timer_set(cycles, set) | 32 | __timer_set(cycles, set) |
33 | 33 | ||
34 | #define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \ | 34 | #define __TIMER_START() \ |
35 | int_prio, timer_callback) \ | 35 | __timer_start() |
36 | __timer_register() | ||
37 | 36 | ||
38 | #define __TIMER_UNREGISTER(...) \ | 37 | #define __TIMER_STOP(...) \ |
39 | __timer_unregister() | 38 | __timer_stop() |
40 | 39 | ||
41 | #endif /* TIMER_TARGET_H */ | 40 | #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 54ea17a063..8258f7b2be 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) | |||
79 | return true; | 79 | return true; |
80 | } | 80 | } |
81 | 81 | ||
82 | bool __timer_register(void) | 82 | bool __timer_start(void) |
83 | { | 83 | { |
84 | __tcu_start_counter(1); | 84 | __tcu_start_counter(1); |
85 | 85 | ||
86 | return true; | 86 | return true; |
87 | } | 87 | } |
88 | 88 | ||
89 | void __timer_unregister(void) | 89 | void __timer_stop(void) |
90 | { | 90 | { |
91 | unsigned int old_irq = disable_irq_save(); | 91 | unsigned int old_irq = disable_irq_save(); |
92 | __tcu_stop_counter(1); | 92 | __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 40942d4b4c..2e072440ab 100644 --- a/firmware/target/mips/ingenic_jz47xx/timer-target.h +++ b/firmware/target/mips/ingenic_jz47xx/timer-target.h | |||
@@ -27,17 +27,16 @@ | |||
27 | #define TIMER_FREQ (CFG_EXTAL) /* For full precision! */ | 27 | #define TIMER_FREQ (CFG_EXTAL) /* For full precision! */ |
28 | 28 | ||
29 | bool __timer_set(long cycles, bool set); | 29 | bool __timer_set(long cycles, bool set); |
30 | bool __timer_register(void); | 30 | bool __timer_start(void); |
31 | void __timer_unregister(void); | 31 | void __timer_stop(void); |
32 | 32 | ||
33 | #define __TIMER_SET(cycles, set) \ | 33 | #define __TIMER_SET(cycles, set) \ |
34 | __timer_set(cycles, set) | 34 | __timer_set(cycles, set) |
35 | 35 | ||
36 | #define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \ | 36 | #define __TIMER_START() \ |
37 | int_prio, timer_callback) \ | 37 | __timer_start() |
38 | __timer_register() | ||
39 | 38 | ||
40 | #define __TIMER_UNREGISTER(...) \ | 39 | #define __TIMER_STOP(...) \ |
41 | __timer_unregister() | 40 | __timer_stop() |
42 | 41 | ||
43 | #endif /* __TIMER_H_ */ | 42 | #endif /* __TIMER_H_ */ |
diff --git a/firmware/timer.c b/firmware/timer.c index bcaacba307..e5a60902b6 100644 --- a/firmware/timer.c +++ b/firmware/timer.c | |||
@@ -39,9 +39,8 @@ static long SHAREDBSS_ATTR cycles_new = 0; | |||
39 | /* Define these if not defined by target to make the #else cases compile | 39 | /* Define these if not defined by target to make the #else cases compile |
40 | * even if the target doesn't have them implemented. */ | 40 | * even if the target doesn't have them implemented. */ |
41 | #define __TIMER_SET(cycles, set) false | 41 | #define __TIMER_SET(cycles, set) false |
42 | #define __TIMER_REGISTER(reg_prio, unregister_callback, cycles, \ | 42 | #define __TIMER_START() false |
43 | int_prio, timer_callback) false | 43 | #define __TIMER_STOP(...) |
44 | #define __TIMER_UNREGISTER(...) | ||
45 | #endif | 44 | #endif |
46 | 45 | ||
47 | /* interrupt handler */ | 46 | /* interrupt handler */ |
@@ -288,8 +287,7 @@ bool timer_register(int reg_prio, void (*unregister_callback)(void), | |||
288 | irq_enable_int(IRQ_TIMER1); | 287 | irq_enable_int(IRQ_TIMER1); |
289 | return true; | 288 | return true; |
290 | #else | 289 | #else |
291 | return __TIMER_REGISTER(reg_prio, unregister_callback, cycles, | 290 | return __TIMER_START(); |
292 | int_prio, timer_callback); | ||
293 | #endif | 291 | #endif |
294 | /* Cover for targets that don't use all these */ | 292 | /* Cover for targets that don't use all these */ |
295 | (void)reg_prio; | 293 | (void)reg_prio; |
@@ -321,7 +319,7 @@ void timer_unregister(void) | |||
321 | TIMER1.ctrl &= ~0x80; /* disable timer 1 */ | 319 | TIMER1.ctrl &= ~0x80; /* disable timer 1 */ |
322 | irq_disable_int(IRQ_TIMER1); | 320 | irq_disable_int(IRQ_TIMER1); |
323 | #else | 321 | #else |
324 | __TIMER_UNREGISTER(); | 322 | __TIMER_STOP(); |
325 | #endif | 323 | #endif |
326 | pfn_timer = NULL; | 324 | pfn_timer = NULL; |
327 | pfn_unregister = NULL; | 325 | pfn_unregister = NULL; |