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/pnx0101 | |
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/pnx0101')
-rw-r--r-- | firmware/target/arm/pnx0101/timer-pnx0101.c | 6 | ||||
-rw-r--r-- | firmware/target/arm/pnx0101/timer-target.h | 13 |
2 files changed, 3 insertions, 16 deletions
diff --git a/firmware/target/arm/pnx0101/timer-pnx0101.c b/firmware/target/arm/pnx0101/timer-pnx0101.c index 6e685aa20f..d54cfe84d5 100644 --- a/firmware/target/arm/pnx0101/timer-pnx0101.c +++ b/firmware/target/arm/pnx0101/timer-pnx0101.c @@ -43,7 +43,7 @@ void TIMER1_ISR(void) TIMER1.clr = 1; /* clear the interrupt */ } -bool __timer_set(long cycles, bool start) +bool timer_set(long cycles, bool start) { if (start) { @@ -68,14 +68,14 @@ bool __timer_set(long cycles, bool start) return true; } -bool __timer_start(void) +bool timer_start(void) { irq_set_int_handler(IRQ_TIMER1, TIMER1_ISR); irq_enable_int(IRQ_TIMER1); return true; } -void __timer_stop(void) +void timer_stop(void) { TIMER1.ctrl &= ~0x80; /* disable timer 1 */ irq_disable_int(IRQ_TIMER1); diff --git a/firmware/target/arm/pnx0101/timer-target.h b/firmware/target/arm/pnx0101/timer-target.h index 853da07838..3bfdb8986d 100644 --- a/firmware/target/arm/pnx0101/timer-target.h +++ b/firmware/target/arm/pnx0101/timer-target.h @@ -21,19 +21,6 @@ #ifndef TIMER_TARGET_H #define TIMER_TARGET_H -bool __timer_set(long cycles, bool start); -bool __timer_start(void); -void __timer_stop(void); - #define TIMER_FREQ 3000000 -#define __TIMER_SET(cycles, set) \ - __timer_set(cycles, set) - -#define __TIMER_START() \ - __timer_start() - -#define __TIMER_STOP(...) \ - __timer_stop() - #endif /* TIMER_TARGET_H */ |