From 11c907a83c9081d587b27db32fafafe912812563 Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Tue, 18 Jun 2013 16:18:08 +0200 Subject: [PATCH] zenxfi2: drop audio routing driver in favor of the generic one Change-Id: I8186f4b8e7cdc5abc549dffb033178921f447998 --- firmware/SOURCES | 3 -- .../{audio-zenxfi2.c => audio-target.h} | 39 ++----------------- 2 files changed, 4 insertions(+), 38 deletions(-) rename firmware/target/arm/imx233/creative-zenxfi2/{audio-zenxfi2.c => audio-target.h} (54%) diff --git a/firmware/SOURCES b/firmware/SOURCES index 154fefb0c9..9cc75ee60e 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -1157,9 +1157,6 @@ target/arm/imx233/creative-zenxfi2/debug-zenxfi2.c target/arm/imx233/creative-zenxfi2/power-zenxfi2.c target/arm/imx233/creative-zenxfi2/adc-zenxfi2.c target/arm/imx233/creative-zenxfi2/powermgmt-zenxfi2.c -#ifndef BOOTLOADER -target/arm/imx233/creative-zenxfi2/audio-zenxfi2.c -#endif #endif #ifdef CREATIVE_ZENXFI3 diff --git a/firmware/target/arm/imx233/creative-zenxfi2/audio-zenxfi2.c b/firmware/target/arm/imx233/creative-zenxfi2/audio-target.h similarity index 54% rename from firmware/target/arm/imx233/creative-zenxfi2/audio-zenxfi2.c rename to firmware/target/arm/imx233/creative-zenxfi2/audio-target.h index 810f1c156f..afa3d9649b 100644 --- a/firmware/target/arm/imx233/creative-zenxfi2/audio-zenxfi2.c +++ b/firmware/target/arm/imx233/creative-zenxfi2/audio-target.h @@ -7,7 +7,7 @@ * \/ \/ \/ \/ \/ * $Id$ * - * Copyright (C) 2012 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__ */