[ALSA] oxygen: make line-in exclusive only on Xonar

Move the line input switching code to the Virtuoso driver because only
the Xonar cards bypass the analog mixer for line input.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/sound/pci/oxygen/oxygen.h b/sound/pci/oxygen/oxygen.h
index 9ec9e6bab7d749bd0fabea0503dcd278662a0446..8fc9e7ca11823cff16e3e1c06dd88c494f58ff66 100644 (file)
--- a/sound/pci/oxygen/oxygen.h
+++ b/sound/pci/oxygen/oxygen.h
@@ -84,6 +84,8 @@ struct oxygen_model {
                               struct snd_pcm_hw_params *params);
        void (*update_dac_volume)(struct oxygen *chip);
        void (*update_dac_mute)(struct oxygen *chip);
+       void (*ac97_switch_hook)(struct oxygen *chip,
+                                unsigned int reg, int mute);
        size_t model_data_size;
        u8 dac_channels;
        u8 used_channels;

diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c
index 06394e4409b33d4e8922ddde0fac0d163e651cdd..d98867c1f2d4ab76d2f2bbe18fea4ac6e192d793 100644 (file)
--- a/sound/pci/oxygen/oxygen_lib.c
+++ b/sound/pci/oxygen/oxygen_lib.c
@@ -337,8 +337,6 @@ static void __devinit oxygen_init(struct oxygen *chip)
                oxygen_write_ac97(chip, 0, AC97_REC_GAIN, 0x8000);
                oxygen_write_ac97(chip, 0, AC97_CENTER_LFE_MASTER, 0x8080);
                oxygen_write_ac97(chip, 0, AC97_SURROUND_MASTER, 0x8080);
-               oxygen_ac97_clear_bits(chip, 0,
-                                      CM9780_GPIO_STATUS, CM9780_GPO0);
                /* power down unused ADCs and DACs */
                oxygen_ac97_set_bits(chip, 0, AC97_POWERDOWN,
                                     AC97_PD_PR0 | AC97_PD_PR1);

diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c
index fe53318e94e03c5df5624b610759eb6fb28ffa70..cf34b1229b0bfbe0f5739ee34abb5cfffd518687 100644 (file)
--- a/sound/pci/oxygen/oxygen_mixer.c
+++ b/sound/pci/oxygen/oxygen_mixer.c
@@ -465,19 +465,6 @@ static int ac97_switch_get(struct snd_kcontrol *ctl,
        return 0;
 }
 
