Fix minor mistake in tone control code: UDA1341 was added to the wrong part of the conditional (it has hw bass/treble but not prescaling, like the other wm codecs listed) and TSC2100 has no hw tone controls at all so is already covered by HAVE_SW_TONE_CONTROLS.

Comment has been clarified to make this less likely to happen again :)

Net effect: tone controls should no longer adjust the overall perceived volume in a weird way on mini2440.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25640 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 7 insertions, 4 deletions

diff --git a/firmware/sound.c b/firmware/sound.c
index d66a93a70d..ca8b79e4d9 100644
--- a/firmware/sound.c
+++ b/firmware/sound.c
@@ -200,12 +200,15 @@ static void set_prescaled_volume(void)
     int prescale = 0;
     int l, r;
 
-/* The WM codecs listed don't have suitable prescaler functionality, so we let
- * the prescaler stay at 0 for these unless SW tone controls are in use */
+/* The codecs listed use HW tone controls but don't have suitable prescaler
+ * functionality, so we let the prescaler stay at 0 for these, unless
+ * SW tone controls are in use. This is to avoid needing the SW DSP just for
+ * the prescaling.
+ */
 #if defined(HAVE_SW_TONE_CONTROLS) || !(defined(HAVE_WM8975) \
     || defined(HAVE_WM8711) || defined(HAVE_WM8721) || defined(HAVE_WM8731) \
-    || defined(HAVE_WM8751) || defined(HAVE_WM8758) || defined(HAVE_WM8985)) \
-    || defined(HAVE_TSC2100) || defined(HAVE_UDA1341)
+    || defined(HAVE_WM8751) || defined(HAVE_WM8758) || defined(HAVE_WM8985) \
+    || defined(HAVE_UDA1341))
 
     prescale = MAX(current_bass, current_treble);
     if (prescale < 0)