diff options
author | Marcoen Hirschberg <marcoen@gmail.com> | 2007-04-12 09:08:49 +0000 |
---|---|---|
committer | Marcoen Hirschberg <marcoen@gmail.com> | 2007-04-12 09:08:49 +0000 |
commit | 9291ae50caa0aa36dced30cddc3bac2af786a81a (patch) | |
tree | c772b9eee7c260b8eed6ce94598e0b63ceb22576 | |
parent | 91ea874c714d1fc98a13233327a86ad715fe74aa (diff) | |
download | rockbox-9291ae50caa0aa36dced30cddc3bac2af786a81a.tar.gz rockbox-9291ae50caa0aa36dced30cddc3bac2af786a81a.zip |
simplify UDA1380 bass and treble code
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13122 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/export/uda1380.h | 8 | ||||
-rw-r--r-- | firmware/sound.c | 12 |
2 files changed, 6 insertions, 14 deletions
diff --git a/firmware/export/uda1380.h b/firmware/export/uda1380.h index f9c73d0471..c1fb6421ff 100644 --- a/firmware/export/uda1380.h +++ b/firmware/export/uda1380.h | |||
@@ -133,10 +133,10 @@ extern void audiohw_set_monitor(int enable); | |||
133 | #define EQ_MODE_FLAT (0 << 14) | 133 | #define EQ_MODE_FLAT (0 << 14) |
134 | #define EQ_MODE_MIN (1 << 14) | 134 | #define EQ_MODE_MIN (1 << 14) |
135 | #define EQ_MODE_MAX (3 << 14) | 135 | #define EQ_MODE_MAX (3 << 14) |
136 | #define BASSL(x) (((x) & 0xF) << 8) | 136 | #define BASSL(x) (((x) & 0x1E) << 7) |
137 | #define BASSR(x) (((x) & 0xF) << 0) | 137 | #define BASSR(x) (((x) & 0x1E) >> 1) |
138 | #define TREBLEL(x) (((x) & 0x3) << 12) | 138 | #define TREBLEL(x) (((x) & 0x6) << 11) |
139 | #define TREBLER(x) (((x) & 0x3) << 4) | 139 | #define TREBLER(x) (((x) & 0x6) << 3) |
140 | #define BASS_MASK 0x0F0F | 140 | #define BASS_MASK 0x0F0F |
141 | #define TREBLE_MASK 0x3030 | 141 | #define TREBLE_MASK 0x3030 |
142 | 142 | ||
diff --git a/firmware/sound.c b/firmware/sound.c index 27b9fa1670..cb83927439 100644 --- a/firmware/sound.c +++ b/firmware/sound.c | |||
@@ -514,11 +514,7 @@ void sound_set_bass(int value) | |||
514 | mas_writereg(MAS_REG_KBASS, bass_table[value+15]); | 514 | mas_writereg(MAS_REG_KBASS, bass_table[value+15]); |
515 | current_bass = value * 10; | 515 | current_bass = value * 10; |
516 | set_prescaled_volume(); | 516 | set_prescaled_volume(); |
517 | #elif defined(HAVE_UDA1380) | 517 | #elif defined HAVE_WM8975 || defined HAVE_WM8758 || defined(HAVE_UDA1380) \ |
518 | audiohw_set_bass(value >> 1); | ||
519 | current_bass = value * 10; | ||
520 | set_prescaled_volume(); | ||
521 | #elif defined HAVE_WM8975 || defined HAVE_WM8758 \ | ||
522 | || defined HAVE_WM8731 || defined(HAVE_WM8721) || defined(HAVE_WM8751) | 518 | || defined HAVE_WM8731 || defined(HAVE_WM8721) || defined(HAVE_WM8751) |
523 | current_bass = value * 10; | 519 | current_bass = value * 10; |
524 | audiohw_set_bass(value); | 520 | audiohw_set_bass(value); |
@@ -544,11 +540,7 @@ void sound_set_treble(int value) | |||
544 | mas_writereg(MAS_REG_KTREBLE, treble_table[value+15]); | 540 | mas_writereg(MAS_REG_KTREBLE, treble_table[value+15]); |
545 | current_treble = value * 10; | 541 | current_treble = value * 10; |
546 | set_prescaled_volume(); | 542 | set_prescaled_volume(); |
547 | #elif defined(HAVE_UDA1380) | 543 | #elif defined(HAVE_WM8975) || defined(HAVE_WM8758) || defined(HAVE_UDA1380) \ |
548 | audiohw_set_treble(value >> 1); | ||
549 | current_treble = value * 10; | ||
550 | set_prescaled_volume(); | ||
551 | #elif defined(HAVE_WM8975) || defined(HAVE_WM8758) \ | ||
552 | || defined(HAVE_WM8731) || defined(HAVE_WM8721) || defined(HAVE_WM8751) | 544 | || defined(HAVE_WM8731) || defined(HAVE_WM8721) || defined(HAVE_WM8751) |
553 | audiohw_set_treble(value); | 545 | audiohw_set_treble(value); |
554 | current_treble = value * 10; | 546 | current_treble = value * 10; |