Commit eb8caf30 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela

[ALSA] Improve the shared-jack handling on ac97

AC97 Codec
The handling of shared surround/clfe output jacks with line/mic-in
on some AC97 codecs is improved.

Instead of 'Line-In As Surround' or 'Mic As Center/LFE' switch, two
new enum controls are introduced: 'Channel Mode' and 'Surround Jack Mode'.
The formar changes the current output mode among 2, 4 and 6-channels.
The latter controls whether the jacks are shared or independent.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 267cdf40
...@@ -437,6 +437,7 @@ struct snd_ac97_build_ops { ...@@ -437,6 +437,7 @@ struct snd_ac97_build_ops {
void (*suspend) (ac97_t *ac97); void (*suspend) (ac97_t *ac97);
void (*resume) (ac97_t *ac97); void (*resume) (ac97_t *ac97);
#endif #endif
void (*update_jacks) (ac97_t *ac97); /* for jack-sharing */
}; };
struct _snd_ac97_bus_ops { struct _snd_ac97_bus_ops {
...@@ -516,6 +517,9 @@ struct _snd_ac97 { ...@@ -516,6 +517,9 @@ struct _snd_ac97 {
} ad18xx; } ad18xx;
unsigned int dev_flags; /* device specific */ unsigned int dev_flags; /* device specific */
} spec; } spec;
/* jack-sharing info */
unsigned char indep_surround;
unsigned char channel_mode;
}; };
/* conditions */ /* conditions */
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment