diff options
Diffstat (limited to 'firmware/target')
-rw-r--r-- | firmware/target/arm/audio-pp.c | 4 | ||||
-rw-r--r-- | firmware/target/arm/sandisk/sansa-e200/audio-e200.c | 6 | ||||
-rw-r--r-- | firmware/target/coldfire/iaudio/m5/audio-m5.c | 5 | ||||
-rw-r--r-- | firmware/target/coldfire/iaudio/x5/audio-x5.c | 4 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/audio-iriver.c | 6 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/h100/power-h100.c | 3 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/h100/spdif-h100.c | 3 | ||||
-rw-r--r-- | firmware/target/coldfire/pcm-coldfire.c | 2 |
8 files changed, 15 insertions, 18 deletions
diff --git a/firmware/target/arm/audio-pp.c b/firmware/target/arm/audio-pp.c index 91670cb015..9fff197520 100644 --- a/firmware/target/arm/audio-pp.c +++ b/firmware/target/arm/audio-pp.c | |||
@@ -29,7 +29,7 @@ void audio_set_output_source(int source) | |||
29 | source = AUDIO_SRC_PLAYBACK; | 29 | source = AUDIO_SRC_PLAYBACK; |
30 | } /* audio_set_output_source */ | 30 | } /* audio_set_output_source */ |
31 | 31 | ||
32 | void audio_set_source(int source, unsigned flags) | 32 | void audio_input_mux(int source, unsigned flags) |
33 | { | 33 | { |
34 | (void)flags; | 34 | (void)flags; |
35 | /* Prevent pops from unneeded switching */ | 35 | /* Prevent pops from unneeded switching */ |
@@ -87,6 +87,6 @@ void audio_set_source(int source, unsigned flags) | |||
87 | } /* end switch */ | 87 | } /* end switch */ |
88 | 88 | ||
89 | last_source = source; | 89 | last_source = source; |
90 | } /* audio_set_source */ | 90 | } /* audio_input_mux */ |
91 | 91 | ||
92 | 92 | ||
diff --git a/firmware/target/arm/sandisk/sansa-e200/audio-e200.c b/firmware/target/arm/sandisk/sansa-e200/audio-e200.c index f046f0db99..0c3db7b87b 100644 --- a/firmware/target/arm/sandisk/sansa-e200/audio-e200.c +++ b/firmware/target/arm/sandisk/sansa-e200/audio-e200.c | |||
@@ -39,7 +39,7 @@ void audio_set_output_source(int source) | |||
39 | set_fiq_status(oldmode); | 39 | set_fiq_status(oldmode); |
40 | } /* audio_set_output_source */ | 40 | } /* audio_set_output_source */ |
41 | 41 | ||
42 | void audio_set_source(int source, unsigned flags) | 42 | void audio_input_mux(int source, unsigned flags) |
43 | { | 43 | { |
44 | static int last_source = AUDIO_SRC_PLAYBACK; | 44 | static int last_source = AUDIO_SRC_PLAYBACK; |
45 | static bool last_recording = false; | 45 | static bool last_recording = false; |
@@ -89,6 +89,4 @@ void audio_set_source(int source, unsigned flags) | |||
89 | } /* end switch */ | 89 | } /* end switch */ |
90 | 90 | ||
91 | last_source = source; | 91 | last_source = source; |
92 | } /* audio_set_source */ | 92 | } /* audio_input_mux */ |
93 | |||
94 | |||
diff --git a/firmware/target/coldfire/iaudio/m5/audio-m5.c b/firmware/target/coldfire/iaudio/m5/audio-m5.c index 2442351fed..87a7c35574 100644 --- a/firmware/target/coldfire/iaudio/m5/audio-m5.c +++ b/firmware/target/coldfire/iaudio/m5/audio-m5.c | |||
@@ -35,7 +35,7 @@ void audio_set_output_source(int source) | |||
35 | set_irq_level(level); | 35 | set_irq_level(level); |
36 | } /* audio_set_output_source */ | 36 | } /* audio_set_output_source */ |
37 | 37 | ||
38 | void audio_set_source(int source, unsigned flags) | 38 | void audio_input_mux(int source, unsigned flags) |
39 | { | 39 | { |
40 | /* Prevent pops from unneeded switching */ | 40 | /* Prevent pops from unneeded switching */ |
41 | static int last_source = AUDIO_SRC_PLAYBACK; | 41 | static int last_source = AUDIO_SRC_PLAYBACK; |
@@ -79,5 +79,4 @@ void audio_set_source(int source, unsigned flags) | |||
79 | or_l((1 << 29), &GPIO_FUNCTION); | 79 | or_l((1 << 29), &GPIO_FUNCTION); |
80 | 80 | ||
81 | last_source = source; | 81 | last_source = source; |
82 | } /* audio_set_source */ | 82 | } /* audio_input_mux */ |
83 | |||
diff --git a/firmware/target/coldfire/iaudio/x5/audio-x5.c b/firmware/target/coldfire/iaudio/x5/audio-x5.c index 91100ed751..594ff3b574 100644 --- a/firmware/target/coldfire/iaudio/x5/audio-x5.c +++ b/firmware/target/coldfire/iaudio/x5/audio-x5.c | |||
@@ -35,7 +35,7 @@ void audio_set_output_source(int source) | |||
35 | set_irq_level(level); | 35 | set_irq_level(level); |
36 | } /* audio_set_output_source */ | 36 | } /* audio_set_output_source */ |
37 | 37 | ||
38 | void audio_set_source(int source, unsigned flags) | 38 | void audio_input_mux(int source, unsigned flags) |
39 | { | 39 | { |
40 | /* Prevent pops from unneeded switching */ | 40 | /* Prevent pops from unneeded switching */ |
41 | static int last_source = AUDIO_SRC_PLAYBACK; | 41 | static int last_source = AUDIO_SRC_PLAYBACK; |
@@ -109,5 +109,5 @@ void audio_set_source(int source, unsigned flags) | |||
109 | or_l((1 << 29), &GPIO_FUNCTION); | 109 | or_l((1 << 29), &GPIO_FUNCTION); |
110 | 110 | ||
111 | last_source = source; | 111 | last_source = source; |
112 | } /* audio_set_source */ | 112 | } /* audio_input_mux */ |
113 | 113 | ||
diff --git a/firmware/target/coldfire/iriver/audio-iriver.c b/firmware/target/coldfire/iriver/audio-iriver.c index bd071430b2..4d22e7c987 100644 --- a/firmware/target/coldfire/iriver/audio-iriver.c +++ b/firmware/target/coldfire/iriver/audio-iriver.c | |||
@@ -44,7 +44,7 @@ void audio_set_output_source(int source) | |||
44 | set_irq_level(level); | 44 | set_irq_level(level); |
45 | } /* audio_set_output_source */ | 45 | } /* audio_set_output_source */ |
46 | 46 | ||
47 | void audio_set_source(int source, unsigned flags) | 47 | void audio_input_mux(int source, unsigned flags) |
48 | { | 48 | { |
49 | /* Prevent pops from unneeded switching */ | 49 | /* Prevent pops from unneeded switching */ |
50 | static int last_source = AUDIO_SRC_PLAYBACK; | 50 | static int last_source = AUDIO_SRC_PLAYBACK; |
@@ -131,6 +131,4 @@ void audio_set_source(int source, unsigned flags) | |||
131 | or_l(MUX_BIT, &GPIO_FUNCTION); | 131 | or_l(MUX_BIT, &GPIO_FUNCTION); |
132 | 132 | ||
133 | last_source = source; | 133 | last_source = source; |
134 | } /* audio_set_source */ | 134 | } /* audio_input_mux */ |
135 | |||
136 | |||
diff --git a/firmware/target/coldfire/iriver/h100/power-h100.c b/firmware/target/coldfire/iriver/h100/power-h100.c index ce1c350802..943168967f 100644 --- a/firmware/target/coldfire/iriver/h100/power-h100.c +++ b/firmware/target/coldfire/iriver/h100/power-h100.c | |||
@@ -89,7 +89,8 @@ void spdif_power_enable(bool on) | |||
89 | 89 | ||
90 | #ifndef BOOTLOADER | 90 | #ifndef BOOTLOADER |
91 | /* Make sure the feed is reset */ | 91 | /* Make sure the feed is reset */ |
92 | spdif_set_output_source(spdif_get_output_source(NULL), true); | 92 | spdif_set_output_source(spdif_get_output_source(NULL) |
93 | IF_SPDIF_POWER_(, true)); | ||
93 | #endif | 94 | #endif |
94 | } | 95 | } |
95 | 96 | ||
diff --git a/firmware/target/coldfire/iriver/h100/spdif-h100.c b/firmware/target/coldfire/iriver/h100/spdif-h100.c index ee4a9402ea..beede3fdce 100644 --- a/firmware/target/coldfire/iriver/h100/spdif-h100.c +++ b/firmware/target/coldfire/iriver/h100/spdif-h100.c | |||
@@ -33,7 +33,8 @@ void spdif_init(void) | |||
33 | { | 33 | { |
34 | /* PHASECONFIG setup: gain = 3*2^13, source = EBUIN */ | 34 | /* PHASECONFIG setup: gain = 3*2^13, source = EBUIN */ |
35 | PHASECONFIG = (6 << 3) | (4 << 0); | 35 | PHASECONFIG = (6 << 3) | (4 << 0); |
36 | spdif_set_output_source(AUDIO_SRC_PLAYBACK, true); | 36 | spdif_set_output_source(AUDIO_SRC_PLAYBACK |
37 | IF_SPDIF_POWER_(, true)); | ||
37 | } | 38 | } |
38 | 39 | ||
39 | /* Return the S/PDIF frequency in herz - unrounded */ | 40 | /* Return the S/PDIF frequency in herz - unrounded */ |
diff --git a/firmware/target/coldfire/pcm-coldfire.c b/firmware/target/coldfire/pcm-coldfire.c index dc40dacf0e..41aa9fbc61 100644 --- a/firmware/target/coldfire/pcm-coldfire.c +++ b/firmware/target/coldfire/pcm-coldfire.c | |||
@@ -271,7 +271,7 @@ void pcm_init(void) | |||
271 | /* Initialize default register values. */ | 271 | /* Initialize default register values. */ |
272 | audiohw_init(); | 272 | audiohw_init(); |
273 | 273 | ||
274 | audio_set_source(AUDIO_SRC_PLAYBACK, SRCF_PLAYBACK); | 274 | audio_input_mux(AUDIO_SRC_PLAYBACK, SRCF_PLAYBACK); |
275 | 275 | ||
276 | audiohw_set_frequency(freq_ent[FPARM_FSEL]); | 276 | audiohw_set_frequency(freq_ent[FPARM_FSEL]); |
277 | coldfire_set_pllcr_audio_bits(PLLCR_SET_AUDIO_BITS_DEFPARM); | 277 | coldfire_set_pllcr_audio_bits(PLLCR_SET_AUDIO_BITS_DEFPARM); |