diff options
| author |   Clemens Ladisch <clemens@ladisch.de> | 2008-01-28 08:33:44 +0100 |
|---|---|---|
| committer |   Jaroslav Kysela <perex@perex.cz> | 2008-01-31 17:30:17 +0100 |
| commit | 911b499af45e879ccf4b8db234278a7136d056c9 (patch) | |
| tree | 8708445a77b89d5bd170044b7faf4c1514c8561f /sound/pci/oxygen/oxygen_mixer.c | |
| parent | [ALSA] oxygen: fix AK4396 double rate upper limit (diff) | |
| download | linux-dev-911b499af45e879ccf4b8db234278a7136d056c9.tar.xz linux-dev-911b499af45e879ccf4b8db234278a7136d056c9.zip | |
[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>
Diffstat (limited to 'sound/pci/oxygen/oxygen_mixer.c')
| -rw-r--r-- | sound/pci/oxygen/oxygen_mixer.c | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c index fe53318e94e0..cf34b1229b0b 100644 --- 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), |