len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

add support for the Wolfson WM8751

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11300 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Marcoen Hirschberg 2006-10-21 16:49:07 +00:00
parent 9afce4d359
commit 593b552486
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
firmware/sound.c
View file

@ -26,7 +26,7 @@
#include "mas.h" #include "mas.h"
#ifdef HAVE_UDA1380 #ifdef HAVE_UDA1380
#include "uda1380.h" #include "uda1380.h"
#elif defined(HAVE_WM8975) #elif defined(HAVE_WM8975) || defined(HAVE_WM8751)
#include "wm8975.h" #include "wm8975.h"
#elif defined(HAVE_WM8758) #elif defined(HAVE_WM8758)
#include "wm8758.h" #include "wm8758.h"
@ -75,7 +75,7 @@ static const struct sound_settings_info sound_settings_table[] = {
[SOUND_TREBLE] = {"dB", 0, 2, 0, 6, 0, sound_set_treble}, [SOUND_TREBLE] = {"dB", 0, 2, 0, 6, 0, sound_set_treble},
#elif defined(HAVE_TLV320) #elif defined(HAVE_TLV320)
[SOUND_VOLUME] = {"dB", 0, 1, -73, 6, -20, sound_set_volume}, [SOUND_VOLUME] = {"dB", 0, 1, -73, 6, -20, sound_set_volume},
#elif defined(HAVE_WM8975) #elif defined(HAVE_WM8975) || defined(HAVE_WM8751)
[SOUND_VOLUME] = {"dB", 0, 1, -74, 6, -25, sound_set_volume}, [SOUND_VOLUME] = {"dB", 0, 1, -74, 6, -25, sound_set_volume},
[SOUND_BASS] = {"dB", 0, 1, -6, 9, 0, sound_set_bass}, [SOUND_BASS] = {"dB", 0, 1, -6, 9, 0, sound_set_bass},
[SOUND_TREBLE] = {"dB", 0, 1, -6, 9, 0, sound_set_treble}, [SOUND_TREBLE] = {"dB", 0, 1, -6, 9, 0, sound_set_treble},
@ -316,7 +316,7 @@ static int tenthdb2master(int db)
} }
} }
#elif defined(HAVE_WM8975) #elif defined(HAVE_WM8975) || defined(HAVE_WM8751)
/* volume/balance/treble/bass interdependency */ /* volume/balance/treble/bass interdependency */
#define VOLUME_MIN -730 #define VOLUME_MIN -730
#define VOLUME_MAX 60 #define VOLUME_MAX 60
@ -424,7 +424,7 @@ static int tenthdb2mixer(int db)
#if (CONFIG_CODEC == MAS3507D) || defined HAVE_UDA1380 \ #if (CONFIG_CODEC == MAS3507D) || defined HAVE_UDA1380 \
|| defined HAVE_WM8975 || defined HAVE_WM8758 || defined(HAVE_WM8731) \ || defined HAVE_WM8975 || defined HAVE_WM8758 || defined(HAVE_WM8731) \
|| defined(HAVE_WM8721) || defined(HAVE_TLV320) || defined(HAVE_WM8721) || defined(HAVE_TLV320) || defined(HAVE_WM8751)
/* volume/balance/treble/bass interdependency main part */ /* volume/balance/treble/bass interdependency main part */
#define VOLUME_RANGE (VOLUME_MAX - VOLUME_MIN) #define VOLUME_RANGE (VOLUME_MAX - VOLUME_MIN)
@ -457,7 +457,7 @@ static void set_prescaled_volume(void)
#elif defined(HAVE_UDA1380) #elif defined(HAVE_UDA1380)
uda1380_set_mixer_vol(tenthdb2mixer(-prescale), tenthdb2mixer(-prescale)); uda1380_set_mixer_vol(tenthdb2mixer(-prescale), tenthdb2mixer(-prescale));
#elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \ #elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \
|| defined(HAVE_WM8731) || defined(HAVE_WM8721) || defined(HAVE_WM8731) || defined(HAVE_WM8721) || defined(HAVE_WM8751)
wmcodec_set_mixer_vol(tenthdb2mixer(-prescale), tenthdb2mixer(-prescale)); wmcodec_set_mixer_vol(tenthdb2mixer(-prescale), tenthdb2mixer(-prescale));
#endif #endif
@ -484,9 +484,9 @@ static void set_prescaled_volume(void)
#elif defined(HAVE_UDA1380) #elif defined(HAVE_UDA1380)
uda1380_set_master_vol(tenthdb2master(l), tenthdb2master(r)); uda1380_set_master_vol(tenthdb2master(l), tenthdb2master(r));
#elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \ #elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \
|| defined(HAVE_WM8731) || defined(HAVE_WM8721) || defined(HAVE_WM8731) || defined(HAVE_WM8721) || defined(HAVE_WM8751)
wmcodec_set_master_vol(tenthdb2master(l), tenthdb2master(r)); wmcodec_set_master_vol(tenthdb2master(l), tenthdb2master(r));
#if defined(HAVE_WM8975) || defined(HAVE_WM8758) #if defined(HAVE_WM8975) || defined(HAVE_WM8758) || defined(HAVE_WM8751)
wmcodec_set_lineout_vol(tenthdb2master(0), tenthdb2master(0)); wmcodec_set_lineout_vol(tenthdb2master(0), tenthdb2master(0));
#endif #endif
@ -599,7 +599,7 @@ void sound_set_volume(int value)
mas_codec_writereg(0x10, tmp); mas_codec_writereg(0x10, tmp);
#elif (CONFIG_CODEC == MAS3507D) || defined HAVE_UDA1380 \ #elif (CONFIG_CODEC == MAS3507D) || defined HAVE_UDA1380 \
|| defined HAVE_WM8975 || defined HAVE_WM8758 || defined HAVE_WM8731 \ || defined HAVE_WM8975 || defined HAVE_WM8758 || defined HAVE_WM8731 \
|| defined(HAVE_WM8721) || defined(HAVE_TLV320) || defined(HAVE_WM8721) || defined(HAVE_TLV320) || defined(HAVE_WM8751)
current_volume = value * 10; /* tenth of dB */ current_volume = value * 10; /* tenth of dB */
set_prescaled_volume(); set_prescaled_volume();
#elif CONFIG_CPU == PNX0101 #elif CONFIG_CPU == PNX0101
@ -617,7 +617,7 @@ void sound_set_balance(int value)
mas_codec_writereg(0x11, tmp); mas_codec_writereg(0x11, tmp);
#elif CONFIG_CODEC == MAS3507D || defined HAVE_UDA1380 \ #elif CONFIG_CODEC == MAS3507D || defined HAVE_UDA1380 \
|| defined HAVE_WM8975 || defined HAVE_WM8758 || defined HAVE_WM8731 \ || defined HAVE_WM8975 || defined HAVE_WM8758 || defined HAVE_WM8731 \
|| defined(HAVE_WM8721) || defined(HAVE_TLV320) || defined(HAVE_WM8721) || defined(HAVE_TLV320) || defined(HAVE_WM8751)
current_balance = value * VOLUME_RANGE / 100; /* tenth of dB */ current_balance = value * VOLUME_RANGE / 100; /* tenth of dB */
set_prescaled_volume(); set_prescaled_volume();
#elif CONFIG_CPU == PNX0101 #elif CONFIG_CPU == PNX0101
@ -643,7 +643,7 @@ void sound_set_bass(int value)
current_bass = value * 10; current_bass = value * 10;
set_prescaled_volume(); set_prescaled_volume();
#elif defined HAVE_WM8975 || defined HAVE_WM8758 \ #elif defined HAVE_WM8975 || defined HAVE_WM8758 \
|| defined HAVE_WM8731 || defined(HAVE_WM8721) || defined HAVE_WM8731 || defined(HAVE_WM8721) || defined(HAVE_WM8751)
current_bass = value * 10; current_bass = value * 10;
wmcodec_set_bass(value); wmcodec_set_bass(value);
set_prescaled_volume(); set_prescaled_volume();
@ -669,7 +669,7 @@ void sound_set_treble(int value)
current_treble = value * 10; current_treble = value * 10;
set_prescaled_volume(); set_prescaled_volume();
#elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \ #elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \
|| defined(HAVE_WM8731) || defined(HAVE_WM8721) || defined(HAVE_WM8731) || defined(HAVE_WM8721) || defined(HAVE_WM8751)
wmcodec_set_treble(value); wmcodec_set_treble(value);
current_treble = value * 10; current_treble = value * 10;
set_prescaled_volume(); set_prescaled_volume();