diff options
author | Jens Arnold <amiconn@rockbox.org> | 2007-02-18 08:46:12 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2007-02-18 08:46:12 +0000 |
commit | c652218d14ec017984c5c3fea973112a6f93956d (patch) | |
tree | 95da404e59a4babaeff06cad4ecdee3c2b548c38 | |
parent | 9a6f419775270340ee154c55dbe52e99682fb77a (diff) | |
download | rockbox-c652218d14ec017984c5c3fea973112a6f93956d.tar.gz rockbox-c652218d14ec017984c5c3fea973112a6f93956d.zip |
Fix remaining CONFIG_TUNER checks.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12385 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/main_menu.c | 2 | ||||
-rw-r--r-- | apps/recorder/radio.c | 2 | ||||
-rw-r--r-- | apps/recorder/radio.h | 2 | ||||
-rw-r--r-- | apps/settings.h | 8 | ||||
-rw-r--r-- | apps/settings_list.c | 6 | ||||
-rw-r--r-- | apps/sound_menu.c | 2 | ||||
-rw-r--r-- | firmware/drivers/fmradio.c | 2 | ||||
-rw-r--r-- | firmware/drivers/power.c | 4 | ||||
-rw-r--r-- | firmware/export/audio.h | 8 | ||||
-rw-r--r-- | firmware/export/power.h | 2 | ||||
-rw-r--r-- | firmware/export/tuner.h | 4 | ||||
-rw-r--r-- | firmware/target/arm/iriver/h10/power-h10.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/iriver/ifp7xx/power-ifp7xx.c | 4 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/h100/power-h100.c | 4 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/h300/power-h300.c | 4 | ||||
-rw-r--r-- | uisimulator/common/fmradio.c | 2 |
16 files changed, 30 insertions, 30 deletions
diff --git a/apps/main_menu.c b/apps/main_menu.c index d9419c3a2b..e3cc88fdda 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c | |||
@@ -143,7 +143,7 @@ bool main_menu(void) | |||
143 | items[i].desc = ID2P(LANG_CUSTOM_THEME); | 143 | items[i].desc = ID2P(LANG_CUSTOM_THEME); |
144 | items[i++].function = custom_theme_browse; | 144 | items[i++].function = custom_theme_browse; |
145 | 145 | ||
146 | #ifdef CONFIG_TUNER | 146 | #if CONFIG_TUNER |
147 | if(radio_hardware_present()) { | 147 | if(radio_hardware_present()) { |
148 | items[i].desc = ID2P(LANG_FM_RADIO); | 148 | items[i].desc = ID2P(LANG_FM_RADIO); |
149 | items[i++].function = radio_screen; | 149 | items[i++].function = radio_screen; |
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index a1821de58f..5ee5be14fd 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -61,7 +61,7 @@ | |||
61 | #include "dir.h" | 61 | #include "dir.h" |
62 | #include "action.h" | 62 | #include "action.h" |
63 | 63 | ||
64 | #ifdef CONFIG_TUNER | 64 | #if CONFIG_TUNER |
65 | 65 | ||
66 | #if CONFIG_KEYPAD == RECORDER_PAD | 66 | #if CONFIG_KEYPAD == RECORDER_PAD |
67 | #define FM_RECORD | 67 | #define FM_RECORD |
diff --git a/apps/recorder/radio.h b/apps/recorder/radio.h index a4f9f1a978..bbc35b71aa 100644 --- a/apps/recorder/radio.h +++ b/apps/recorder/radio.h | |||
@@ -23,7 +23,7 @@ | |||
23 | #include "fmradio.h" | 23 | #include "fmradio.h" |
24 | #endif | 24 | #endif |
25 | 25 | ||
26 | #ifdef CONFIG_TUNER | 26 | #if CONFIG_TUNER |
27 | void radio_load_presets(char *filename); | 27 | void radio_load_presets(char *filename); |
28 | void radio_init(void); | 28 | void radio_init(void); |
29 | bool radio_screen(void); | 29 | bool radio_screen(void); |
diff --git a/apps/settings.h b/apps/settings.h index af1d65d78f..52a45c18ae 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -273,7 +273,7 @@ struct system_status | |||
273 | #ifdef HAVE_DIRCACHE | 273 | #ifdef HAVE_DIRCACHE |
274 | int dircache_size; /* directory cache structure last size, 22 bits */ | 274 | int dircache_size; /* directory cache structure last size, 22 bits */ |
275 | #endif | 275 | #endif |
276 | #ifdef CONFIG_TUNER | 276 | #if CONFIG_TUNER |
277 | int last_frequency; /* Last frequency for resuming, in FREQ_STEP units, | 277 | int last_frequency; /* Last frequency for resuming, in FREQ_STEP units, |
278 | relative to MIN_FREQ */ | 278 | relative to MIN_FREQ */ |
279 | #endif | 279 | #endif |
@@ -404,7 +404,7 @@ struct user_settings | |||
404 | 404 | ||
405 | bool resume; /* resume option: 0=off, 1=on */ | 405 | bool resume; /* resume option: 0=off, 1=on */ |
406 | 406 | ||
407 | #ifdef CONFIG_TUNER | 407 | #if CONFIG_TUNER |
408 | unsigned char fmr_file[MAX_FILENAME+1]; /* last fmr preset */ | 408 | unsigned char fmr_file[MAX_FILENAME+1]; /* last fmr preset */ |
409 | #endif | 409 | #endif |
410 | unsigned char font_file[MAX_FILENAME+1]; /* last font */ | 410 | unsigned char font_file[MAX_FILENAME+1]; /* last font */ |
@@ -476,7 +476,7 @@ struct user_settings | |||
476 | bool fade_on_stop; /* fade on pause/unpause/stop */ | 476 | bool fade_on_stop; /* fade on pause/unpause/stop */ |
477 | bool caption_backlight; /* turn on backlight at end and start of track */ | 477 | bool caption_backlight; /* turn on backlight at end and start of track */ |
478 | 478 | ||
479 | #ifdef CONFIG_TUNER | 479 | #if CONFIG_TUNER |
480 | int fm_freq_step; /* Frequency step for manual tuning, in kHz */ | 480 | int fm_freq_step; /* Frequency step for manual tuning, in kHz */ |
481 | bool fm_force_mono; /* Forces Mono mode if true */ | 481 | bool fm_force_mono; /* Forces Mono mode if true */ |
482 | bool fm_full_range; /* Enables full 10MHz-160MHz range if true, else | 482 | bool fm_full_range; /* Enables full 10MHz-160MHz range if true, else |
@@ -663,7 +663,7 @@ struct user_settings | |||
663 | int unplug_rw; /* time in s to rewind when pausing */ | 663 | int unplug_rw; /* time in s to rewind when pausing */ |
664 | bool unplug_autoresume; /* disable auto-resume if no phones */ | 664 | bool unplug_autoresume; /* disable auto-resume if no phones */ |
665 | #endif | 665 | #endif |
666 | #ifdef CONFIG_TUNER | 666 | #if CONFIG_TUNER |
667 | int fm_region; | 667 | int fm_region; |
668 | #endif | 668 | #endif |
669 | bool audioscrobbler; /* Audioscrobbler logging */ | 669 | bool audioscrobbler; /* Audioscrobbler logging */ |
diff --git a/apps/settings_list.c b/apps/settings_list.c index ee70e8c40b..be693d1801 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -480,7 +480,7 @@ const struct settings_list settings[] = { | |||
480 | LANG_CAR_ADAPTER_MODE, false, "car adapter mode", NULL), | 480 | LANG_CAR_ADAPTER_MODE, false, "car adapter mode", NULL), |
481 | #endif | 481 | #endif |
482 | /* tuner */ | 482 | /* tuner */ |
483 | #ifdef CONFIG_TUNER | 483 | #if CONFIG_TUNER |
484 | OFFON_SETTING(0,fm_force_mono, LANG_FM_MONO_MODE, | 484 | OFFON_SETTING(0,fm_force_mono, LANG_FM_MONO_MODE, |
485 | false,"force fm mono", NULL), | 485 | false,"force fm mono", NULL), |
486 | SYSTEM_SETTING(NVRAM(4),last_frequency,0), | 486 | SYSTEM_SETTING(NVRAM(4),last_frequency,0), |
@@ -1022,7 +1022,7 @@ const struct settings_list settings[] = { | |||
1022 | OFFON_SETTING(0,unplug_autoresume,LANG_UNPLUG_DISABLE_AUTORESUME,false, | 1022 | OFFON_SETTING(0,unplug_autoresume,LANG_UNPLUG_DISABLE_AUTORESUME,false, |
1023 | "disable autoresume if phones not present",NULL), | 1023 | "disable autoresume if phones not present",NULL), |
1024 | #endif | 1024 | #endif |
1025 | #ifdef CONFIG_TUNER | 1025 | #if CONFIG_TUNER |
1026 | {F_T_INT,&global_settings.fm_region,LANG_FM_REGION,INT(0), | 1026 | {F_T_INT,&global_settings.fm_region,LANG_FM_REGION,INT(0), |
1027 | "fm_region","eu,us,jp,kr",UNUSED}, | 1027 | "fm_region","eu,us,jp,kr",UNUSED}, |
1028 | #endif | 1028 | #endif |
@@ -1036,7 +1036,7 @@ const struct settings_list settings[] = { | |||
1036 | #endif | 1036 | #endif |
1037 | 1037 | ||
1038 | /** settings not in the old config blocks **/ | 1038 | /** settings not in the old config blocks **/ |
1039 | #ifdef CONFIG_TUNER | 1039 | #if CONFIG_TUNER |
1040 | FILENAME_SETTING(0, fmr_file, "fmr", | 1040 | FILENAME_SETTING(0, fmr_file, "fmr", |
1041 | "", FMPRESET_PATH "/", ".fmr", MAX_FILENAME+1), | 1041 | "", FMPRESET_PATH "/", ".fmr", MAX_FILENAME+1), |
1042 | #endif | 1042 | #endif |
diff --git a/apps/sound_menu.c b/apps/sound_menu.c index 07f9d4b352..c75b527db7 100644 --- a/apps/sound_menu.c +++ b/apps/sound_menu.c | |||
@@ -41,7 +41,7 @@ | |||
41 | #include "sound.h" | 41 | #include "sound.h" |
42 | #ifdef HAVE_RECORDING | 42 | #ifdef HAVE_RECORDING |
43 | #include "audio.h" | 43 | #include "audio.h" |
44 | #ifdef CONFIG_TUNER | 44 | #if CONFIG_TUNER |
45 | #include "radio.h" | 45 | #include "radio.h" |
46 | #endif | 46 | #endif |
47 | #endif | 47 | #endif |
diff --git a/firmware/drivers/fmradio.c b/firmware/drivers/fmradio.c index b7b245e0ce..c64d06e066 100644 --- a/firmware/drivers/fmradio.c +++ b/firmware/drivers/fmradio.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include "debug.h" | 23 | #include "debug.h" |
24 | #include "system.h" | 24 | #include "system.h" |
25 | 25 | ||
26 | #ifdef CONFIG_TUNER | 26 | #if CONFIG_TUNER |
27 | 27 | ||
28 | /* Signals: | 28 | /* Signals: |
29 | DI (Data In) - PB0 (doubles as data pin for the LCD) | 29 | DI (Data In) - PB0 (doubles as data pin for the LCD) |
diff --git a/firmware/drivers/power.c b/firmware/drivers/power.c index 78e70f7466..9334b8e54a 100644 --- a/firmware/drivers/power.c +++ b/firmware/drivers/power.c | |||
@@ -34,7 +34,7 @@ bool charger_enabled; | |||
34 | #endif | 34 | #endif |
35 | 35 | ||
36 | 36 | ||
37 | #ifdef CONFIG_TUNER | 37 | #if CONFIG_TUNER |
38 | 38 | ||
39 | static bool powered = false; | 39 | static bool powered = false; |
40 | 40 | ||
@@ -59,7 +59,7 @@ bool radio_power(bool status) | |||
59 | return old_status; | 59 | return old_status; |
60 | } | 60 | } |
61 | 61 | ||
62 | #endif /* #ifdef CONFIG_TUNER */ | 62 | #endif /* #if CONFIG_TUNER */ |
63 | 63 | ||
64 | #ifndef SIMULATOR | 64 | #ifndef SIMULATOR |
65 | 65 | ||
diff --git a/firmware/export/audio.h b/firmware/export/audio.h index 716b1ad5d3..ebcb316cd9 100644 --- a/firmware/export/audio.h +++ b/firmware/export/audio.h | |||
@@ -136,14 +136,14 @@ enum audio_sources | |||
136 | #ifdef HAVE_SPDIF_IN | 136 | #ifdef HAVE_SPDIF_IN |
137 | AUDIO_SRC_SPDIF, /* monitor spdif */ | 137 | AUDIO_SRC_SPDIF, /* monitor spdif */ |
138 | #endif | 138 | #endif |
139 | #if defined(HAVE_FMRADIO_IN) || defined(CONFIG_TUNER) | 139 | #if defined(HAVE_FMRADIO_IN) || CONFIG_TUNER |
140 | AUDIO_SRC_FMRADIO, /* monitor fm radio */ | 140 | AUDIO_SRC_FMRADIO, /* monitor fm radio */ |
141 | #endif | 141 | #endif |
142 | /* define new audio sources above this line */ | 142 | /* define new audio sources above this line */ |
143 | AUDIO_SOURCE_LIST_END, | 143 | AUDIO_SOURCE_LIST_END, |
144 | /* AUDIO_SRC_FMRADIO must be declared #ifdef CONFIG_TUNER but is not in | 144 | /* AUDIO_SRC_FMRADIO must be declared #if CONFIG_TUNER but is not in |
145 | the list of recordable sources. HAVE_FMRADIO_IN implies CONFIG_TUNER. */ | 145 | the list of recordable sources. HAVE_FMRADIO_IN implies CONFIG_TUNER. */ |
146 | #if defined(HAVE_FMRADIO_IN) || !defined(CONFIG_TUNER) | 146 | #if defined(HAVE_FMRADIO_IN) || (CONFIG_TUNER == 0) |
147 | AUDIO_NUM_SOURCES = AUDIO_SOURCE_LIST_END, | 147 | AUDIO_NUM_SOURCES = AUDIO_SOURCE_LIST_END, |
148 | #else | 148 | #else |
149 | AUDIO_NUM_SOURCES = AUDIO_SOURCE_LIST_END-1, | 149 | AUDIO_NUM_SOURCES = AUDIO_SOURCE_LIST_END-1, |
@@ -155,7 +155,7 @@ enum audio_sources | |||
155 | /* selects an audio source for recording or playback */ | 155 | /* selects an audio source for recording or playback */ |
156 | #define SRCF_PLAYBACK 0x0000 /* default */ | 156 | #define SRCF_PLAYBACK 0x0000 /* default */ |
157 | #define SRCF_RECORDING 0x1000 | 157 | #define SRCF_RECORDING 0x1000 |
158 | #ifdef CONFIG_TUNER | 158 | #if CONFIG_TUNER |
159 | /* for AUDIO_SRC_FMRADIO */ | 159 | /* for AUDIO_SRC_FMRADIO */ |
160 | #define SRCF_FMRADIO_PLAYING 0x0000 /* default */ | 160 | #define SRCF_FMRADIO_PLAYING 0x0000 /* default */ |
161 | #define SRCF_FMRADIO_PAUSED 0x2000 | 161 | #define SRCF_FMRADIO_PAUSED 0x2000 |
diff --git a/firmware/export/power.h b/firmware/export/power.h index 9eed1929fe..cafd6f87c8 100644 --- a/firmware/export/power.h +++ b/firmware/export/power.h | |||
@@ -47,7 +47,7 @@ void spdif_power_enable(bool on); | |||
47 | bool spdif_powered(void); | 47 | bool spdif_powered(void); |
48 | #endif | 48 | #endif |
49 | 49 | ||
50 | #ifdef CONFIG_TUNER | 50 | #if CONFIG_TUNER |
51 | extern bool radio_power(bool status); | 51 | extern bool radio_power(bool status); |
52 | extern bool radio_powered(void); | 52 | extern bool radio_powered(void); |
53 | #endif | 53 | #endif |
diff --git a/firmware/export/tuner.h b/firmware/export/tuner.h index 48d9bc97d1..0a13613711 100644 --- a/firmware/export/tuner.h +++ b/firmware/export/tuner.h | |||
@@ -37,7 +37,7 @@ | |||
37 | #define RADIO_STEREO 2 | 37 | #define RADIO_STEREO 2 |
38 | #define RADIO_ALL 3 /* debug */ | 38 | #define RADIO_ALL 3 /* debug */ |
39 | 39 | ||
40 | #ifdef CONFIG_TUNER | 40 | #if CONFIG_TUNER |
41 | 41 | ||
42 | #if (CONFIG_TUNER & S1A0903X01) | 42 | #if (CONFIG_TUNER & S1A0903X01) |
43 | void samsung_set(int setting, int value); | 43 | void samsung_set(int setting, int value); |
@@ -49,6 +49,6 @@ void philips_set(int setting, int value); | |||
49 | int philips_get(int setting); | 49 | int philips_get(int setting); |
50 | #endif | 50 | #endif |
51 | 51 | ||
52 | #endif /* #ifdef CONFIG_TUNER */ | 52 | #endif /* #if CONFIG_TUNER */ |
53 | 53 | ||
54 | #endif | 54 | #endif |
diff --git a/firmware/target/arm/iriver/h10/power-h10.c b/firmware/target/arm/iriver/h10/power-h10.c index d53bf88fa6..a3be8125b9 100644 --- a/firmware/target/arm/iriver/h10/power-h10.c +++ b/firmware/target/arm/iriver/h10/power-h10.c | |||
@@ -37,7 +37,7 @@ bool charger_enabled; | |||
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | #if 0 | 39 | #if 0 |
40 | #ifdef CONFIG_TUNER | 40 | #if CONFIG_TUNER |
41 | 41 | ||
42 | static bool powered = false; | 42 | static bool powered = false; |
43 | 43 | ||
@@ -62,7 +62,7 @@ bool radio_power(bool status) | |||
62 | return old_status; | 62 | return old_status; |
63 | } | 63 | } |
64 | 64 | ||
65 | #endif /* #ifdef CONFIG_TUNER */ | 65 | #endif /* #if CONFIG_TUNER */ |
66 | #endif | 66 | #endif |
67 | 67 | ||
68 | void power_init(void) | 68 | void power_init(void) |
diff --git a/firmware/target/arm/iriver/ifp7xx/power-ifp7xx.c b/firmware/target/arm/iriver/ifp7xx/power-ifp7xx.c index 6c5114a84e..1c3cc2b4bf 100644 --- a/firmware/target/arm/iriver/ifp7xx/power-ifp7xx.c +++ b/firmware/target/arm/iriver/ifp7xx/power-ifp7xx.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include "logf.h" | 27 | #include "logf.h" |
28 | #include "usb.h" | 28 | #include "usb.h" |
29 | 29 | ||
30 | #ifdef CONFIG_TUNER | 30 | #if CONFIG_TUNER |
31 | 31 | ||
32 | static bool powered = false; | 32 | static bool powered = false; |
33 | 33 | ||
@@ -44,7 +44,7 @@ bool radio_power(bool status) | |||
44 | return old_status; | 44 | return old_status; |
45 | } | 45 | } |
46 | 46 | ||
47 | #endif /* #ifdef CONFIG_TUNER */ | 47 | #endif /* #if CONFIG_TUNER */ |
48 | 48 | ||
49 | #ifndef SIMULATOR | 49 | #ifndef SIMULATOR |
50 | 50 | ||
diff --git a/firmware/target/coldfire/iriver/h100/power-h100.c b/firmware/target/coldfire/iriver/h100/power-h100.c index 9effeef7c8..75c8bea9dd 100644 --- a/firmware/target/coldfire/iriver/h100/power-h100.c +++ b/firmware/target/coldfire/iriver/h100/power-h100.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include "spdif.h" | 25 | #include "spdif.h" |
26 | 26 | ||
27 | 27 | ||
28 | #ifdef CONFIG_TUNER | 28 | #if CONFIG_TUNER |
29 | 29 | ||
30 | static bool powered = false; | 30 | static bool powered = false; |
31 | 31 | ||
@@ -41,7 +41,7 @@ bool radio_power(bool status) | |||
41 | return old_status; | 41 | return old_status; |
42 | } | 42 | } |
43 | 43 | ||
44 | #endif /* #ifdef CONFIG_TUNER */ | 44 | #endif /* #if CONFIG_TUNER */ |
45 | 45 | ||
46 | #ifndef SIMULATOR | 46 | #ifndef SIMULATOR |
47 | 47 | ||
diff --git a/firmware/target/coldfire/iriver/h300/power-h300.c b/firmware/target/coldfire/iriver/h300/power-h300.c index 3d726d0714..2875fa2a47 100644 --- a/firmware/target/coldfire/iriver/h300/power-h300.c +++ b/firmware/target/coldfire/iriver/h300/power-h300.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include "pcf50606.h" | 25 | #include "pcf50606.h" |
26 | 26 | ||
27 | 27 | ||
28 | #ifdef CONFIG_TUNER | 28 | #if CONFIG_TUNER |
29 | 29 | ||
30 | static bool powered = false; | 30 | static bool powered = false; |
31 | 31 | ||
@@ -41,7 +41,7 @@ bool radio_power(bool status) | |||
41 | return old_status; | 41 | return old_status; |
42 | } | 42 | } |
43 | 43 | ||
44 | #endif /* #ifdef CONFIG_TUNER */ | 44 | #endif /* #if CONFIG_TUNER */ |
45 | 45 | ||
46 | #ifndef SIMULATOR | 46 | #ifndef SIMULATOR |
47 | 47 | ||
diff --git a/uisimulator/common/fmradio.c b/uisimulator/common/fmradio.c index 4ce4d66976..ea6d6f6aa5 100644 --- a/uisimulator/common/fmradio.c +++ b/uisimulator/common/fmradio.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include "debug.h" | 21 | #include "debug.h" |
22 | #include "tuner.h" | 22 | #include "tuner.h" |
23 | 23 | ||
24 | #ifdef CONFIG_TUNER | 24 | #if CONFIG_TUNER |
25 | 25 | ||
26 | static int frequency = 0; | 26 | static int frequency = 0; |
27 | static bool mono = false; | 27 | static bool mono = false; |