From a238ab9df8f19ecd7abc44b6707a5622fcd770fe Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Sun, 14 May 2006 23:34:24 +0000 Subject: Iriver: Moved the handling of the UDA1380 split gain (analog preamp + decimator gain) into the UDA driver. * All: Settings structure sorted & cleaned up. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9927 a1c6a512-1295-4272-9138-f99709370657 --- firmware/sound.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'firmware/sound.c') diff --git a/firmware/sound.c b/firmware/sound.c index 7768afd909..057cfc0995 100644 --- a/firmware/sound.c +++ b/firmware/sound.c @@ -108,11 +108,9 @@ static const struct sound_settings_info sound_settings_table[] = { [SOUND_RIGHT_GAIN] = {"dB", 1, 1, 0, 15, 8, NULL}, [SOUND_MIC_GAIN] = {"dB", 1, 1, 0, 15, 2, NULL}, #elif defined(HAVE_UDA1380) - [SOUND_LEFT_GAIN] = {"dB", 1, 1, 0, 8, 8, NULL}, - [SOUND_RIGHT_GAIN] = {"dB", 1, 1, 0, 8, 8, NULL}, - [SOUND_MIC_GAIN] = {"dB", 1, 1, 0, 15, 2, NULL}, - [SOUND_DECIMATOR_LEFT_GAIN] = {"dB", 1, 1,-128, 48, 0, NULL}, - [SOUND_DECIMATOR_RIGHT_GAIN]= {"dB", 1, 1,-128, 48, 0, NULL}, + [SOUND_LEFT_GAIN] = {"dB", 1, 1,-128, 96, 0, NULL}, + [SOUND_RIGHT_GAIN] = {"dB", 1, 1,-128, 96, 0, NULL}, + [SOUND_MIC_GAIN] = {"dB", 1, 1,-128, 108, 16, NULL}, #endif }; @@ -894,19 +892,11 @@ int sound_val2phys(int setting, int value) { case SOUND_LEFT_GAIN: case SOUND_RIGHT_GAIN: - result = value * 30; /* (24/8) *10 */ - break; - case SOUND_MIC_GAIN: - result = value * 20; /* (30/15) *10 */ - break; - - case SOUND_DECIMATOR_LEFT_GAIN: - case SOUND_DECIMATOR_RIGHT_GAIN: - result = value * 5; /* (1/2) *10 */ + result = value * 5; /* (1/2) * 10 */ break; - default: + default: result = value; break; } -- cgit v1.2.3