diff options
| author | Christian Gmeiner <christian.gmeiner@gmail.com> | 2008-04-22 09:42:02 +0000 |
|---|---|---|
| committer | Christian Gmeiner <christian.gmeiner@gmail.com> | 2008-04-22 09:42:02 +0000 |
| commit | 365c3b90b8b7d8bddc1bb94fbc7a6f0d7b29b21f (patch) | |
| tree | 56bc8f913be220ae942bab6131b628ad785deeb0 | |
| parent | 7510335fc4fe25e1fe8ec80a33bd3f3f7442dd4c (diff) | |
move defines for VOLUME_MIN and VOLUME_MAX to their correct place (mas35xx.h)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17214 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/export/mas35xx.h | 11 | ||||
| -rw-r--r-- | firmware/sound.c | 8 |
2 files changed, 12 insertions, 7 deletions
diff --git a/firmware/export/mas35xx.h b/firmware/export/mas35xx.h index d89b489182..baafcf1216 100644 --- a/firmware/export/mas35xx.h +++ b/firmware/export/mas35xx.h @@ -24,7 +24,16 @@ #include "config.h" -#if CONFIG_CODEC == MAS3507D +#if CONFIG_CODEC != MAS3507D + +#define VOLUME_MIN -400 +#define VOLUME_MAX 600 + +#else /* CONFIG_CODEC == MAS3507D */ + +#define VOLUME_MIN -780 +#define VOLUME_MAX 180 + static const unsigned int bass_table[] = { 0x9e400, /* -15dB */ diff --git a/firmware/sound.c b/firmware/sound.c index 35c869c4af..c6a2c5e330 100644 --- a/firmware/sound.c +++ b/firmware/sound.c @@ -35,12 +35,8 @@ #endif #endif -#if CONFIG_CODEC == MAS3507D /* volume/balance/treble/bass interdependency */ -#define VOLUME_MIN -780 -#define VOLUME_MAX 180 -#elif !defined(VOLUME_MIN) && !defined(VOLUME_MAX) -#define VOLUME_MIN -400 -#define VOLUME_MAX 600 +#if !defined(VOLUME_MIN) && !defined(VOLUME_MAX) +#error define for VOLUME_MIN and VOLUME_MAX is missing #endif /* volume/balance/treble/bass interdependency main part */ |