History

Merge branch 'asoc-5.5' into asoc-next

Mark Brown committed 6 years ago

Commit 8c4d2a02 parents 3701d2c 39870b0228 files · +12218 −3530Browse files

Showing the changes to include/uapi (3 of 228 files). Show all

Unified · Split

3 files
  1. include/uapi/sound/compress_params.h +10 −0
  2. include/uapi/sound/sof/abi.h +1 −1
  3. include/uapi/sound/sof/tokens.h +9 −2
include/uapi/sound/compress_params.h+10−0
@@ -317,12 +317,22 @@ struct snd_enc_generic { · 316 unmodified lines
317317 __s32 reserved[15]; /* Can be used for SND_AUDIOCODEC_BESPOKE */
318318 } __attribute__((packed, aligned(4)));
319319
320+struct snd_dec_flac {
321+ __u16 sample_size;
322+ __u16 min_blk_size;
323+ __u16 max_blk_size;
324+ __u16 min_frame_size;
325+ __u16 max_frame_size;
326+ __u16 reserved;
327+} __attribute__((packed, aligned(4)));
328+
320329 union snd_codec_options {
321330 struct snd_enc_wma wma;
322331 struct snd_enc_vorbis vorbis;
323332 struct snd_enc_real real;
324333 struct snd_enc_flac flac;
325334 struct snd_enc_generic generic;
335+ struct snd_dec_flac flac_d;
326336 } __attribute__((packed, aligned(4)));
327337
328338 /** struct snd_codec_desc - description of codec capabilities
include/uapi/sound/sof/abi.h+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
2626
2727 /* SOF ABI version major, minor and patch numbers */
2828 #define SOF_ABI_MAJOR 3
29−#define SOF_ABI_MINOR 10
29+#define SOF_ABI_MINOR 11
3030 #define SOF_ABI_PATCH 0
3131
3232 /* SOF ABI version number. Format within 32bit word is MMmmmppp */
include/uapi/sound/sof/tokens.h+9−2
@@ -111,7 +111,14 @@ · 110 unmodified lines
111111 /* TODO: Add SAI tokens */
112112
113113 /* ESAI */
114−#define SOF_TKN_IMX_ESAI_FIRST_TOKEN 1100
115−/* TODO: Add ESAI tokens */
114+#define SOF_TKN_IMX_ESAI_MCLK_ID 1100
115+
116+/* Stream */
117+#define SOF_TKN_STREAM_PLAYBACK_COMPATIBLE_D0I3 1200
118+#define SOF_TKN_STREAM_CAPTURE_COMPATIBLE_D0I3 1201
119+
120+/* Led control for mute switches */
121+#define SOF_TKN_MUTE_LED_USE 1300
122+#define SOF_TKN_MUTE_LED_DIRECTION 1301
116123
117124 #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