3 files changed, 184 insertions, 26 deletions

diff --git a/firmware/drivers/wm8731l.c b/firmware/drivers/wm8731l.c
index a690aade48..4f0f249149 100644
--- a/firmware/drivers/wm8731l.c
+++ b/firmware/drivers/wm8731l.c
@@ -220,12 +220,73 @@ void audiohw_set_sample_rate(int sampling_control)
 
 void audiohw_enable_recording(bool source_mic)
 {
-    (void)source_mic;
+    static int line_level = 0x17;
+    static int mic_boost = true;
+    codec_set_active(0x0);
+    
+    /* set BCLKINV=0(Dont invert BCLK) MS=1(Enable Master) LRSWAP=0
+     * LRP=0 IWL=00(16 bit) FORMAT=10(I2S format) */
+    wmcodec_write(AINTFCE, 0x42);
+    
+    wmcodec_write(LOUTVOL, 0x0);   /* headphone mute left */
+    wmcodec_write(ROUTVOL, 0x0);   /* headphone mute right */
+
+    
+    if(source_mic){
+        wmcodec_write(LINVOL, 0x80);  /* line in mute left */
+        wmcodec_write(RINVOL, 0x80);  /* line in mute right */
+
+
+        if (mic_boost) {
+            wmcodec_write(AAPCTRL, 0x5);   /* INSEL=mic, MIC_BOOST=enable */
+        } else {
+            wmcodec_write(AAPCTRL, 0x4);   /* INSEL=mic */
+        }
+    } else {
+        if (line_level == 0) {
+            wmcodec_write(LINVOL, 0x80);
+            wmcodec_write(RINVOL, 0x80);
+        } else {
+            wmcodec_write(LINVOL, line_level);
+            wmcodec_write(RINVOL, line_level);
+        }
+        wmcodec_write(AAPCTRL, 0xa);   /* BY PASS, mute mic, INSEL=line in */
+    }
+    
+    /* disable ADC high pass filter, mute dac */
+    wmcodec_write(DACCTRL, 0x9);
+    
+    /* power on (PWR_OFF=0) */
+    if(source_mic){
+        /* CLKOUTPD OSCPD OUTPD DACPD LINEINPD */
+        wmcodec_write(PWRMGMT, 0x79);
+    } else {
+        wmcodec_write(PWRMGMT, 0x7a);  /* MICPD */
+    }
+    
+    codec_set_active(0x1);
 }
 
 void audiohw_disable_recording(void)
 {
-
+    /* set DACMU=1 DEEMPH=0 */
+    wmcodec_write(DACCTRL, 0x8);
+    
+    /* ACTIVE=0 */
+    codec_set_active(0x0);
+    
+    /* line in mute left & right*/
+    wmcodec_write(LINVOL, 0x80);
+    wmcodec_write(RINVOL, 0x80);
+    
+    /* set DACSEL=0, MUTEMIC=1 */
+    wmcodec_write(AAPCTRL, 0x2);
+    
+    /* set POWEROFF=0 OUTPD=0 DACPD=1 */
+    wmcodec_write(PWRMGMT, 0x6f);
+    
+    /* set POWEROFF=1 OUTPD=1 DACPD=1 */
+    wmcodec_write(PWRMGMT, 0xff);
 }
 
 void audiohw_set_recvol(int left, int right, int type)
diff --git a/firmware/drivers/wm8758.c b/firmware/drivers/wm8758.c
index 22bef73e45..9732d4f776 100644
--- a/firmware/drivers/wm8758.c
+++ b/firmware/drivers/wm8758.c
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  * $Id$
  *
- * Driver for WM8758 audio codec
+ * Driver for WM8758 audio codec - based on datasheet for WM8983
  *
  * Based on code from the ipodlinux project - http://ipodlinux.org/
  * Adapted for Rockbox in December 2005
