History

Merge remote-tracking branches 'asoc/topic/tas5086', 'asoc/topic/tegra', 'asoc/topic/tlv320aic31xx', 'asoc/topic/tlv320dac33' and 'asoc/topic/topology' into asoc-next

Mark Brown committed 10 years ago

Commit 84b720f6 parents 5b56b9b e563751 c614a31 3520646 8891098 f918e1612 files · +585 −80Browse files

Showing the changes to include/uapi (1 of 12 files). Show all

Unified · Split

include/uapi/sound/asoc.h+33−2
@@ -83,7 +83,7 @@ · 82 unmodified lines
83#define SND_SOC_TPLG_NUM_TEXTS 1683#define SND_SOC_TPLG_NUM_TEXTS 16
84 84
85/* ABI version */85/* ABI version */
86#define SND_SOC_TPLG_ABI_VERSION 0x486#define SND_SOC_TPLG_ABI_VERSION 0x5
87 87
88/* Max size of TLV data */88/* Max size of TLV data */
89#define SND_SOC_TPLG_TLV_SIZE 3289#define SND_SOC_TPLG_TLV_SIZE 32
@@ -105,7 +105,8 @@ · 15 unmodified lines
105#define SND_SOC_TPLG_TYPE_CODEC_LINK 9105#define SND_SOC_TPLG_TYPE_CODEC_LINK 9
106#define SND_SOC_TPLG_TYPE_BACKEND_LINK 10106#define SND_SOC_TPLG_TYPE_BACKEND_LINK 10
107#define SND_SOC_TPLG_TYPE_PDATA 11107#define SND_SOC_TPLG_TYPE_PDATA 11
108#define SND_SOC_TPLG_TYPE_MAX SND_SOC_TPLG_TYPE_PDATA108#define SND_SOC_TPLG_TYPE_BE_DAI 12
109#define SND_SOC_TPLG_TYPE_MAX SND_SOC_TPLG_TYPE_BE_DAI
109 110
110/* vendor block IDs - please add new vendor types to end */111/* vendor block IDs - please add new vendor types to end */
111#define SND_SOC_TPLG_TYPE_VENDOR_FW 1000112#define SND_SOC_TPLG_TYPE_VENDOR_FW 1000
@@ -124,6 +125,11 @@ · 12 unmodified lines
124#define SND_SOC_TPLG_TUPLE_TYPE_WORD 4125#define SND_SOC_TPLG_TUPLE_TYPE_WORD 4
125#define SND_SOC_TPLG_TUPLE_TYPE_SHORT 5126#define SND_SOC_TPLG_TUPLE_TYPE_SHORT 5
126 127
128/* BE DAI flags */
129#define SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_RATES (1 << 0)
130#define SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_CHANNELS (1 << 1)
131#define SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_SAMPLEBITS (1 << 2)
132
127/*133/*
128 * Block Header.134 * Block Header.
129 * This header precedes all object and object arrays below.135 * This header precedes all object and object arrays below.
@@ -251,6 +257,7 @@ struct snd_soc_tplg_stream_caps { · 121 unmodified lines
251 __le32 period_size_max; /* max period size bytes */257 __le32 period_size_max; /* max period size bytes */
252 __le32 buffer_size_min; /* min buffer size bytes */258 __le32 buffer_size_min; /* min buffer size bytes */
253 __le32 buffer_size_max; /* max buffer size bytes */259 __le32 buffer_size_max; /* max buffer size bytes */
260 __le32 sig_bits; /* number of bits of content */
254} __attribute__((packed));261} __attribute__((packed));
255 262
256/*263/*
@@ -285,6 +292,8 @@ struct snd_soc_tplg_manifest { · 28 unmodified lines
285 __le32 graph_elems; /* number of graph elements */292 __le32 graph_elems; /* number of graph elements */
286 __le32 pcm_elems; /* number of PCM elements */293 __le32 pcm_elems; /* number of PCM elements */
287 __le32 dai_link_elems; /* number of DAI link elements */294 __le32 dai_link_elems; /* number of DAI link elements */
295 __le32 be_dai_elems; /* number of BE DAI elements */
296 __le32 reserved[20]; /* reserved for new ABI element types */
288 struct snd_soc_tplg_private priv;297 struct snd_soc_tplg_private priv;
289} __attribute__((packed));298} __attribute__((packed));
290 299
@@ -450,4 +459,26 @@ struct snd_soc_tplg_link_config { · 159 unmodified lines
450 struct snd_soc_tplg_stream stream[SND_SOC_TPLG_STREAM_CONFIG_MAX]; /* supported configs playback and captrure */459 struct snd_soc_tplg_stream stream[SND_SOC_TPLG_STREAM_CONFIG_MAX]; /* supported configs playback and captrure */
451 __le32 num_streams; /* number of streams */460 __le32 num_streams; /* number of streams */
452} __attribute__((packed));461} __attribute__((packed));
462
463/*
464 * Describes SW/FW specific features of BE DAI.
465 *
466 * File block representation for BE DAI :-
467 * +-----------------------------------+-----+
468 * | struct snd_soc_tplg_hdr | 1 |
469 * +-----------------------------------+-----+
470 * | struct snd_soc_tplg_be_dai | N |
471 * +-----------------------------------+-----+
472 */
473struct snd_soc_tplg_be_dai {
474 __le32 size; /* in bytes of this structure */
475 char dai_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; /* name - used to match */
476 __le32 dai_id; /* unique ID - used to match */
477 __le32 playback; /* supports playback mode */
478 __le32 capture; /* supports capture mode */
479 struct snd_soc_tplg_stream_caps caps[2]; /* playback and capture for DAI */
480 __le32 flag_mask; /* bitmask of flags to configure */
481 __le32 flags; /* SND_SOC_TPLG_DAI_FLGBIT_* */
482 struct snd_soc_tplg_private priv;
483} __attribute__((packed));
453#endif484#endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t