diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2009-06-29 14:30:12 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2009-06-29 14:30:12 +0000 |
commit | ffefe0c08bdeeab725ce5fc054b3add4e05a1f7f (patch) | |
tree | dfc702293ed4218f62c57b8d3ba29e5ae49dc263 /firmware/target/arm/s3c2440/gigabeat-fx | |
parent | c5dedd7d762f48e940ecc0bd17dd2173d59a92e1 (diff) | |
download | rockbox-ffefe0c08bdeeab725ce5fc054b3add4e05a1f7f.tar.gz rockbox-ffefe0c08bdeeab725ce5fc054b3add4e05a1f7f.zip |
Put TIMER_FREQ definition in CPU-specific config, and remove timer-target.h
Note : SH has TIMER_FREQ defined to CPU_FREQ, so any code wanting it must include #config.h before #cpu.h
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21560 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/s3c2440/gigabeat-fx')
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/timer-target.h | 28 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c | 2 |
2 files changed, 1 insertions, 29 deletions
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/timer-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/timer-target.h deleted file mode 100644 index 215477a806..0000000000 --- a/firmware/target/arm/s3c2440/gigabeat-fx/timer-target.h +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2007 by Michael Sevakis | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * as published by the Free Software Foundation; either version 2 | ||
15 | * of the License, or (at your option) any later version. | ||
16 | * | ||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
18 | * KIND, either express or implied. | ||
19 | * | ||
20 | ****************************************************************************/ | ||
21 | #ifndef TIMER_TARGET_H | ||
22 | #define TIMER_TARGET_H | ||
23 | |||
24 | /* timer is based on PCLK and minimum division is 2 */ | ||
25 | #define TIMER_FREQ (49156800/2) | ||
26 | #define TIMER234_PRESCALE 21 | ||
27 | |||
28 | #endif /* TIMER_TARGET_H */ | ||
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c index de965f0750..52c26b898d 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c +++ b/firmware/target/arm/s3c2440/gigabeat-fx/wmcodec-meg-fx.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #include "sound.h" | 30 | #include "sound.h" |
31 | #include "i2c-meg-fx.h" | 31 | #include "i2c-meg-fx.h" |
32 | #include "system-target.h" | 32 | #include "system-target.h" |
33 | #include "timer-target.h" | 33 | #include "timer.h" |
34 | #include "wmcodec.h" | 34 | #include "wmcodec.h" |
35 | 35 | ||
36 | #ifdef HAVE_HARDWARE_BEEP | 36 | #ifdef HAVE_HARDWARE_BEEP |