diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-12-28 14:03:47 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2016-01-11 14:35:17 (GMT) |
| commit | be0270ec89e6b9b49de7e533dd1f3a89ad34d205 (patch) | |
| tree | 8d5b14ed6fda68046ec13082133a2315df19d7b3 /include/uapi | |
| parent | ce084d487c8a0731bff5739e735b7bb82b94e53b (diff) | |
| download | linux-be0270ec89e6b9b49de7e533dd1f3a89ad34d205.tar.xz | |
[media] Postpone the addition of MEDIA_IOC_G_TOPOLOGY
There are a few discussions left with regards to this ioctl:
1) the name of the new structs will contain _v2_ on it?
2) what's the best alternative to avoid compat32 issues?
Due to that, let's postpone the addition of this new ioctl to
the next Kernel version, to give people more time to discuss it.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/media.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h index 5dbb208..1e3c8cb 100644 --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h @@ -286,7 +286,7 @@ struct media_links_enum { * later, before the adding this API upstream. */ - +#if 0 /* Let's postpone it to Kernel 4.6 */ struct media_v2_entity { __u32 id; char name[64]; /* FIXME: move to a property? (RFC says so) */ @@ -351,6 +351,7 @@ static inline void __user *media_get_uptr(__u64 arg) { return (void __user *)(uintptr_t)arg; } +#endif /* ioctls */ @@ -358,6 +359,9 @@ static inline void __user *media_get_uptr(__u64 arg) #define MEDIA_IOC_ENUM_ENTITIES _IOWR('|', 0x01, struct media_entity_desc) #define MEDIA_IOC_ENUM_LINKS _IOWR('|', 0x02, struct media_links_enum) #define MEDIA_IOC_SETUP_LINK _IOWR('|', 0x03, struct media_link_desc) + +#if 0 /* Let's postpone it to Kernel 4.6 */ #define MEDIA_IOC_G_TOPOLOGY _IOWR('|', 0x04, struct media_v2_topology) +#endif #endif /* __LINUX_MEDIA_H */ |