diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2008-12-12 11:01:07 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2008-12-12 11:01:07 +0000 |
commit | e69d567d9ebf7d236ff9663b11ac396cc71dcd75 (patch) | |
tree | 093b9d1bc979d79be1fcd0daac1d8daf8ac55503 /firmware/drivers/audio/wm8758.c | |
parent | 0ad97d13fc52b28de566dc0ddaf7245583eec2cc (diff) | |
download | rockbox-e69d567d9ebf7d236ff9663b11ac396cc71dcd75.tar.gz rockbox-e69d567d9ebf7d236ff9663b11ac396cc71dcd75.zip |
Bring consistency to pcm implementation and samplerate handling. Less low-level duplication. A small test_sampr fix so it works on coldfire again.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19400 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/audio/wm8758.c')
-rw-r--r-- | firmware/drivers/audio/wm8758.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/drivers/audio/wm8758.c b/firmware/drivers/audio/wm8758.c index 8ebfbe8e26..defc415f98 100644 --- a/firmware/drivers/audio/wm8758.c +++ b/firmware/drivers/audio/wm8758.c | |||
@@ -107,7 +107,7 @@ void audiohw_preinit(void) | |||
107 | wmcodec_write(OUTCTRL, OUTCTRL_VROI); | 107 | wmcodec_write(OUTCTRL, OUTCTRL_VROI); |
108 | wmcodec_write(CLKCTRL, CLKCTRL_MS); /* WM8758 is clock master */ | 108 | wmcodec_write(CLKCTRL, CLKCTRL_MS); /* WM8758 is clock master */ |
109 | 109 | ||
110 | audiohw_set_sample_rate(WM8758_44100HZ); | 110 | audiohw_set_sample_rate(HW_FREQ_44); |
111 | 111 | ||
112 | wmcodec_write(LOUTMIX, LOUTMIX_DACL2LMIX); | 112 | wmcodec_write(LOUTMIX, LOUTMIX_DACL2LMIX); |
113 | wmcodec_write(ROUTMIX, ROUTMIX_DACR2RMIX); | 113 | wmcodec_write(ROUTMIX, ROUTMIX_DACR2RMIX); |
@@ -170,10 +170,10 @@ void audiohw_close(void) | |||
170 | } | 170 | } |
171 | 171 | ||
172 | /* Note: Disable output before calling this function */ | 172 | /* Note: Disable output before calling this function */ |
173 | void audiohw_set_sample_rate(int sampling_control) | 173 | void audiohw_set_frequency(int fsel) |
174 | { | 174 | { |
175 | /**** We force 44.1KHz for now. ****/ | 175 | /**** We force 44.1KHz for now. ****/ |
176 | (void)sampling_control; | 176 | (void)fsel; |
177 | 177 | ||
178 | /* setup PLL for MHZ=11.2896 */ | 178 | /* setup PLL for MHZ=11.2896 */ |
179 | wmcodec_write(PLLN, PLLN_PLLPRESCALE | 0x7); | 179 | wmcodec_write(PLLN, PLLN_PLLPRESCALE | 0x7); |