diff options
Diffstat (limited to 'firmware')
-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 | |||
547 | #ifdef HAVE_IMX233_CODEC | 547 | #ifdef HAVE_IMX233_CODEC |
548 | target/arm/imx233/audioout-imx233.c | 548 | target/arm/imx233/audioout-imx233.c |
549 | target/arm/imx233/audioin-imx233.c | 549 | target/arm/imx233/audioin-imx233.c |
550 | target/arm/imx233/audio-imx233.c | ||
550 | target/arm/imx233/pcm-imx233.c | 551 | target/arm/imx233/pcm-imx233.c |
551 | drivers/audio/imx233-codec.c | 552 | drivers/audio/imx233-codec.c |
552 | #endif | 553 | #endif |
@@ -1393,9 +1394,6 @@ target/arm/imx233/sansa-fuzeplus/debug-fuzeplus.c | |||
1393 | target/arm/imx233/sansa-fuzeplus/power-fuzeplus.c | 1394 | target/arm/imx233/sansa-fuzeplus/power-fuzeplus.c |
1394 | target/arm/imx233/sansa-fuzeplus/adc-fuzeplus.c | 1395 | target/arm/imx233/sansa-fuzeplus/adc-fuzeplus.c |
1395 | target/arm/imx233/sansa-fuzeplus/powermgmt-fuzeplus.c | 1396 | target/arm/imx233/sansa-fuzeplus/powermgmt-fuzeplus.c |
1396 | #ifndef BOOTLOADER | ||
1397 | target/arm/imx233/sansa-fuzeplus/audio-fuzeplus.c | ||
1398 | #endif | ||
1399 | #endif | 1397 | #endif |
1400 | 1398 | ||
1401 | #ifdef SANSA_CLIPZIP | 1399 | #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 @@ | |||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | 17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY |
18 | * KIND, either express or implied. | 18 | * KIND, either express or implied. |
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | #ifndef __audio_imx233__ | 21 | #ifndef __audio_imx233__ |
22 | #define __audio_imx233__ | 22 | #define __audio_imx233__ |
23 | 23 | ||
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 @@ | |||
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) 2011 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__ */ | ||