diff options
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/audio.h | 8 | ||||
-rw-r--r-- | firmware/export/power.h | 2 | ||||
-rw-r--r-- | firmware/export/tuner.h | 4 |
3 files changed, 7 insertions, 7 deletions
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 |