Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ALSA: tlv - Define numbers in sound/tlv.h

Signed-off-by: Takashi Iwai <tiwai@suse.de>

+4 -2
+3 -1
include/sound/tlv.h
··· 38 38 #define SNDRV_CTL_TLVT_DB_MINMAX 4 /* dB scale with min/max */ 39 39 #define SNDRV_CTL_TLVT_DB_MINMAX_MUTE 5 /* dB scale with min/max with mute */ 40 40 41 + #define TLV_DB_SCALE_MASK 0xffff 42 + #define TLV_DB_SCALE_MUTE 0x10000 41 43 #define TLV_DB_SCALE_ITEM(min, step, mute) \ 42 44 SNDRV_CTL_TLVT_DB_SCALE, 2 * sizeof(unsigned int), \ 43 - (min), ((step) & 0xffff) | ((mute) ? 0x10000 : 0) 45 + (min), ((step) & TLV_DB_SCALE_MASK) | ((mute) ? TLV_DB_SCALE_MUTE : 0) 44 46 #define DECLARE_TLV_DB_SCALE(name, min, step, mute) \ 45 47 unsigned int name[] = { TLV_DB_SCALE_ITEM(min, step, mute) } 46 48
+1 -1
sound/pci/hda/hda_codec.c
··· 1843 1843 val1 += ofs; 1844 1844 val1 = ((int)val1) * ((int)val2); 1845 1845 if (min_mute) 1846 - val2 |= 0x10000; 1846 + val2 |= TLV_DB_SCALE_MUTE; 1847 1847 if (put_user(SNDRV_CTL_TLVT_DB_SCALE, _tlv)) 1848 1848 return -EFAULT; 1849 1849 if (put_user(2 * sizeof(unsigned int), _tlv + 1))