@@ -142,30 +142,11 @@ int audiohw_set_mixer_vol(int channel1, int channel2)
 void audiohw_set_bass(int value)
 {
     (void)value;
-#if 0
-    /* Not yet implemented - this is the wm8975 code*/
-    int regvalues[]={11, 10, 10,  9,  8,  8, 0xf , 6, 6, 5, 4, 4, 3, 2, 1, 0};
-
-    if ((value >= -6) && (value <= 9)) {
-        /* We use linear bass control with 130Hz cutoff */
-        wmcodec_write(BASSCTRL, regvalues[value+6]);
-    }
-#endif
 }
 
 void audiohw_set_treble(int value)
 {
     (void)value;
-#if 0
-    /* Not yet implemented - this is the wm8975 code*/
-    int regvalues[]={11, 10, 10,  9,  8,  8, 0xf , 6, 6, 5, 4, 4, 3, 2, 1, 0};
-
-    if ((value >= -6) && (value <= 9)) {
-        /* We use a 8Khz cutoff */
-        wmcodec_write(TREBCTRL, regvalues[value+6]);
-    }
-#endif
-
 }
 
 int audiohw_mute(int mute)
@@ -224,11 +205,60 @@ void audiohw_set_sample_rate(int sampling_control)
 
 void audiohw_enable_recording(bool source_mic)
 {
-    (void)source_mic;
+    (void)source_mic; /* We only have a line-in (I think) */
+ 
+    /* reset the I2S controller into known state */
+    i2s_reset();
+ 
+    wmcodec_write(RESET, 0x1ff);    /*Reset*/
+    
+    wmcodec_write(PWRMGMT1, 0x2b);
+    wmcodec_write(PWRMGMT2, 0x18f);  /* Enable ADC - 0x0c enables left/right PGA input, and 0x03 turns on power to the ADCs */
+    wmcodec_write(PWRMGMT3, 0x6f);
+
+    wmcodec_write(AINTFCE, 0x10);
+    wmcodec_write(CLKCTRL, 0x49);
+
+    wmcodec_write(OUTCTRL, 1);
+
+    /* The iPod can handle multiple frequencies, but fix at 44.1KHz
+       for now */
+    wmcodec_set_sample_rate(WM8758_44100HZ);
+
+    wmcodec_write(INCTRL,0x44);  /* Connect L2 and R2 inputs */
+
+    /* Set L2/R2_2BOOSTVOL to 0db (bits 4-6) */
+    /* 000 = disabled
+       001 = -12dB
+       010 = -9dB
+       011 = -6dB
+       100 = -3dB
+       101 = 0dB
+       110 = 3dB
+       111 = 6dB
+    */
+    wmcodec_write(LADCBOOST,0x50);
+    wmcodec_write(RADCBOOST,0x50);
+
+    /* Set L/R input PGA Volume to 0db */
+    //    wm8758_write(LINPGAVOL,0x3f);
+    //    wm8758_write(RINPGAVOL,0x13f);
+
+    /* Enable monitoring */
+    wmcodec_write(LOUTMIX,0x17); /* Enable output mixer - BYPL2LMIX @ 0db*/
+    wmcodec_write(ROUTMIX,0x17); /* Enable output mixer - BYPR2RMIX @ 0db*/
+
+    wmcodec_mute(0);
 }
 
 void audiohw_disable_recording(void) {
+    wmcodec_mute(1);
+
+    wmcodec_write(PWRMGMT3, 0x0);
 
+    wmcodec_write(PWRMGMT1, 0x0);
+ 
+    wmcodec_write(PWRMGMT2, 0x40);
 }
 
 void audiohw_set_recvol(int left, int right, int type) {
diff --git a/firmware/drivers/wm8975.c b/firmware/drivers/wm8975.c
index d2b1fa64b2..011d771a13 100644
--- a/firmware/drivers/wm8975.c
+++ b/firmware/drivers/wm8975.c
@@ -224,13 +224,80 @@ void audiohw_set_sample_rate(int sampling_control) {
 
 }
 
-void audiohw_enable_recording(bool source_mic) {
+void audiohw_enable_recording(bool source_mic)
+{
+     (void)source_mic;
 
-    (void)source_mic;
-}
+    /* reset the I2S controller into known state */
+    i2s_reset();
+
+    /*
+     * 1. Switch on power supplies.
+     *    By default the WM8750L is in Standby Mode, the DAC is
+     *    digitally muted and the Audio Interface, Line outputs
+     *    and Headphone outputs are all OFF (DACMU = 1 Power
+     *    Management registers 1 and 2 are all zeros).
+     */
+    wmcodec_write(0x0f, 0x1ff);
+    wmcodec_write(0x0f, 0x000);
+
+     /* 2. Enable Vmid and VREF. */
+    wmcodec_write(0x19, 0xc0);               /*Pwr Mgmt(1)*/
+
+     /* 3. Enable ADCs as required. */
+    wmcodec_write(0x19, 0xcc);               /*Pwr Mgmt(1)*/
+    wmcodec_write(0x1a, 0x180);              /*Pwr Mgmt(2)*/
+
+     /* 4. Enable line and / or headphone output buffers as required. */
+    wmcodec_write(0x19, 0xfc);               /*Pwr Mgmt(1)*/
+
+    /* BCLKINV=0(Dont invert BCLK) MS=1(Enable Master) LRSWAP=0 LRP=0 */
+    /* IWL=00(16 bit) FORMAT=10(I2S format) */
+    wmcodec_write(0x07, 0x42);
+
+    /* The iPod can handle multiple frequencies, but fix at 44.1KHz for now */
+    wmcodec_set_sample_rate(WM8975_44100HZ);
+
+    /* unmute inputs */
+    wmcodec_write(0x00, 0x17);               /* LINVOL (def 0dB) */
+    wmcodec_write(0x01, 0x117);              /* RINVOL (def 0dB) */
+
+    wmcodec_write(0x15, 0x1d7);                /* LADCVOL max vol x was ff */
+    wmcodec_write(0x16, 0x1d7);                /* RADCVOL max vol x was ff */
+
+    if (source_mic) {
+        /* VSEL=10(def) DATSEL=10 (use right ADC only) */
+        wmcodec_write(0x17, 0xc8);                 /* Additional control(1) */
 
+        /* VROI=1 (sets output resistance to 40kohms) */
+        wmcodec_write(0x1b, 0x40);                 /* Additional control(3) */
+
+        /* LINSEL=1 (LINPUT2) LMICBOOST=10 (20dB boost) */
+        wmcodec_write(0x20, 0x60);               /* ADCL signal path */
+        wmcodec_write(0x21, 0x60);               /* ADCR signal path */
+    } else {
+        /* VSEL=10(def) DATSEL=00 (left->left, right->right) */
+        wmcodec_write(0x17, 0xc0);                 /* Additional control(1) */
+
+        /* VROI=1 (sets output resistance to 40kohms) */
+        wmcodec_write(0x1b, 0x40);                 /* Additional control(3) */
+
+        /* LINSEL=0 (LINPUT1) LMICBOOST=00 (bypass boost) */
+        wmcodec_write(0x20, 0x00);               /* ADCL signal path */
+        /* RINSEL=0 (RINPUT1) RMICBOOST=00 (bypass boost) */
+        wmcodec_write(0x21, 0x00);               /* ADCR signal path */
+    }
+}
+ 
 void audiohw_disable_recording(void) {
+    /* 1. Set DACMU = 1 to soft-mute the audio DACs. */
+    wmcodec_write(0x05, 0x8);
 
+    /* 2. Disable all output buffers. */
+    wmcodec_write(0x1a, 0x0);        /*Pwr Mgmt(2)*/
+
+    /* 3. Switch off the power supplies. */
+    wmcodec_write(0x19, 0x0);        /*Pwr Mgmt(1)*/
 }
 
 void audiohw_set_recvol(int left, int right, int type) {