diff options
Diffstat (limited to 'firmware/drivers/audio')
-rw-r--r-- | firmware/drivers/audio/ak4537.c | 2 | ||||
-rw-r--r-- | firmware/drivers/audio/as3514.c | 4 | ||||
-rw-r--r-- | firmware/drivers/audio/cs42l55.c | 4 | ||||
-rw-r--r-- | firmware/drivers/audio/rk27xx_codec.c | 2 | ||||
-rw-r--r-- | firmware/drivers/audio/tsc2100.c | 2 | ||||
-rw-r--r-- | firmware/drivers/audio/uda1341.c | 2 | ||||
-rw-r--r-- | firmware/drivers/audio/wm8758.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/firmware/drivers/audio/ak4537.c b/firmware/drivers/audio/ak4537.c index 4a9010d4e7..6f4e85a7fa 100644 --- a/firmware/drivers/audio/ak4537.c +++ b/firmware/drivers/audio/ak4537.c | |||
@@ -207,7 +207,7 @@ void audiohw_close(void) | |||
207 | akcodec_close(); /* target-specific */ | 207 | akcodec_close(); /* target-specific */ |
208 | } | 208 | } |
209 | 209 | ||
210 | void audiohw_set_master_vol(int vol_l, int vol_r) | 210 | void audiohw_set_volume(int vol_l, int vol_r) |
211 | { | 211 | { |
212 | vol_l = vol_tenthdb2hw(vol_l); | 212 | vol_l = vol_tenthdb2hw(vol_l); |
213 | vol_r = vol_tenthdb2hw(vol_r); | 213 | vol_r = vol_tenthdb2hw(vol_r); |
diff --git a/firmware/drivers/audio/as3514.c b/firmware/drivers/audio/as3514.c index b9118f9fcf..e1c7f6575e 100644 --- a/firmware/drivers/audio/as3514.c +++ b/firmware/drivers/audio/as3514.c | |||
@@ -240,7 +240,7 @@ void audiohw_postinit(void) | |||
240 | audiohw_mute(false); | 240 | audiohw_mute(false); |
241 | } | 241 | } |
242 | 242 | ||
243 | void audiohw_set_master_vol(int vol_l, int vol_r) | 243 | void audiohw_set_volume(int vol_l, int vol_r) |
244 | { | 244 | { |
245 | unsigned int hph_r, hph_l; | 245 | unsigned int hph_r, hph_l; |
246 | unsigned int mix_l, mix_r; | 246 | unsigned int mix_l, mix_r; |
@@ -298,7 +298,7 @@ void audiohw_set_lineout_volume(int vol_l, int vol_r) | |||
298 | { | 298 | { |
299 | #ifdef HAVE_AS3543 | 299 | #ifdef HAVE_AS3543 |
300 | /* line out volume is set in the same registers */ | 300 | /* line out volume is set in the same registers */ |
301 | audiohw_set_master_volume(vol_l, vol_r); | 301 | audiohw_set_volume(vol_l, vol_r); |
302 | #else | 302 | #else |
303 | vol_l = vol_tenthdb2hw(vol_l); | 303 | vol_l = vol_tenthdb2hw(vol_l); |
304 | vol_r = vol_tenthdb2hw(vol_r); | 304 | vol_r = vol_tenthdb2hw(vol_r); |
diff --git a/firmware/drivers/audio/cs42l55.c b/firmware/drivers/audio/cs42l55.c index 75fcd80b77..6c6e17abd4 100644 --- a/firmware/drivers/audio/cs42l55.c +++ b/firmware/drivers/audio/cs42l55.c | |||
@@ -111,7 +111,7 @@ void audiohw_postinit(void) | |||
111 | audiohw_mute(false); | 111 | audiohw_mute(false); |
112 | } | 112 | } |
113 | 113 | ||
114 | void audiohw_set_master_vol(int vol_l, int vol_r) | 114 | void audiohw_set_volume(int vol_l, int vol_r) |
115 | { | 115 | { |
116 | vol_l = vol_tenthdb2hw(vol_l); | 116 | vol_l = vol_tenthdb2hw(vol_l); |
117 | vol_r = vol_tenthdb2hw(vol_r); | 117 | vol_r = vol_tenthdb2hw(vol_r); |
@@ -121,7 +121,7 @@ void audiohw_set_master_vol(int vol_l, int vol_r) | |||
121 | vol_r << HPBCTL_HPBVOL_SHIFT); | 121 | vol_r << HPBCTL_HPBVOL_SHIFT); |
122 | } | 122 | } |
123 | 123 | ||
124 | void audiohw_set_lineout_vol(int vol_l, int vol_r) | 124 | void audiohw_set_lineout_volume(int vol_l, int vol_r) |
125 | { | 125 | { |
126 | vol_l = vol_tenthdb2hw(vol_l); | 126 | vol_l = vol_tenthdb2hw(vol_l); |
127 | vol_r = vol_tenthdb2hw(vol_r); | 127 | vol_r = vol_tenthdb2hw(vol_r); |
diff --git a/firmware/drivers/audio/rk27xx_codec.c b/firmware/drivers/audio/rk27xx_codec.c index aada17cc0a..8f294ba9f3 100644 --- a/firmware/drivers/audio/rk27xx_codec.c +++ b/firmware/drivers/audio/rk27xx_codec.c | |||
@@ -133,7 +133,7 @@ void audiohw_set_frequency(int fsel) | |||
133 | codec_write(CCR2, values_freq[fsel]); | 133 | codec_write(CCR2, values_freq[fsel]); |
134 | } | 134 | } |
135 | 135 | ||
136 | void audiohw_set_master_vol(int vol_l, int vol_r) | 136 | void audiohw_set_volume(int vol_l, int vol_r) |
137 | { | 137 | { |
138 | vol_l = vol_tenthdb2hw(vol_l); | 138 | vol_l = vol_tenthdb2hw(vol_l); |
139 | vol_r = vol_tenthdb2hw(vol_r); | 139 | vol_r = vol_tenthdb2hw(vol_r); |
diff --git a/firmware/drivers/audio/tsc2100.c b/firmware/drivers/audio/tsc2100.c index 41327ae3d7..fda192a62a 100644 --- a/firmware/drivers/audio/tsc2100.c +++ b/firmware/drivers/audio/tsc2100.c | |||
@@ -74,7 +74,7 @@ void audiohw_postinit(void) | |||
74 | audiohw_mute(false); | 74 | audiohw_mute(false); |
75 | } | 75 | } |
76 | 76 | ||
77 | void audiohw_set_master_volume(int vol_l, int vol_r) | 77 | void audiohw_set_volume(int vol_l, int vol_r) |
78 | { | 78 | { |
79 | vol_l = vol_tenthdb2hw(vol_l); | 79 | vol_l = vol_tenthdb2hw(vol_l); |
80 | vol_r = vol_tenthdb2hw(vol_r); | 80 | vol_r = vol_tenthdb2hw(vol_r); |
diff --git a/firmware/drivers/audio/uda1341.c b/firmware/drivers/audio/uda1341.c index ac3bcedb7d..e15cd39bfc 100644 --- a/firmware/drivers/audio/uda1341.c +++ b/firmware/drivers/audio/uda1341.c | |||
@@ -166,7 +166,7 @@ void audiohw_init(void) | |||
166 | 166 | ||
167 | audiohw_set_bass (0); | 167 | audiohw_set_bass (0); |
168 | audiohw_set_treble (0); | 168 | audiohw_set_treble (0); |
169 | audiohw_set_master_vol (26, 26); /* -25 dB */ | 169 | audiohw_set_volume (-250); /* -25 dB */ |
170 | } | 170 | } |
171 | 171 | ||
172 | void audiohw_postinit(void) | 172 | void audiohw_postinit(void) |
diff --git a/firmware/drivers/audio/wm8758.c b/firmware/drivers/audio/wm8758.c index 3e0c88c55c..387a1a48c4 100644 --- a/firmware/drivers/audio/wm8758.c +++ b/firmware/drivers/audio/wm8758.c | |||
@@ -134,7 +134,7 @@ void audiohw_postinit(void) | |||
134 | audiohw_mute(false); | 134 | audiohw_mute(false); |
135 | } | 135 | } |
136 | 136 | ||
137 | void audiohw_set_master_vol(int vol_l, int vol_r) | 137 | void audiohw_set_volume(int vol_l, int vol_r) |
138 | { | 138 | { |
139 | int dac_l, amp_l, dac_r, amp_r; | 139 | int dac_l, amp_l, dac_r, amp_r; |
140 | get_volume_params(vol_l, &dac_l, &_l); | 140 | get_volume_params(vol_l, &dac_l, &_l); |