[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rockbox-cvs
Subject:    nls: r19602 - trunk/firmware/drivers/audio
From:       mailer () svn ! rockbox ! org
Date:       2008-12-27 22:56:30
Message-ID: 200812272256.mBRMuU73018925 () giant ! haxx ! se
[Download RAW message or body]

Date: 2008-12-27 23:56:29 +0100 (Sat, 27 Dec 2008)
New Revision: 19602

Log Message:
Gigabeat S, use saner input volume on the line in used for fm to have fm volume at \
similar volume as playback. Add a few comments.

Modified:
   trunk/firmware/drivers/audio/wm8978.c

Modified: trunk/firmware/drivers/audio/wm8978.c
===================================================================
--- trunk/firmware/drivers/audio/wm8978.c	2008-12-27 20:56:54 UTC (rev 19601)
+++ trunk/firmware/drivers/audio/wm8978.c	2008-12-27 22:56:29 UTC (rev 19602)
@@ -227,12 +227,15 @@
     wmc_write(WMC_DAC_CONTROL, WMC_DACOSR_128 | WMC_AMUTE);
 
     wmc_set(WMC_INPUT_CTRL, WMC_R2_2INPPGA | WMC_L2_2INPPGA);
-    wmc_set(WMC_LEFT_INP_PGA_GAIN_CTRL, 0x3f);
-    wmc_set(WMC_RIGHT_INP_PGA_GAIN_CTRL, 0x3f);
-    wmc_set(WMC_LEFT_INP_PGA_GAIN_CTRL, 1<<8);
-    wmc_set(WMC_RIGHT_INP_PGA_GAIN_CTRL, 1<<8);
-    wmc_set(WMC_LEFT_ADC_BOOST_CTRL, (7<<3));
-    wmc_set(WMC_RIGHT_ADC_BOOST_CTRL, (7<<3));
+    /* set PGA volumes to 0dB and enable zero cross */
+    wmc_set(WMC_LEFT_INP_PGA_GAIN_CTRL, 0x10 | 1 << 7);
+    wmc_set(WMC_RIGHT_INP_PGA_GAIN_CTRL, 0x10 | 1 << 7);
+    /* write to  INPPGAUPDATE to actually change voulme */
+    wmc_set(WMC_LEFT_INP_PGA_GAIN_CTRL, 1 << 8);
+    wmc_set(WMC_RIGHT_INP_PGA_GAIN_CTRL, 1 << 8);
+    /* set boost gain to 0dB */
+    wmc_set(WMC_LEFT_ADC_BOOST_CTRL, (5 << 4));
+    wmc_set(WMC_RIGHT_ADC_BOOST_CTRL, (5 << 4));
 
     /* Specific to HW clocking */
     wmc_write_masked(WMC_CLOCK_GEN_CTRL, WMC_BCLKDIV_4 | WMC_MS,

_______________________________________________
rockbox-cvs mailing list
rockbox-cvs@cool.haxx.se
http://cool.haxx.se/cgi-bin/mailman/listinfo/rockbox-cvs


[prev in list] [next in list] [prev in thread] [next in thread]