diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2013-06-18 16:18:08 +0200 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2013-06-18 16:18:08 +0200 |
commit | 11c907a83c9081d587b27db32fafafe912812563 (patch) | |
tree | 68306d4608f38ac352e188f1470ba45f9901fa36 | |
parent | d997dafb6ca1644fdb07fa9850b72eb178ba45d4 (diff) | |
download | rockbox-11c907a83c9081d587b27db32fafafe912812563.tar.gz rockbox-11c907a83c9081d587b27db32fafafe912812563.zip |
zenxfi2: drop audio routing driver in favor of the generic one
Change-Id: I8186f4b8e7cdc5abc549dffb033178921f447998
-rw-r--r-- | firmware/SOURCES | 3 | ||||
-rw-r--r-- | firmware/target/arm/imx233/creative-zenxfi2/audio-target.h (renamed from firmware/target/arm/imx233/creative-zenxfi2/audio-zenxfi2.c) | 39 |
2 files changed, 4 insertions, 38 deletions
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 | |||
1157 | target/arm/imx233/creative-zenxfi2/power-zenxfi2.c | 1157 | target/arm/imx233/creative-zenxfi2/power-zenxfi2.c |
1158 | target/arm/imx233/creative-zenxfi2/adc-zenxfi2.c | 1158 | target/arm/imx233/creative-zenxfi2/adc-zenxfi2.c |
1159 | target/arm/imx233/creative-zenxfi2/powermgmt-zenxfi2.c | 1159 | target/arm/imx233/creative-zenxfi2/powermgmt-zenxfi2.c |
1160 | #ifndef BOOTLOADER | ||
1161 | target/arm/imx233/creative-zenxfi2/audio-zenxfi2.c | ||
1162 | #endif | ||
1163 | #endif | 1160 | #endif |
1164 | 1161 | ||
1165 | #ifdef CREATIVE_ZENXFI3 | 1162 | #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 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 @@ | |||
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) 2012 by Amaury Pouly | 10 | * Copyright (C) 2013 by Amaury Pouly |
11 | * | 11 | * |
12 | * This program is free software; you can redistribute it and/or | 12 | * This program is free software; you can redistribute it and/or |
13 | * modify it under the terms of the GNU General Public License | 13 | * modify it under the terms of the GNU General Public License |
@@ -18,38 +18,7 @@ | |||
18 | * KIND, either express or implied. | 18 | * KIND, either express or implied. |
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | #include "config.h" | 21 | #ifndef __audio_target__ |
22 | #include "system.h" | 22 | #define __audio_target__ |
23 | #include "audiohw.h" | ||
24 | #include "audio.h" | ||
25 | #include "audioout-imx233.h" | ||
26 | #include "audioin-imx233.h" | ||
27 | |||
28 | static int input_source = AUDIO_SRC_PLAYBACK; | ||
29 | static unsigned input_flags = 0; | ||
30 | static int output_source = AUDIO_SRC_PLAYBACK; | ||
31 | |||
32 | static void select_audio_path(void) | ||
33 | { | ||
34 | if(input_source == AUDIO_SRC_PLAYBACK) | ||
35 | imx233_audioout_select_hp_input(false); | ||
36 | else | ||
37 | imx233_audioout_select_hp_input(true); | ||
38 | } | ||
39 | |||
40 | void audio_input_mux(int source, unsigned flags) | ||
41 | { | ||
42 | (void) source; | ||
43 | (void) flags; | ||
44 | input_source = source; | ||
45 | input_flags = flags; | ||
46 | select_audio_path(); | ||
47 | } | ||
48 | |||
49 | void audio_set_output_source(int source) | ||
50 | { | ||
51 | (void) source; | ||
52 | output_source = source; | ||
53 | select_audio_path(); | ||
54 | } | ||
55 | 23 | ||
24 | #endif /* __audio_target__ */ | ||