Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix remaining CONFIG_TUNER checks.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12385 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2007-02-18 08:46:12 +00:00
parent 9a6f419775
commit c652218d14
16 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/main_menu.c
View file

@ -143,7 +143,7 @@ bool main_menu(void)
items[i].desc = ID2P(LANG_CUSTOM_THEME); items[i].desc = ID2P(LANG_CUSTOM_THEME);
items[i++].function = custom_theme_browse; items[i++].function = custom_theme_browse;
#ifdef CONFIG_TUNER #if CONFIG_TUNER
if(radio_hardware_present()) { if(radio_hardware_present()) {
items[i].desc = ID2P(LANG_FM_RADIO); items[i].desc = ID2P(LANG_FM_RADIO);
items[i++].function = radio_screen; items[i++].function = radio_screen;

2
apps/recorder/radio.c
View file

@ -61,7 +61,7 @@
#include "dir.h" #include "dir.h"
#include "action.h" #include "action.h"
#ifdef CONFIG_TUNER #if CONFIG_TUNER
#if CONFIG_KEYPAD == RECORDER_PAD #if CONFIG_KEYPAD == RECORDER_PAD
#define FM_RECORD #define FM_RECORD

2
apps/recorder/radio.h
View file

@ -23,7 +23,7 @@
#include "fmradio.h" #include "fmradio.h"
#endif #endif
#ifdef CONFIG_TUNER #if CONFIG_TUNER
void radio_load_presets(char *filename); void radio_load_presets(char *filename);
void radio_init(void); void radio_init(void);
bool radio_screen(void); bool radio_screen(void);

8
apps/settings.h
View file

@ -273,7 +273,7 @@ struct system_status
#ifdef HAVE_DIRCACHE #ifdef HAVE_DIRCACHE
int dircache_size; /* directory cache structure last size, 22 bits */ int dircache_size; /* directory cache structure last size, 22 bits */
#endif #endif
#ifdef CONFIG_TUNER #if CONFIG_TUNER
int last_frequency; /* Last frequency for resuming, in FREQ_STEP units, int last_frequency; /* Last frequency for resuming, in FREQ_STEP units,
relative to MIN_FREQ */ relative to MIN_FREQ */
#endif #endif
@ -404,7 +404,7 @@ struct user_settings
bool resume; /* resume option: 0=off, 1=on */ bool resume; /* resume option: 0=off, 1=on */
#ifdef CONFIG_TUNER #if CONFIG_TUNER
unsigned char fmr_file[MAX_FILENAME+1]; /* last fmr preset */ unsigned char fmr_file[MAX_FILENAME+1]; /* last fmr preset */
#endif #endif
unsigned char font_file[MAX_FILENAME+1]; /* last font */ unsigned char font_file[MAX_FILENAME+1]; /* last font */
@ -476,7 +476,7 @@ struct user_settings
bool fade_on_stop; /* fade on pause/unpause/stop */ bool fade_on_stop; /* fade on pause/unpause/stop */
bool caption_backlight; /* turn on backlight at end and start of track */ bool caption_backlight; /* turn on backlight at end and start of track */
#ifdef CONFIG_TUNER #if CONFIG_TUNER
int fm_freq_step; /* Frequency step for manual tuning, in kHz */ int fm_freq_step; /* Frequency step for manual tuning, in kHz */
bool fm_force_mono; /* Forces Mono mode if true */ bool fm_force_mono; /* Forces Mono mode if true */
bool fm_full_range; /* Enables full 10MHz-160MHz range if true, else bool fm_full_range; /* Enables full 10MHz-160MHz range if true, else
@ -663,7 +663,7 @@ struct user_settings
int unplug_rw; /* time in s to rewind when pausing */ int unplug_rw; /* time in s to rewind when pausing */
bool unplug_autoresume; /* disable auto-resume if no phones */ bool unplug_autoresume; /* disable auto-resume if no phones */
#endif #endif
#ifdef CONFIG_TUNER #if CONFIG_TUNER
int fm_region; int fm_region;
#endif #endif
bool audioscrobbler; /* Audioscrobbler logging */ bool audioscrobbler; /* Audioscrobbler logging */

6
apps/settings_list.c
View file

@ -480,7 +480,7 @@ const struct settings_list settings[] = {
LANG_CAR_ADAPTER_MODE, false, "car adapter mode", NULL), LANG_CAR_ADAPTER_MODE, false, "car adapter mode", NULL),
#endif #endif
/* tuner */ /* tuner */
#ifdef CONFIG_TUNER #if CONFIG_TUNER
OFFON_SETTING(0,fm_force_mono, LANG_FM_MONO_MODE, OFFON_SETTING(0,fm_force_mono, LANG_FM_MONO_MODE,
false,"force fm mono", NULL), false,"force fm mono", NULL),
SYSTEM_SETTING(NVRAM(4),last_frequency,0), SYSTEM_SETTING(NVRAM(4),last_frequency,0),
@ -1022,7 +1022,7 @@ const struct settings_list settings[] = {
OFFON_SETTING(0,unplug_autoresume,LANG_UNPLUG_DISABLE_AUTORESUME,false, OFFON_SETTING(0,unplug_autoresume,LANG_UNPLUG_DISABLE_AUTORESUME,false,
"disable autoresume if phones not present",NULL), "disable autoresume if phones not present",NULL),
#endif #endif
#ifdef CONFIG_TUNER #if CONFIG_TUNER
{F_T_INT,&global_settings.fm_region,LANG_FM_REGION,INT(0), {F_T_INT,&global_settings.fm_region,LANG_FM_REGION,INT(0),
"fm_region","eu,us,jp,kr",UNUSED}, "fm_region","eu,us,jp,kr",UNUSED},
#endif #endif
@ -1036,7 +1036,7 @@ const struct settings_list settings[] = {
#endif #endif
/** settings not in the old config blocks **/ /** settings not in the old config blocks **/
#ifdef CONFIG_TUNER #if CONFIG_TUNER
FILENAME_SETTING(0, fmr_file, "fmr", FILENAME_SETTING(0, fmr_file, "fmr",
"", FMPRESET_PATH "/", ".fmr", MAX_FILENAME+1), "", FMPRESET_PATH "/", ".fmr", MAX_FILENAME+1),
#endif #endif

2
apps/sound_menu.c
View file

@ -41,7 +41,7 @@
#include "sound.h" #include "sound.h"
#ifdef HAVE_RECORDING #ifdef HAVE_RECORDING
#include "audio.h" #include "audio.h"
#ifdef CONFIG_TUNER #if CONFIG_TUNER
#include "radio.h" #include "radio.h"
#endif #endif
#endif #endif

2
firmware/drivers/fmradio.c
View file

@ -23,7 +23,7 @@
#include "debug.h" #include "debug.h"
#include "system.h" #include "system.h"
#ifdef CONFIG_TUNER #if CONFIG_TUNER
/* Signals: /* Signals:
DI (Data In) - PB0 (doubles as data pin for the LCD) DI (Data In) - PB0 (doubles as data pin for the LCD)

4
firmware/drivers/power.c
View file

@ -34,7 +34,7 @@ bool charger_enabled;
#endif #endif
#ifdef CONFIG_TUNER #if CONFIG_TUNER
static bool powered = false; static bool powered = false;
@ -59,7 +59,7 @@ bool radio_power(bool status)
return old_status; return old_status;
} }
#endif /* #ifdef CONFIG_TUNER */ #endif /* #if CONFIG_TUNER */
#ifndef SIMULATOR #ifndef SIMULATOR

8
firmware/export/audio.h
View file

@ -136,14 +136,14 @@ enum audio_sources
#ifdef HAVE_SPDIF_IN #ifdef HAVE_SPDIF_IN
AUDIO_SRC_SPDIF, /* monitor spdif */ AUDIO_SRC_SPDIF, /* monitor spdif */
#endif #endif
#if defined(HAVE_FMRADIO_IN) || defined(CONFIG_TUNER) #if defined(HAVE_FMRADIO_IN) || CONFIG_TUNER
AUDIO_SRC_FMRADIO, /* monitor fm radio */ AUDIO_SRC_FMRADIO, /* monitor fm radio */
#endif #endif
/* define new audio sources above this line */ /* define new audio sources above this line */
AUDIO_SOURCE_LIST_END, AUDIO_SOURCE_LIST_END,
/* AUDIO_SRC_FMRADIO must be declared #ifdef CONFIG_TUNER but is not in /* AUDIO_SRC_FMRADIO must be declared #if CONFIG_TUNER but is not in
the list of recordable sources. HAVE_FMRADIO_IN implies CONFIG_TUNER. */ the list of recordable sources. HAVE_FMRADIO_IN implies CONFIG_TUNER. */
#if defined(HAVE_FMRADIO_IN) || !defined(CONFIG_TUNER) #if defined(HAVE_FMRADIO_IN) || (CONFIG_TUNER == 0)
AUDIO_NUM_SOURCES = AUDIO_SOURCE_LIST_END, AUDIO_NUM_SOURCES = AUDIO_SOURCE_LIST_END,
#else #else
AUDIO_NUM_SOURCES = AUDIO_SOURCE_LIST_END-1, AUDIO_NUM_SOURCES = AUDIO_SOURCE_LIST_END-1,
@ -155,7 +155,7 @@ enum audio_sources
/* selects an audio source for recording or playback */ /* selects an audio source for recording or playback */
#define SRCF_PLAYBACK 0x0000 /* default */ #define SRCF_PLAYBACK 0x0000 /* default */
#define SRCF_RECORDING 0x1000 #define SRCF_RECORDING 0x1000
#ifdef CONFIG_TUNER #if CONFIG_TUNER
/* for AUDIO_SRC_FMRADIO */ /* for AUDIO_SRC_FMRADIO */
#define SRCF_FMRADIO_PLAYING 0x0000 /* default */ #define SRCF_FMRADIO_PLAYING 0x0000 /* default */
#define SRCF_FMRADIO_PAUSED 0x2000 #define SRCF_FMRADIO_PAUSED 0x2000

2
firmware/export/power.h
View file

@ -47,7 +47,7 @@ void spdif_power_enable(bool on);
bool spdif_powered(void); bool spdif_powered(void);
#endif #endif
#ifdef CONFIG_TUNER #if CONFIG_TUNER
extern bool radio_power(bool status); extern bool radio_power(bool status);
extern bool radio_powered(void); extern bool radio_powered(void);
#endif #endif

4
firmware/export/tuner.h
View file

@ -37,7 +37,7 @@
#define RADIO_STEREO 2 #define RADIO_STEREO 2
#define RADIO_ALL 3 /* debug */ #define RADIO_ALL 3 /* debug */
#ifdef CONFIG_TUNER #if CONFIG_TUNER
#if (CONFIG_TUNER & S1A0903X01) #if (CONFIG_TUNER & S1A0903X01)
void samsung_set(int setting, int value); void samsung_set(int setting, int value);
@ -49,6 +49,6 @@ void philips_set(int setting, int value);
int philips_get(int setting); int philips_get(int setting);
#endif #endif
#endif /* #ifdef CONFIG_TUNER */ #endif /* #if CONFIG_TUNER */
#endif #endif

4
firmware/target/arm/iriver/h10/power-h10.c
View file

@ -37,7 +37,7 @@ bool charger_enabled;
#endif #endif
#if 0 #if 0
#ifdef CONFIG_TUNER #if CONFIG_TUNER
static bool powered = false; static bool powered = false;
@ -62,7 +62,7 @@ bool radio_power(bool status)
return old_status; return old_status;
} }
#endif /* #ifdef CONFIG_TUNER */ #endif /* #if CONFIG_TUNER */
#endif #endif
void power_init(void) void power_init(void)

4
firmware/target/arm/iriver/ifp7xx/power-ifp7xx.c
View file

@ -27,7 +27,7 @@
#include "logf.h" #include "logf.h"
#include "usb.h" #include "usb.h"
#ifdef CONFIG_TUNER #if CONFIG_TUNER
static bool powered = false; static bool powered = false;
@ -44,7 +44,7 @@ bool radio_power(bool status)
return old_status; return old_status;
} }
#endif /* #ifdef CONFIG_TUNER */ #endif /* #if CONFIG_TUNER */
#ifndef SIMULATOR #ifndef SIMULATOR

