diff options
-rw-r--r-- | firmware/SOURCES | 4 | ||||
-rw-r--r-- | firmware/target/arm/imx233/audio-imx233.h | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx233/sansa-fuzeplus/audio-target.h (renamed from firmware/target/arm/imx233/sansa-fuzeplus/audio-fuzeplus.c) | 39 |
3 files changed, 6 insertions, 39 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index 5843002bcf..154fefb0c9 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -547,6 +547,7 @@ target/arm/imx233/usb-imx233.c #ifdef HAVE_IMX233_CODEC target/arm/imx233/audioout-imx233.c target/arm/imx233/audioin-imx233.c +target/arm/imx233/audio-imx233.c target/arm/imx233/pcm-imx233.c drivers/audio/imx233-codec.c #endif @@ -1393,9 +1394,6 @@ target/arm/imx233/sansa-fuzeplus/debug-fuzeplus.c target/arm/imx233/sansa-fuzeplus/power-fuzeplus.c target/arm/imx233/sansa-fuzeplus/adc-fuzeplus.c target/arm/imx233/sansa-fuzeplus/powermgmt-fuzeplus.c -#ifndef BOOTLOADER -target/arm/imx233/sansa-fuzeplus/audio-fuzeplus.c -#endif #endif #ifdef SANSA_CLIPZIP diff --git a/firmware/target/arm/imx233/audio-imx233.h b/firmware/target/arm/imx233/audio-imx233.h index dd0cdeb63a..035bf357e1 100644 --- a/firmware/target/arm/imx233/audio-imx233.h +++ b/firmware/target/arm/imx233/audio-imx233.h @@ -17,7 +17,7 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * - ****************************************************************************/ + ****************************************************************************/ #ifndef __audio_imx233__ #define __audio_imx233__ diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/audio-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/audio-target.h index 57a3efd642..afa3d9649b 100644 --- a/firmware/target/arm/imx233/sansa-fuzeplus/audio-fuzeplus.c +++ b/firmware/target/arm/imx233/sansa-fuzeplus/audio-target.h @@ -7,7 +7,7 @@ * \/ \/ \/ \/ \/ * $Id$ * - * Copyright (C) 2011 by Amaury Pouly + * Copyright (C) 2013 by Amaury Pouly * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,38 +18,7 @@ * KIND, either express or implied. * ****************************************************************************/ -#include "config.h" -#include "system.h" -#include "audiohw.h" -#include "audio.h" -#include "audioout-imx233.h" -#include "audioin-imx233.h" - -static int input_source = AUDIO_SRC_PLAYBACK; -static unsigned input_flags = 0; -static int output_source = AUDIO_SRC_PLAYBACK; - -static void select_audio_path(void) -{ - if(input_source == AUDIO_SRC_PLAYBACK) - imx233_audioout_select_hp_input(false); - else - imx233_audioout_select_hp_input(true); -} - -void audio_input_mux(int source, unsigned flags) -{ - (void) source; - (void) flags; - input_source = source; - input_flags = flags; - select_audio_path(); -} - -void audio_set_output_source(int source) -{ - (void) source; - output_source = source; - select_audio_path(); -} +#ifndef __audio_target__ +#define __audio_target__ +#endif /* __audio_target__ */ |