diff options
| author | Liam Girdwood <liam.r.girdwood@linux.intel.com> | 2015-05-29 19:06:15 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-04 09:40:03 +0100 |
| commit | 932ae8809469770a07ce19d6967d2ce303befa08 (patch) | |
| tree | 78e7eea9be478698732589de449489f82c18f48f /include/sound/tlv.h | |
| parent | 8a9782346dccd82cf912552735bda619de4efd8c (diff) | |
| download | linux-stable-932ae8809469770a07ce19d6967d2ce303befa08.tar.gz linux-stable-932ae8809469770a07ce19d6967d2ce303befa08.tar.bz2 linux-stable-932ae8809469770a07ce19d6967d2ce303befa08.zip | |
ALSA: topology: Export ID types for TLV controls.
Make sure userspace can define TLV controls for topology using the correct
type numbers and channel mappings.
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Acked-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/sound/tlv.h')
| -rw-r--r-- | include/sound/tlv.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/include/sound/tlv.h b/include/sound/tlv.h index e11e179420a1..df97d1966468 100644 --- a/include/sound/tlv.h +++ b/include/sound/tlv.h @@ -31,12 +31,7 @@ * ~(sizeof(unsigned int) - 1)) .... */ -#define SNDRV_CTL_TLVT_CONTAINER 0 /* one level down - group of TLVs */ -#define SNDRV_CTL_TLVT_DB_SCALE 1 /* dB scale */ -#define SNDRV_CTL_TLVT_DB_LINEAR 2 /* linear volume */ -#define SNDRV_CTL_TLVT_DB_RANGE 3 /* dB range container */ -#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 */ +#include <uapi/sound/tlv.h> #define TLV_ITEM(type, ...) \ (type), TLV_LENGTH(__VA_ARGS__), __VA_ARGS__ @@ -90,12 +85,4 @@ #define TLV_DB_GAIN_MUTE -9999999 -/* - * channel-mapping TLV items - * TLV length must match with num_channels - */ -#define SNDRV_CTL_TLVT_CHMAP_FIXED 0x101 /* fixed channel position */ -#define SNDRV_CTL_TLVT_CHMAP_VAR 0x102 /* channels freely swappable */ -#define SNDRV_CTL_TLVT_CHMAP_PAIRED 0x103 /* pair-wise swappable */ - #endif /* __SOUND_TLV_H */ |