summary refs log tree commit diff
path: root/include/sound/ac97_codec.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-04-13 14:32:57 +0200
committerJaroslav Kysela <perex@suse.cz>2005-05-29 10:00:48 +0200
commiteb8caf30f4c059ddfdfa32b6034549622953db6f (patch)
tree994ff6f1a8b19fb8914af3eae6035fd32b834c0f /include/sound/ac97_codec.h
parent267cdf4036ed9e8565a7d909fdf854b9c7e1c5ff (diff)
downloadlinux-eb8caf30f4c059ddfdfa32b6034549622953db6f.tar.gz
[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: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound/ac97_codec.h')
-rw-r--r--include/sound/ac97_codec.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index 2433e279e071..996eeab683b0 100644
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -437,6 +437,7 @@ struct snd_ac97_build_ops {
 	void (*suspend) (ac97_t *ac97);
 	void (*resume) (ac97_t *ac97);
 #endif
+	void (*update_jacks) (ac97_t *ac97);	/* for jack-sharing */
 };
 
 struct _snd_ac97_bus_ops {
@@ -516,6 +517,9 @@ struct _snd_ac97 {
 		} ad18xx;
 		unsigned int dev_flags;		/* device specific */
 	} spec;
+	/* jack-sharing info */
+	unsigned char indep_surround;
+	unsigned char channel_mode;
 };
 
 /* conditions */