diff options
author | Peter D'Hoye <peter.dhoye@gmail.com> | 2008-10-18 22:37:41 +0000 |
---|---|---|
committer | Peter D'Hoye <peter.dhoye@gmail.com> | 2008-10-18 22:37:41 +0000 |
commit | 695c39bc9cb56214ae86bc79bf129d6cb074a43b (patch) | |
tree | 9bcaa214f17c37e3dfd3f2858fd9fa1746debd60 | |
parent | 5047b2e180ee72d869d6a50eabac5ebe5fdbd9cc (diff) | |
download | rockbox-695c39bc9cb56214ae86bc79bf129d6cb074a43b.tar.gz rockbox-695c39bc9cb56214ae86bc79bf129d6cb074a43b.zip |
Remove the audiohw_set_nsorder() function since it is not used, only implemented on WM8731 and not wanted/used there.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18829 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/drivers/audio/wm8721.c | 6 | ||||
-rw-r--r-- | firmware/drivers/audio/wm8731.c | 17 | ||||
-rw-r--r-- | firmware/drivers/audio/wm8758.c | 5 | ||||
-rw-r--r-- | firmware/drivers/audio/wm8975.c | 5 | ||||
-rw-r--r-- | firmware/export/wm8721.h | 1 | ||||
-rw-r--r-- | firmware/export/wm8731.h | 1 | ||||
-rw-r--r-- | firmware/export/wm8758.h | 1 | ||||
-rw-r--r-- | firmware/export/wm8975.h | 1 |
8 files changed, 0 insertions, 37 deletions
diff --git a/firmware/drivers/audio/wm8721.c b/firmware/drivers/audio/wm8721.c index 1740a48d18..6c4e12b9dc 100644 --- a/firmware/drivers/audio/wm8721.c +++ b/firmware/drivers/audio/wm8721.c | |||
@@ -160,12 +160,6 @@ void audiohw_close(void) | |||
160 | wmcodec_write(PDCTRL, 0xff); | 160 | wmcodec_write(PDCTRL, 0xff); |
161 | } | 161 | } |
162 | 162 | ||
163 | /* Change the order of the noise shaper, 5th order is recommended above 32kHz */ | ||
164 | void audiohw_set_nsorder(int order) | ||
165 | { | ||
166 | (void)order; | ||
167 | } | ||
168 | |||
169 | void audiohw_set_sample_rate(int sampling_control) | 163 | void audiohw_set_sample_rate(int sampling_control) |
170 | { | 164 | { |
171 | int rate = 0; | 165 | int rate = 0; |
diff --git a/firmware/drivers/audio/wm8731.c b/firmware/drivers/audio/wm8731.c index c4376ff34a..d96701ca9d 100644 --- a/firmware/drivers/audio/wm8731.c +++ b/firmware/drivers/audio/wm8731.c | |||
@@ -204,23 +204,6 @@ void audiohw_close(void) | |||
204 | /* 2) Remove the WM8731 supplies. */ | 204 | /* 2) Remove the WM8731 supplies. */ |
205 | } | 205 | } |
206 | 206 | ||
207 | void audiohw_set_nsorder(int order) | ||
208 | { | ||
209 | static const unsigned char deemp[4] = | ||
210 | { | ||
211 | DAPCTRL_DEEMP_DISABLE, | ||
212 | DAPCTRL_DEEMP_32KHz, | ||
213 | DAPCTRL_DEEMP_44KHz, | ||
214 | DAPCTRL_DEEMP_48KHz | ||
215 | }; | ||
216 | |||
217 | if ((unsigned)order >= ARRAYLEN(deemp)) | ||
218 | order = 0; | ||
219 | |||
220 | wm8731_write(DAPCTRL, | ||
221 | (wm8731_regs[DAPCTRL] & ~DAPCTRL_DEEMP_MASK) | deemp[order]); | ||
222 | } | ||
223 | |||
224 | void audiohw_set_sample_rate(int sampling_control) | 207 | void audiohw_set_sample_rate(int sampling_control) |
225 | { | 208 | { |
226 | int rate = 0; | 209 | int rate = 0; |
diff --git a/firmware/drivers/audio/wm8758.c b/firmware/drivers/audio/wm8758.c index d698049a8b..e9d4b5c5c7 100644 --- a/firmware/drivers/audio/wm8758.c +++ b/firmware/drivers/audio/wm8758.c | |||
@@ -172,11 +172,6 @@ void audiohw_close(void) | |||
172 | wmcodec_write(PWRMGMT2, PWRMGMT2_SLEEP); | 172 | wmcodec_write(PWRMGMT2, PWRMGMT2_SLEEP); |
173 | } | 173 | } |
174 | 174 | ||
175 | void audiohw_set_nsorder(int order) | ||
176 | { | ||
177 | (void)order; | ||
178 | } | ||
179 | |||
180 | /* Note: Disable output before calling this function */ | 175 | /* Note: Disable output before calling this function */ |
181 | void audiohw_set_sample_rate(int sampling_control) | 176 | void audiohw_set_sample_rate(int sampling_control) |
182 | { | 177 | { |
diff --git a/firmware/drivers/audio/wm8975.c b/firmware/drivers/audio/wm8975.c index 23ce91fb5b..86e463cdff 100644 --- a/firmware/drivers/audio/wm8975.c +++ b/firmware/drivers/audio/wm8975.c | |||
@@ -226,11 +226,6 @@ void audiohw_close(void) | |||
226 | wmcodec_write(PWRMGMT1, 0x0); | 226 | wmcodec_write(PWRMGMT1, 0x0); |
227 | } | 227 | } |
228 | 228 | ||
229 | void audiohw_set_nsorder(int order) | ||
230 | { | ||
231 | (void)order; | ||
232 | } | ||
233 | |||
234 | /* Note: Disable output before calling this function */ | 229 | /* Note: Disable output before calling this function */ |
235 | void audiohw_set_sample_rate(int sampling_control) | 230 | void audiohw_set_sample_rate(int sampling_control) |
236 | { | 231 | { |
diff --git a/firmware/export/wm8721.h b/firmware/export/wm8721.h index 3611e4d6ee..814535621a 100644 --- a/firmware/export/wm8721.h +++ b/firmware/export/wm8721.h | |||
@@ -29,7 +29,6 @@ | |||
29 | extern int tenthdb2master(int db); | 29 | extern int tenthdb2master(int db); |
30 | 30 | ||
31 | extern void audiohw_set_master_vol(int vol_l, int vol_r); | 31 | extern void audiohw_set_master_vol(int vol_l, int vol_r); |
32 | extern void audiohw_set_nsorder(int order); | ||
33 | extern void audiohw_set_sample_rate(int sampling_control); | 32 | extern void audiohw_set_sample_rate(int sampling_control); |
34 | 33 | ||
35 | /* Register addresses and bits */ | 34 | /* Register addresses and bits */ |
diff --git a/firmware/export/wm8731.h b/firmware/export/wm8731.h index b21568406d..a572546e95 100644 --- a/firmware/export/wm8731.h +++ b/firmware/export/wm8731.h | |||
@@ -29,7 +29,6 @@ | |||
29 | extern int tenthdb2master(int db); | 29 | extern int tenthdb2master(int db); |
30 | 30 | ||
31 | extern void audiohw_set_master_vol(int vol_l, int vol_r); | 31 | extern void audiohw_set_master_vol(int vol_l, int vol_r); |
32 | extern void audiohw_set_nsorder(int order); | ||
33 | extern void audiohw_set_sample_rate(int sampling_control); | 32 | extern void audiohw_set_sample_rate(int sampling_control); |
34 | 33 | ||
35 | /* Register addresses and bits */ | 34 | /* Register addresses and bits */ |
diff --git a/firmware/export/wm8758.h b/firmware/export/wm8758.h index e7f7906651..c094b1296a 100644 --- a/firmware/export/wm8758.h +++ b/firmware/export/wm8758.h | |||
@@ -34,7 +34,6 @@ extern int tenthdb2mixer(int db); | |||
34 | extern void audiohw_set_master_vol(int vol_l, int vol_r); | 34 | extern void audiohw_set_master_vol(int vol_l, int vol_r); |
35 | extern void audiohw_set_lineout_vol(int vol_l, int vol_r); | 35 | extern void audiohw_set_lineout_vol(int vol_l, int vol_r); |
36 | extern void audiohw_set_mixer_vol(int channel1, int channel2); | 36 | extern void audiohw_set_mixer_vol(int channel1, int channel2); |
37 | extern void audiohw_set_nsorder(int order); | ||
38 | extern void audiohw_set_sample_rate(int sampling_control); | 37 | extern void audiohw_set_sample_rate(int sampling_control); |
39 | 38 | ||
40 | #define RESET 0x00 | 39 | #define RESET 0x00 |
diff --git a/firmware/export/wm8975.h b/firmware/export/wm8975.h index 881e7110bd..e2e443213a 100644 --- a/firmware/export/wm8975.h +++ b/firmware/export/wm8975.h | |||
@@ -32,7 +32,6 @@ extern int tenthdb2master(int db); | |||
32 | 32 | ||
33 | extern void audiohw_set_master_vol(int vol_l, int vol_r); | 33 | extern void audiohw_set_master_vol(int vol_l, int vol_r); |
34 | extern void audiohw_set_lineout_vol(int vol_l, int vol_r); | 34 | extern void audiohw_set_lineout_vol(int vol_l, int vol_r); |
35 | extern void audiohw_set_nsorder(int order); | ||
36 | extern void audiohw_set_sample_rate(int sampling_control); | 35 | extern void audiohw_set_sample_rate(int sampling_control); |
37 | 36 | ||
38 | /* Register addresses and bits */ | 37 | /* Register addresses and bits */ |