as3525v2: build normal firmware properly (Clipv2/+)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24840 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2010-02-22 02:42:58 +00:00
parent 054253ab33
commit 31eda59720
8 changed files with 18 additions and 9 deletions

View file

@ -47,7 +47,9 @@ void audio_input_mux(int source, unsigned flags)
case AUDIO_SRC_PLAYBACK:
if (source != last_source)
{
#if defined(HAVE_RECORDING) || defined(HAVE_FMRADIO_IN)
audiohw_set_monitor(false);
#endif
#ifdef HAVE_RECORDING
audiohw_disable_recording();
#endif
@ -64,6 +66,8 @@ void audio_input_mux(int source, unsigned flags)
break;
#endif
#if (INPUT_SRC_CAPS & SRC_CAP_FMRADIO)
case AUDIO_SRC_FMRADIO: /* recording and playback */
if (source == last_source
#ifdef HAVE_RECORDING
@ -86,9 +90,12 @@ void audio_input_mux(int source, unsigned flags)
#ifdef HAVE_RECORDING
audiohw_disable_recording();
#endif
#if defined(HAVE_RECORDING) || defined(HAVE_FMRADIO_IN)
audiohw_set_monitor(true); /* line 2 analog audio path */
#endif
}
break;
#endif /* (INPUT_SRC_CAPS & SRC_CAP_FMRADIO) */
}
last_source = source;

View file

@ -191,7 +191,7 @@ static const char sd_thread_name[] = "ata/sd";
static struct mutex sd_mtx SHAREDBSS_ATTR;
static struct event_queue sd_queue;
#ifndef BOOTLOADER
static bool sd_enabled = false;
bool sd_enabled = false;
#endif
static struct wakeup transfer_completion_signal;

View file

@ -336,7 +336,7 @@ void system_init(void)
#ifndef BOOTLOADER
/* Initialize power management settings */
ascodec_write(AS3514_CVDD_DCDC3, AS314_CP_DCDC3_SETTING);
#ifdef CONFIG_TUNER
#if CONFIG_TUNER
fmradio_i2c_init();
#endif
#endif /* !BOOTLOADER */