-static void ac97_mute_ctl(struct oxygen *chip, unsigned int control)
-{
-       unsigned int index = chip->controls[control]->private_value & 0xff;
-       u16 value;
-
-       value = oxygen_read_ac97(chip, 0, index);
-       if (!(value & 0x8000)) {
-               oxygen_write_ac97(chip, 0, index, value | 0x8000);
-               snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
-                              &chip->controls[control]->id);
-       }
-}
-
 static int ac97_switch_put(struct snd_kcontrol *ctl,
                           struct snd_ctl_elem_value *value)
 {
@@ -498,22 +485,9 @@ static int ac97_switch_put(struct snd_kcontrol *ctl,
        change = newreg != oldreg;
        if (change) {
                oxygen_write_ac97(chip, 0, index, newreg);
-               if (index == AC97_LINE) {
-                       oxygen_write_ac97_masked(chip, 0, CM9780_GPIO_STATUS,
-                                                newreg & 0x8000 ?
-                                                CM9780_GPO0 : 0, CM9780_GPO0);
-                       if (!(newreg & 0x8000)) {
-                               ac97_mute_ctl(chip, CONTROL_MIC_CAPTURE_SWITCH);
-                               ac97_mute_ctl(chip, CONTROL_CD_CAPTURE_SWITCH);
-                               ac97_mute_ctl(chip, CONTROL_AUX_CAPTURE_SWITCH);
-                       }
-               } else if ((index == AC97_MIC || index == AC97_CD ||
-                           index == AC97_VIDEO || index == AC97_AUX) &&
-                          bitnr == 15 && !(newreg & 0x8000)) {
-                       ac97_mute_ctl(chip, CONTROL_LINE_CAPTURE_SWITCH);
-                       oxygen_write_ac97_masked(chip, 0, CM9780_GPIO_STATUS,
-                                                CM9780_GPO0, CM9780_GPO0);
-               }
+               if (bitnr == 15 && chip->model->ac97_switch_hook)
+                       chip->model->ac97_switch_hook(chip, index,
+                                                     newreg & 0x8000);
        }
        mutex_unlock(&chip->mutex);
        return change;
@@ -671,6 +645,7 @@ static const struct snd_kcontrol_new ac97_controls[] = {
        AC97_VOLUME("Mic Capture Volume", AC97_MIC),
        AC97_SWITCH("Mic Capture Switch", AC97_MIC, 15, 1),
        AC97_SWITCH("Mic Boost (+20dB)", AC97_MIC, 6, 0),
+       AC97_VOLUME("Line Capture Volume", AC97_LINE),
        AC97_SWITCH("Line Capture Switch", AC97_LINE, 15, 1),
        AC97_VOLUME("CD Capture Volume", AC97_CD),
        AC97_SWITCH("CD Capture Switch", AC97_CD, 15, 1),

diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c
index 665115d236276725fee42a418095691a4f3931c5..23bfab448844608d55f48c3c4a656d863158256c 100644 (file)
--- a/sound/pci/oxygen/virtuoso.c
+++ b/sound/pci/oxygen/virtuoso.c
@@ -80,6 +80,8 @@ MODULE_DEVICE_TABLE(pci, xonar_ids);
 #define GPIO_ALT               0x0080
 #define GPIO_OUTPUT_ENABLE     0x0100
 
+#define GPIO_LINE_MUTE         CM9780_GPO0
+
 /* register 16 */
 #define PCM1796_ATL_MASK       0xff
 /* register 17 */
@@ -168,6 +170,7 @@ static void xonar_init(struct oxygen *chip)
                              GPIO_CS5381_M_SINGLE,
                              GPIO_CS5381_M_MASK | GPIO_ALT);
        oxygen_ac97_set_bits(chip, 0, CM9780_JACK, CM9780_FMIC2MIC);
+       oxygen_ac97_clear_bits(chip, 0, CM9780_GPIO_STATUS, GPIO_LINE_MUTE);
        msleep(300);
        oxygen_set_bits16(chip, OXYGEN_GPIO_CONTROL, GPIO_OUTPUT_ENABLE);
        oxygen_set_bits16(chip, OXYGEN_GPIO_DATA, GPIO_OUTPUT_ENABLE);
@@ -231,6 +234,47 @@ static void set_cs5381_params(struct oxygen *chip,
                              value, GPIO_CS5381_M_MASK);
 }
 
+static void mute_ac97_ctl(struct oxygen *chip, unsigned int control)
+{
+       unsigned int index = chip->controls[control]->private_value & 0xff;
+       u16 value;
+
+       value = oxygen_read_ac97(chip, 0, index);
+       if (!(value & 0x8000)) {
+               oxygen_write_ac97(chip, 0, index, value | 0x8000);
+               snd_ctl_notify(chip->card, SNDRV_CTL_EVENT_MASK_VALUE,
+                              &chip->controls[control]->id);
+       }
+}
+
+static void xonar_ac97_switch_hook(struct oxygen *chip,
+                                  unsigned int reg, int mute)
+{
+       /* line-in is exclusive */
+       switch (reg) {
+       case AC97_LINE:
+               oxygen_write_ac97_masked(chip, 0, CM9780_GPIO_STATUS,
+                                        mute ? GPIO_LINE_MUTE : 0,
+                                        GPIO_LINE_MUTE);
+               if (!mute) {
+                       mute_ac97_ctl(chip, CONTROL_MIC_CAPTURE_SWITCH);
+                       mute_ac97_ctl(chip, CONTROL_CD_CAPTURE_SWITCH);
+                       mute_ac97_ctl(chip, CONTROL_AUX_CAPTURE_SWITCH);
+               }
+               break;
+       case AC97_MIC:
+       case AC97_CD:
+       case AC97_VIDEO:
+       case AC97_AUX:
+               if (!mute) {
+                       oxygen_ac97_set_bits(chip, 0, CM9780_GPIO_STATUS,
+                                            GPIO_LINE_MUTE);
+                       mute_ac97_ctl(chip, CONTROL_LINE_CAPTURE_SWITCH);
+               }
+               break;
+       }
+}
+
 static int pcm1796_volume_info(struct snd_kcontrol *ctl,
                               struct snd_ctl_elem_info *info)
 {
@@ -288,7 +332,10 @@ static int xonar_control_filter(struct snd_kcontrol_new *template)
                template->info = pcm1796_volume_info,
                template->tlv.p = pcm1796_db_scale;
        } else if (!strncmp(template->name, "CD Capture ", 11)) {
+               /* CD in is actually connected to the video in pin */
                template->private_value ^= AC97_CD ^ AC97_VIDEO;
+       } else if (!strcmp(template->name, "Line Capture Volume")) {
+               return 1; /* line-in bypasses the AC'97 mixer */
        }
        return 0;
 }
@@ -310,6 +357,7 @@ static const struct oxygen_model model_xonar = {
        .set_adc_params = set_cs5381_params,
        .update_dac_volume = update_pcm1796_volume,
        .update_dac_mute = update_pcm1796_mute,
+       .ac97_switch_hook = xonar_ac97_switch_hook,
        .dac_channels = 8,
        .used_channels = OXYGEN_CHANNEL_B |
                         OXYGEN_CHANNEL_C |