projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1161350
)
[media] media: Add ALSA Media Controller function entities
author
Shuah Khan
<
[email protected]
>
Thu, 11 Feb 2016 23:41:20 +0000
(21:41 -0200)
committer
Mauro Carvalho Chehab
<
[email protected]
>
Sat, 27 Feb 2016 11:32:54 +0000
(08:32 -0300)
Add ALSA Media Controller capture, playback, and mixer
function entity defines.
[
[email protected]
: fix a trivial merge conflict and start
MEDIA_ENT_AUDIO_F from 3000]
Signed-off-by: Shuah Khan <
[email protected]
>
Acked-by: Takashi Iwai <
[email protected]
>
Signed-off-by: Mauro Carvalho Chehab <
[email protected]
>
include/uapi/linux/media.h
patch
|
blob
|
history
diff --git
a/include/uapi/linux/media.h
b/include/uapi/linux/media.h
index f53ede3efa2f9129168c3456099394b871da7b28..95e126edb1c35450967418cc4444e975dcb2575a 100644
(file)
--- a/
include/uapi/linux/media.h
+++ b/
include/uapi/linux/media.h
@@
-87,6
+87,13
@@
struct media_device_info {
#define MEDIA_ENT_F_IF_VID_DECODER (MEDIA_ENT_F_BASE + 2001)
#define MEDIA_ENT_F_IF_AUD_DECODER (MEDIA_ENT_F_BASE + 2002)
+/*
+ * Audio Entity Functions
+ */
+#define MEDIA_ENT_F_AUDIO_CAPTURE (MEDIA_ENT_F_BASE + 3000)
+#define MEDIA_ENT_F_AUDIO_PLAYBACK (MEDIA_ENT_F_BASE + 3001)
+#define MEDIA_ENT_F_AUDIO_MIXER (MEDIA_ENT_F_BASE + 3002)
+
/*
* Connectors
*/