diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/sound.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/firmware/sound.c b/firmware/sound.c index 70f7346599..47a749f0a1 100644 --- a/firmware/sound.c +++ b/firmware/sound.c | |||
@@ -72,7 +72,7 @@ static const struct sound_settings_info sound_settings_table[] = { | |||
72 | [SOUND_BASS] = {"dB", 0, 2, 0, 24, 0, sound_set_bass}, | 72 | [SOUND_BASS] = {"dB", 0, 2, 0, 24, 0, sound_set_bass}, |
73 | [SOUND_TREBLE] = {"dB", 0, 2, 0, 6, 0, sound_set_treble}, | 73 | [SOUND_TREBLE] = {"dB", 0, 2, 0, 6, 0, sound_set_treble}, |
74 | #elif defined(HAVE_WM8975) | 74 | #elif defined(HAVE_WM8975) |
75 | [SOUND_VOLUME] = {"dB", 0, 1, -73, 6, -25, sound_set_volume}, | 75 | [SOUND_VOLUME] = {"dB", 0, 1, -74, 6, -25, sound_set_volume}, |
76 | [SOUND_BASS] = {"dB", 0, 1, -6, 9, 0, sound_set_bass}, | 76 | [SOUND_BASS] = {"dB", 0, 1, -6, 9, 0, sound_set_bass}, |
77 | [SOUND_TREBLE] = {"dB", 0, 1, -6, 9, 0, sound_set_treble}, | 77 | [SOUND_TREBLE] = {"dB", 0, 1, -6, 9, 0, sound_set_treble}, |
78 | #elif defined(HAVE_WM8758) | 78 | #elif defined(HAVE_WM8758) |
@@ -80,7 +80,7 @@ static const struct sound_settings_info sound_settings_table[] = { | |||
80 | [SOUND_BASS] = {"dB", 0, 1, -6, 9, 0, sound_set_bass}, | 80 | [SOUND_BASS] = {"dB", 0, 1, -6, 9, 0, sound_set_bass}, |
81 | [SOUND_TREBLE] = {"dB", 0, 1, -6, 9, 0, sound_set_treble}, | 81 | [SOUND_TREBLE] = {"dB", 0, 1, -6, 9, 0, sound_set_treble}, |
82 | #elif defined(HAVE_WM8731) | 82 | #elif defined(HAVE_WM8731) |
83 | [SOUND_VOLUME] = {"dB", 0, 1, -73, 6, -25, sound_set_volume}, | 83 | [SOUND_VOLUME] = {"dB", 0, 1, -74, 6, -25, sound_set_volume}, |
84 | [SOUND_BASS] = {"dB", 0, 1, -6, 9, 0, sound_set_bass}, | 84 | [SOUND_BASS] = {"dB", 0, 1, -6, 9, 0, sound_set_bass}, |
85 | [SOUND_TREBLE] = {"dB", 0, 1, -6, 9, 0, sound_set_treble}, | 85 | [SOUND_TREBLE] = {"dB", 0, 1, -6, 9, 0, sound_set_treble}, |
86 | #else /* MAS3507D */ | 86 | #else /* MAS3507D */ |
@@ -302,10 +302,10 @@ static int tenthdb2master(int db) | |||
302 | /* 0110000 == -73dB (0x30 */ | 302 | /* 0110000 == -73dB (0x30 */ |
303 | /* 0101111 == mute (0x2f) */ | 303 | /* 0101111 == mute (0x2f) */ |
304 | 304 | ||
305 | if (db <= -730) { | 305 | if (db < VOLUME_MIN) { |
306 | return 0x0; | 306 | return 0x0; |
307 | } else { | 307 | } else { |
308 | return((db/10)+73+0x2f); | 308 | return((db/10)+73+0x30); |
309 | } | 309 | } |
310 | } | 310 | } |
311 | 311 | ||
@@ -338,7 +338,7 @@ static int tenthdb2master(int db) | |||
338 | 338 | ||
339 | /* 1000000 == Mute (0x40) */ | 339 | /* 1000000 == Mute (0x40) */ |
340 | 340 | ||
341 | if (db < -570) { | 341 | if (db < VOLUME_MIN) { |
342 | return 0x40; | 342 | return 0x40; |
343 | } else { | 343 | } else { |
344 | return((db/10)+57); | 344 | return((db/10)+57); |
@@ -372,10 +372,10 @@ static int tenthdb2master(int db) | |||
372 | /* 0110000 == -73dB (0x30 */ | 372 | /* 0110000 == -73dB (0x30 */ |
373 | /* 0101111 == mute (0x2f) */ | 373 | /* 0101111 == mute (0x2f) */ |
374 | 374 | ||
375 | if (db <= -570) { | 375 | if (db < VOLUME_MIN) { |
376 | return 0x0; | 376 | return 0x2f; |
377 | } else { | 377 | } else { |
378 | return((db/10)+57); | 378 | return((db/10)+0x30+73); |
379 | } | 379 | } |
380 | } | 380 | } |
381 | 381 | ||