summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-02-17 18:39:38 +0100
committerTakashi Iwai <tiwai@suse.de>2011-02-17 18:39:38 +0100
commit274555b4cb15946544f1ec9a1e9cc63efa9f4e87 (patch)
treea8174fc78ef001be322c120ec7d5560cdba56ed7 /include/sound
parent3d90a77e4f26908d95cca2f5a65b7a9a4bc54182 (diff)
parent03c2d87a2112a6548aa3f9635e76d3611c3df53c (diff)
Merge branch 'topic/misc' into for-next
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/ac97_codec.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index b602f475cdbb..f1dcefe4532b 100644
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -96,6 +96,10 @@
#define AC97_FUNC_INFO 0x68 /* Function Information */
#define AC97_SENSE_INFO 0x6a /* Sense Details */
+/* volume controls */
+#define AC97_MUTE_MASK_MONO 0x8000
+#define AC97_MUTE_MASK_STEREO 0x8080
+
/* slot allocation */
#define AC97_SLOT_TAG 0
#define AC97_SLOT_CMD_ADDR 1
@@ -138,6 +142,7 @@
#define AC97_BC_18BIT_ADC 0x0100 /* 18-bit ADC resolution */
#define AC97_BC_20BIT_ADC 0x0200 /* 20-bit ADC resolution */
#define AC97_BC_ADC_MASK 0x0300
+#define AC97_BC_3D_TECH_ID_MASK 0x7c00 /* Per-vendor ID of 3D enhancement */
/* general purpose */
#define AC97_GP_DRSS_MASK 0x0c00 /* double rate slot select */