diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-25 10:40:05 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-25 10:40:05 +0200 |
| commit | 506ecbca71d07fa327dd986be1682e90885678ee (patch) | |
| tree | eba675a57b0201c8f30436d08cab03c5dcd235ba /include/sound | |
| parent | aa5c14d5c0d3e4c587db4a1b220b9c86415c538f (diff) | |
| parent | 0e7adbe263f89ea2ef15b5af5e80a812b2a85025 (diff) | |
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/tlv.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/sound/tlv.h b/include/sound/tlv.h index 9fd5b19ccf5..7067e2dfb0b 100644 --- a/include/sound/tlv.h +++ b/include/sound/tlv.h @@ -38,9 +38,11 @@ #define SNDRV_CTL_TLVT_DB_MINMAX 4 /* dB scale with min/max */ #define SNDRV_CTL_TLVT_DB_MINMAX_MUTE 5 /* dB scale with min/max with mute */ +#define TLV_DB_SCALE_MASK 0xffff +#define TLV_DB_SCALE_MUTE 0x10000 #define TLV_DB_SCALE_ITEM(min, step, mute) \ SNDRV_CTL_TLVT_DB_SCALE, 2 * sizeof(unsigned int), \ - (min), ((step) & 0xffff) | ((mute) ? 0x10000 : 0) + (min), ((step) & TLV_DB_SCALE_MASK) | ((mute) ? TLV_DB_SCALE_MUTE : 0) #define DECLARE_TLV_DB_SCALE(name, min, step, mute) \ unsigned int name[] = { TLV_DB_SCALE_ITEM(min, step, mute) } |