diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2009-06-29 14:29:57 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2009-06-29 14:29:57 +0000 |
commit | c5dedd7d762f48e940ecc0bd17dd2173d59a92e1 (patch) | |
tree | cd4d9dc085b4c40f281f17953a3e126dd1c0c02b /firmware/target/arm/s3c2440 | |
parent | 89ccd5c145e45ad541a02f38e2ad07fb916f7135 (diff) | |
download | rockbox-c5dedd7d762f48e940ecc0bd17dd2173d59a92e1.tar.gz rockbox-c5dedd7d762f48e940ecc0bd17dd2173d59a92e1.zip |
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
Diffstat (limited to 'firmware/target/arm/s3c2440')
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/timer-meg-fx.c | 6 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/timer-target.h | 13 |
2 files changed, 3 insertions, 16 deletions
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 884b0803a2..4565f79751 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/timer-meg-fx.c +++ b/firmware/target/arm/s3c2440/gigabeat-fx/timer-meg-fx.c | |||
@@ -48,7 +48,7 @@ static void stop_timer(void) | |||
48 | INTPND = TIMER0_MASK; | 48 | INTPND = TIMER0_MASK; |
49 | } | 49 | } |
50 | 50 | ||
51 | bool __timer_set(long cycles, bool start) | 51 | bool timer_set(long cycles, bool start) |
52 | { | 52 | { |
53 | bool retval = false; | 53 | bool retval = false; |
54 | 54 | ||
@@ -87,7 +87,7 @@ bool __timer_set(long cycles, bool start) | |||
87 | return retval; | 87 | return retval; |
88 | } | 88 | } |
89 | 89 | ||
90 | bool __timer_start(void) | 90 | bool timer_start(void) |
91 | { | 91 | { |
92 | bool retval = true; | 92 | bool retval = true; |
93 | 93 | ||
@@ -122,7 +122,7 @@ bool __timer_start(void) | |||
122 | return retval; | 122 | return retval; |
123 | } | 123 | } |
124 | 124 | ||
125 | void __timer_stop(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 700833486d..215477a806 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/timer-target.h +++ b/firmware/target/arm/s3c2440/gigabeat-fx/timer-target.h | |||
@@ -25,17 +25,4 @@ | |||
25 | #define TIMER_FREQ (49156800/2) | 25 | #define TIMER_FREQ (49156800/2) |
26 | #define TIMER234_PRESCALE 21 | 26 | #define TIMER234_PRESCALE 21 |
27 | 27 | ||
28 | bool __timer_set(long cycles, bool set); | ||
29 | bool __timer_start(void); | ||
30 | void __timer_stop(void); | ||
31 | |||
32 | #define __TIMER_SET(cycles, set) \ | ||
33 | __timer_set(cycles, set) | ||
34 | |||
35 | #define __TIMER_START() \ | ||
36 | __timer_start() | ||
37 | |||
38 | #define __TIMER_STOP(...) \ | ||
39 | __timer_stop() | ||
40 | |||
41 | #endif /* TIMER_TARGET_H */ | 28 | #endif /* TIMER_TARGET_H */ |