diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/uda1380.c | 10 | ||||
-rw-r--r-- | firmware/export/audio.h | 6 | ||||
-rw-r--r-- | firmware/export/sound.h | 4 | ||||
-rw-r--r-- | firmware/sound.c | 8 |
4 files changed, 14 insertions, 14 deletions
diff --git a/firmware/drivers/uda1380.c b/firmware/drivers/uda1380.c index eb2b57e7f3..3281391c72 100644 --- a/firmware/drivers/uda1380.c +++ b/firmware/drivers/uda1380.c | |||
@@ -255,10 +255,10 @@ void uda1380_disable_recording(void) | |||
255 | /** | 255 | /** |
256 | * Set recording gain and volume | 256 | * Set recording gain and volume |
257 | * | 257 | * |
258 | * type: params: ranges: | 258 | * type: params: ranges: |
259 | * AUDIO_GAIN_MIC left 0 .. 15 -> 0 .. 30 dB gain | 259 | * AUDIO_GAIN_MIC left 0 .. 15 -> 0 .. 30 dB gain |
260 | * AUDIO_GAIN_LINEIN left & right 0 .. 8 -> 0 .. 24 dB gain | 260 | * AUDIO_GAIN_LINEIN left & right 0 .. 8 -> 0 .. 24 dB gain |
261 | * AUDIO_GAIN_ADC left & right -128 .. 48 -> -64 .. 24 dB gain | 261 | * AUDIO_GAIN_DECIMATOR left & right -128 .. 48 -> -64 .. 24 dB gain |
262 | * | 262 | * |
263 | * Note: For all types the value 0 gives 0 dB gain. | 263 | * Note: For all types the value 0 gives 0 dB gain. |
264 | */ | 264 | */ |
@@ -274,7 +274,7 @@ void uda1380_set_recvol(int left, int right, int type) | |||
274 | uda1380_write_reg(REG_PGA, (uda1380_regs[REG_PGA] & ~PGA_GAIN_MASK) | PGA_GAINL(left) | PGA_GAINR(right)); | 274 | uda1380_write_reg(REG_PGA, (uda1380_regs[REG_PGA] & ~PGA_GAIN_MASK) | PGA_GAINL(left) | PGA_GAINR(right)); |
275 | break; | 275 | break; |
276 | 276 | ||
277 | case AUDIO_GAIN_ADC: | 277 | case AUDIO_GAIN_DECIMATOR: |
278 | uda1380_write_reg(REG_DEC_VOL, DEC_VOLL(left) | DEC_VOLR(right)); | 278 | uda1380_write_reg(REG_DEC_VOL, DEC_VOLL(left) | DEC_VOLR(right)); |
279 | break; | 279 | break; |
280 | } | 280 | } |
diff --git a/firmware/export/audio.h b/firmware/export/audio.h index 214f298a75..6867f3a268 100644 --- a/firmware/export/audio.h +++ b/firmware/export/audio.h | |||
@@ -33,9 +33,9 @@ | |||
33 | 33 | ||
34 | #define AUDIOERR_DISK_FULL 1 | 34 | #define AUDIOERR_DISK_FULL 1 |
35 | 35 | ||
36 | #define AUDIO_GAIN_LINEIN 0 | 36 | #define AUDIO_GAIN_LINEIN 0 |
37 | #define AUDIO_GAIN_MIC 1 | 37 | #define AUDIO_GAIN_MIC 1 |
38 | #define AUDIO_GAIN_ADC 2 /* for UDA1380 */ | 38 | #define AUDIO_GAIN_DECIMATOR 2 /* for UDA1380 */ |
39 | 39 | ||
40 | 40 | ||
41 | struct audio_debug | 41 | struct audio_debug |
diff --git a/firmware/export/sound.h b/firmware/export/sound.h index 2c002063db..dae124d8f7 100644 --- a/firmware/export/sound.h +++ b/firmware/export/sound.h | |||
@@ -42,8 +42,8 @@ enum { | |||
42 | SOUND_MIC_GAIN, | 42 | SOUND_MIC_GAIN, |
43 | #endif | 43 | #endif |
44 | #if defined(HAVE_UDA1380) | 44 | #if defined(HAVE_UDA1380) |
45 | SOUND_ADC_LEFT_GAIN, | 45 | SOUND_DECIMATOR_LEFT_GAIN, |
46 | SOUND_ADC_RIGHT_GAIN, | 46 | SOUND_DECIMATOR_RIGHT_GAIN, |
47 | #endif | 47 | #endif |
48 | }; | 48 | }; |
49 | 49 | ||
diff --git a/firmware/sound.c b/firmware/sound.c index cee8c06294..110c2c91b8 100644 --- a/firmware/sound.c +++ b/firmware/sound.c | |||
@@ -97,8 +97,8 @@ static const struct sound_settings_info sound_settings_table[] = { | |||
97 | [SOUND_LEFT_GAIN] = {"dB", 1, 1, 0, 8, 8, NULL}, | 97 | [SOUND_LEFT_GAIN] = {"dB", 1, 1, 0, 8, 8, NULL}, |
98 | [SOUND_RIGHT_GAIN] = {"dB", 1, 1, 0, 8, 8, NULL}, | 98 | [SOUND_RIGHT_GAIN] = {"dB", 1, 1, 0, 8, 8, NULL}, |
99 | [SOUND_MIC_GAIN] = {"dB", 1, 1, 0, 15, 2, NULL}, | 99 | [SOUND_MIC_GAIN] = {"dB", 1, 1, 0, 15, 2, NULL}, |
100 | [SOUND_ADC_LEFT_GAIN] = {"dB", 1, 1,-128, 48, 0, NULL}, | 100 | [SOUND_DECIMATOR_LEFT_GAIN] = {"dB", 1, 1,-128, 48, 0, NULL}, |
101 | [SOUND_ADC_RIGHT_GAIN]= {"dB", 1, 1,-128, 48, 0, NULL}, | 101 | [SOUND_DECIMATOR_RIGHT_GAIN]= {"dB", 1, 1,-128, 48, 0, NULL}, |
102 | #endif | 102 | #endif |
103 | }; | 103 | }; |
104 | 104 | ||
@@ -762,8 +762,8 @@ int sound_val2phys(int setting, int value) | |||
762 | result = value * 20; /* (30/15) *10 */ | 762 | result = value * 20; /* (30/15) *10 */ |
763 | break; | 763 | break; |
764 | 764 | ||
765 | case SOUND_ADC_LEFT_GAIN: | 765 | case SOUND_DECIMATOR_LEFT_GAIN: |
766 | case SOUND_ADC_RIGHT_GAIN: | 766 | case SOUND_DECIMATOR_RIGHT_GAIN: |
767 | result = value * 5; /* (1/2) *10 */ | 767 | result = value * 5; /* (1/2) *10 */ |
768 | break; | 768 | break; |
769 | 769 | ||