diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2010-12-02 05:39:34 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-12-06 08:48:08 -0500 |
commit | e96f38f732d24515792296b3738842934c985539 (patch) | |
tree | 627b4c03b4f1b12e903a265f97ba98767af0c0aa /sound/pci/oxygen/oxygen.h | |
parent | 2509ec623d44320419d44d4060dbedf91b8d192d (diff) |
ALSA: virtuoso: fix front panel routing for D1/DX/ST(X)
The "Front Panel" switch on the Xonar D1/DX actually switches only the
output direction, so mark it appropriately.
The front panel microphone is controlled by the FMIC2MIC bit of the
CM9780. It was unconditionally enabled on the D1/DX and never set on
the ST(X); add a control for it. Selecting the front panel microphone
as source does not actually disable the microphone jack, but this is
bug-compatible with the Windows driver, and users rely on it.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen/oxygen.h')
-rw-r--r-- | sound/pci/oxygen/oxygen.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/pci/oxygen/oxygen.h b/sound/pci/oxygen/oxygen.h index 7d5222caa0a9..cf9054ecb97b 100644 --- a/sound/pci/oxygen/oxygen.h +++ b/sound/pci/oxygen/oxygen.h | |||
@@ -35,6 +35,7 @@ | |||
35 | #define MIDI_OUTPUT 0x0800 | 35 | #define MIDI_OUTPUT 0x0800 |
36 | #define MIDI_INPUT 0x1000 | 36 | #define MIDI_INPUT 0x1000 |
37 | #define AC97_CD_INPUT 0x2000 | 37 | #define AC97_CD_INPUT 0x2000 |
38 | #define AC97_FMIC_SWITCH 0x4000 | ||
38 | 39 | ||
39 | enum { | 40 | enum { |
40 | CONTROL_SPDIF_PCM, | 41 | CONTROL_SPDIF_PCM, |