devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

fuzeplus: drop audio routing driver in favor of the generic one

Browse source 
Change-Id: I89828ef858606bf09e115ff9c27ff9ecc8bf8b8e
This commit is contained in:
Amaury Pouly 2013-06-18 16:15:07 +02:00
parent e735ce4693
commit d997dafb6c
3 changed files with 6 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
firmware/SOURCES
View file

@ -547,6 +547,7 @@ target/arm/imx233/usb-imx233.c
#ifdef HAVE_IMX233_CODEC #ifdef HAVE_IMX233_CODEC
target/arm/imx233/audioout-imx233.c target/arm/imx233/audioout-imx233.c
target/arm/imx233/audioin-imx233.c target/arm/imx233/audioin-imx233.c
target/arm/imx233/audio-imx233.c
target/arm/imx233/pcm-imx233.c target/arm/imx233/pcm-imx233.c
drivers/audio/imx233-codec.c drivers/audio/imx233-codec.c
#endif #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/power-fuzeplus.c
target/arm/imx233/sansa-fuzeplus/adc-fuzeplus.c target/arm/imx233/sansa-fuzeplus/adc-fuzeplus.c
target/arm/imx233/sansa-fuzeplus/powermgmt-fuzeplus.c target/arm/imx233/sansa-fuzeplus/powermgmt-fuzeplus.c
#ifndef BOOTLOADER
target/arm/imx233/sansa-fuzeplus/audio-fuzeplus.c
#endif
#endif #endif
#ifdef SANSA_CLIPZIP #ifdef SANSA_CLIPZIP

2
firmware/target/arm/imx233/audio-imx233.h
View file

@ -17,7 +17,7 @@
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied. * KIND, either express or implied.
* *
****************************************************************************/ ****************************************************************************/
#ifndef __audio_imx233__ #ifndef __audio_imx233__
#define __audio_imx233__ #define __audio_imx233__

39
firmware/target/arm/imx233/sansa-fuzeplus/audio-fuzeplus.c → firmware/target/arm/imx233/sansa-fuzeplus/audio-target.h
View file

@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* $Id$ * $Id$
* *
* Copyright (C) 2011 by Amaury Pouly * Copyright (C) 2013 by Amaury Pouly
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -18,38 +18,7 @@
* KIND, either express or implied. * KIND, either express or implied.
* *
****************************************************************************/ ****************************************************************************/
#include "config.h" #ifndef __audio_target__
#include "system.h" #define __audio_target__
#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();
}
#endif /* __audio_target__ */