History

[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.

Mauro Carvalho Chehab committed 10 years ago

Commit be0270e1 parent ce084d43 files · +14 −2Browse files

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

Unified · Split

include/uapi/linux/media.h+5−1
@@ -286,7 +286,7 @@ struct media_links_enum { · 285 unmodified lines
286 * later, before the adding this API upstream.286 * later, before the adding this API upstream.
287 */287 */
288 288
289 289#if 0 /* Let's postpone it to Kernel 4.6 */
290struct media_v2_entity {290struct media_v2_entity {
291 __u32 id;291 __u32 id;
292 char name[64]; /* FIXME: move to a property? (RFC says so) */292 char name[64]; /* FIXME: move to a property? (RFC says so) */
@@ -351,6 +351,7 @@ static inline void __user *media_get_uptr(__u64 arg) · 58 unmodified lines
351{351{
352 return (void __user *)(uintptr_t)arg;352 return (void __user *)(uintptr_t)arg;
353}353}
354#endif
354 355
355/* ioctls */356/* ioctls */
356 357
@@ -358,6 +359,9 @@ static inline void __user *media_get_uptr(__u64 arg) · 1 unmodified line
358#define MEDIA_IOC_ENUM_ENTITIES _IOWR('|', 0x01, struct media_entity_desc)359#define MEDIA_IOC_ENUM_ENTITIES _IOWR('|', 0x01, struct media_entity_desc)
359#define MEDIA_IOC_ENUM_LINKS _IOWR('|', 0x02, struct media_links_enum)360#define MEDIA_IOC_ENUM_LINKS _IOWR('|', 0x02, struct media_links_enum)
360#define MEDIA_IOC_SETUP_LINK _IOWR('|', 0x03, struct media_link_desc)361#define MEDIA_IOC_SETUP_LINK _IOWR('|', 0x03, struct media_link_desc)
362
363#if 0 /* Let's postpone it to Kernel 4.6 */
361#define MEDIA_IOC_G_TOPOLOGY _IOWR('|', 0x04, struct media_v2_topology)364#define MEDIA_IOC_G_TOPOLOGY _IOWR('|', 0x04, struct media_v2_topology)
365#endif
362 366
363#endif /* __LINUX_MEDIA_H */367#endif /* __LINUX_MEDIA_H */

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