Fix all the red this time?

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13884 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2007-07-14 13:41:59 +00:00
parent ef65d91492
commit 680afafc23
6 changed files with 32 additions and 25 deletions

View File

@ -1304,9 +1304,12 @@ void toggle_mono_mode(bool mono)
void set_radio_region(int region)
{
#ifdef HAVE_RADIO_REGION
tuner_set(RADIO_REGION, region);
#endif
next_station(0);
remember_frequency();
(void)region;
}
MENUITEM_SETTING(set_region, &global_settings.fm_region, NULL);

View File

@ -150,8 +150,8 @@ drivers/rtc/rtc_as3514.c
/* Tuner */
#if CONFIG_TUNER
#ifndef SIMULATOR
tuner.c
#ifndef SIMULATOR
#if (CONFIG_TUNER & LV24020LP)
drivers/tuner/lv24020lp.c
#endif /* (CONFIG_TUNER & LV24020LP) */

View File

@ -40,12 +40,6 @@
#define HW_MASK (*(short *)0x020000fc)
#endif
#endif /* (CONFIG_CPU == SH7034) && !SIMULATOR */
#ifdef ARCHOS_PLAYER
bool is_new_player(void);
#endif
#ifdef CONFIG_TUNER_MULTI
static inline int tuner_detect_type(void)
{
@ -53,4 +47,10 @@ static inline int tuner_detect_type(void)
}
#endif
#endif /* (CONFIG_CPU == SH7034) && !SIMULATOR */
#ifdef ARCHOS_PLAYER
bool is_new_player(void);
#endif
#endif /* HWCOMPAT_H */

View File

@ -33,8 +33,8 @@ int s1a0903x01_set(int setting, int value);
int s1a0903x01_get(int setting);
#ifndef CONFIG_TUNER_MULTI
#define tuner_set s1a0903x01_get
#define tuner_get s1a0903x01_set
#define tuner_get s1a0903x01_get
#define tuner_set s1a0903x01_set
#endif
#endif /* _S1A0903X01_H_ */

View File

@ -23,22 +23,6 @@
#include "tuner.h"
#include "fmradio.h"
#ifdef CONFIG_TUNER_MULTI
int (*tuner_set)(int setting, int value);
int (*tuner_get)(int setting);
#define TUNER_TYPE_CASE(type, set, get, region_data) \
case type: \
tuner_set = set; \
tuner_get = get; \
break;
#else
#define TUNER_TYPE_CASE(type, set, get, region_data)
#endif /* CONFIG_TUNER_MULTI */
/* General region information */
const struct fm_region_data fm_region_data[TUNER_NUM_REGIONS] =
{
@ -48,6 +32,8 @@ const struct fm_region_data fm_region_data[TUNER_NUM_REGIONS] =
[REGION_KOREA] = { 87500000, 108000000, 100000 }
};
#ifndef SIMULATOR
/* Tuner-specific region information */
#if (CONFIG_TUNER & LV24020LP)
@ -71,6 +57,18 @@ const struct tea5767_region_data tea5767_region_data[TUNER_NUM_REGIONS] =
};
#endif /* (CONFIG_TUNER & TEA5767) */
#ifdef CONFIG_TUNER_MULTI
int (*tuner_set)(int setting, int value);
int (*tuner_get)(int setting);
#define TUNER_TYPE_CASE(type, set, get, region_data) \
case type: \
tuner_set = set; \
tuner_get = get; \
break;
#else
#define TUNER_TYPE_CASE(type, set, get, region_data)
#endif /* CONFIG_TUNER_MULTI */
void tuner_init(void)
{
#ifdef CONFIG_TUNER_MULTI
@ -97,3 +95,5 @@ void tuner_init(void)
#endif
}
}
#endif /* SIMULATOR */

View File

@ -30,6 +30,10 @@ static bool mono = false;
static bool powered = false;
#endif
void tuner_init(void)
{
}
int tuner_set(int setting, int value)
{
switch(setting)