4
firmware/target/coldfire/iriver/h100/power-h100.c
View file

@ -25,7 +25,7 @@
#include "spdif.h" #include "spdif.h"
#ifdef CONFIG_TUNER #if CONFIG_TUNER
static bool powered = false; static bool powered = false;
@ -41,7 +41,7 @@ bool radio_power(bool status)
return old_status; return old_status;
} }
#endif /* #ifdef CONFIG_TUNER */ #endif /* #if CONFIG_TUNER */
#ifndef SIMULATOR #ifndef SIMULATOR

4
firmware/target/coldfire/iriver/h300/power-h300.c
View file

@ -25,7 +25,7 @@
#include "pcf50606.h" #include "pcf50606.h"
#ifdef CONFIG_TUNER #if CONFIG_TUNER
static bool powered = false; static bool powered = false;
@ -41,7 +41,7 @@ bool radio_power(bool status)
return old_status; return old_status;
} }
#endif /* #ifdef CONFIG_TUNER */ #endif /* #if CONFIG_TUNER */
#ifndef SIMULATOR #ifndef SIMULATOR

2
uisimulator/common/fmradio.c
View file

@ -21,7 +21,7 @@
#include "debug.h" #include "debug.h"
#include "tuner.h" #include "tuner.h"
#ifdef CONFIG_TUNER #if CONFIG_TUNER
static int frequency = 0; static int frequency = 0;
static bool mono = false; static bool mono = false;