diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/as3514.c | 10 | ||||
-rw-r--r-- | firmware/export/as3514.h | 6 | ||||
-rw-r--r-- | firmware/sound.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/firmware/drivers/as3514.c b/firmware/drivers/as3514.c index 455c2f3320..7b6704e630 100644 --- a/firmware/drivers/as3514.c +++ b/firmware/drivers/as3514.c | |||
@@ -47,11 +47,11 @@ static void as3514_write(int reg, int value) | |||
47 | /* convert tenth of dB volume to master volume register value */ | 47 | /* convert tenth of dB volume to master volume register value */ |
48 | int tenthdb2master(int db) | 48 | int tenthdb2master(int db) |
49 | { | 49 | { |
50 | /* +1..07 to -45.43dB in 1.5dB steps == 32 levels = 5 bits */ | 50 | /* +6 to -45.43dB in 1.5dB steps == 32 levels = 5 bits */ |
51 | /* 11111 == +1.07dB (0x1f) = 31) */ | 51 | /* 11111 == +6dB (0x1f) = 31) */ |
52 | /* 11110 == -0.43dB (0x1e) = 30) */ | 52 | /* 11110 == -4.5dB (0x1e) = 30) */ |
53 | /* 00001 == -43.93dB (0x01) */ | 53 | /* 00001 == -39dB (0x01) */ |
54 | /* 00000 == -45.43dB (0x00) */ | 54 | /* 00000 == -40.5dB (0x00) */ |
55 | 55 | ||
56 | if (db < VOLUME_MIN) { | 56 | if (db < VOLUME_MIN) { |
57 | return 0x0; | 57 | return 0x0; |
diff --git a/firmware/export/as3514.h b/firmware/export/as3514.h index 14208bc414..e90a8f47ef 100644 --- a/firmware/export/as3514.h +++ b/firmware/export/as3514.h | |||
@@ -69,9 +69,9 @@ extern void audiohw_set_monitor(int enable); | |||
69 | #define ADC_0 0x2e | 69 | #define ADC_0 0x2e |
70 | #define ADC_1 0x2f | 70 | #define ADC_1 0x2f |
71 | 71 | ||
72 | /* Headphone volume goes from -45.43 - 1.07dB */ | 72 | /* Headphone volume goes from -40.5 - 6dB */ |
73 | #define VOLUME_MIN -454 | 73 | #define VOLUME_MIN -405 |
74 | #define VOLUME_MAX 10 | 74 | #define VOLUME_MAX 60 |
75 | 75 | ||
76 | #ifdef SANSA_E200 | 76 | #ifdef SANSA_E200 |
77 | #define AS3514_I2C_ADDR 0x46 | 77 | #define AS3514_I2C_ADDR 0x46 |
diff --git a/firmware/sound.c b/firmware/sound.c index cb83927439..9835711b54 100644 --- a/firmware/sound.c +++ b/firmware/sound.c | |||
@@ -77,7 +77,7 @@ static const struct sound_settings_info sound_settings_table[] = { | |||
77 | #elif (CONFIG_CPU == PNX0101) | 77 | #elif (CONFIG_CPU == PNX0101) |
78 | [SOUND_VOLUME] = {"dB", 0, 1, -48, 15, 0, sound_set_volume}, | 78 | [SOUND_VOLUME] = {"dB", 0, 1, -48, 15, 0, sound_set_volume}, |
79 | #elif defined(HAVE_AS3514) | 79 | #elif defined(HAVE_AS3514) |
80 | [SOUND_VOLUME] = {"dB", 0, 1, -45, 1, -25, sound_set_volume}, | 80 | [SOUND_VOLUME] = {"dB", 0, 1, -40, 6, -25, sound_set_volume}, |
81 | #else /* MAS3507D */ | 81 | #else /* MAS3507D */ |
82 | [SOUND_VOLUME] = {"dB", 0, 1, -78, 18, -18, sound_set_volume}, | 82 | [SOUND_VOLUME] = {"dB", 0, 1, -78, 18, -18, sound_set_volume}, |
83 | [SOUND_BASS] = {"dB", 0, 1, -15, 15, 7, sound_set_bass}, | 83 | [SOUND_BASS] = {"dB", 0, 1, -15, 15, 7, sound_set_bass}, |