Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[media] uapi/media.h: Add MEDIA_IOC_G_TOPOLOGY ioctl

Browse source 
Add a new ioctl that will report the entire topology on
one go.

Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2015-08-23 08:28:21 -03:00
parent 6c24d4602e
commit c398bb6441
2 changed files with 89 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/media/media-entity.h
View file

@ -181,6 +181,8 @@ struct media_interface {
*/
struct media_intf_devnode {
struct media_interface intf;
/* Should match the fields at media_v2_intf_devnode */
u32 major;
u32 minor;
};

88
include/uapi/linux/media.h
View file

@ -206,6 +206,10 @@ struct media_pad_desc {
#define MEDIA_LNK_FL_IMMUTABLE (1 << 1)
#define MEDIA_LNK_FL_DYNAMIC (1 << 2)
#define MEDIA_LNK_FL_LINK_TYPE (0xf << 28)
# define MEDIA_LNK_FL_DATA_LINK (0 << 28)
# define MEDIA_LNK_FL_INTERFACE_LINK (1 << 28)
struct media_link_desc {
struct media_pad_desc source;
struct media_pad_desc sink;
@ -241,11 +245,93 @@ struct media_links_enum {
#define MEDIA_INTF_T_V4L_SUBDEV (MEDIA_INTF_T_V4L_BASE + 3)
#define MEDIA_INTF_T_V4L_SWRADIO (MEDIA_INTF_T_V4L_BASE + 4)
/* TBD: declare the structs needed for the new G_TOPOLOGY ioctl */
/*
* MC next gen API definitions
*
* NOTE: The declarations below are close to the MC RFC for the Media
* Controller, the next generation. Yet, there are a few adjustments
* to do, as we want to be able to have a functional API before
* the MC properties change. Those will be properly marked below.
* Please also notice that I removed "num_pads", "num_links",
* from the proposal, as a proper userspace application will likely
* use lists for pads/links, just as we intend to do in Kernelspace.
* The API definition should be freed from fields that are bound to
* some specific data structure.
*
* FIXME: Currently, I opted to name the new types as "media_v2", as this
* won't cause any conflict with the Kernelspace namespace, nor with
* the previous kAPI media_*_desc namespace. This can be changed
* later, before the adding this API upstream.
*/
struct media_v2_entity {
__u32 id;
char name[64]; /* FIXME: move to a property? (RFC says so) */
__u16 reserved[14];
};
/* Should match the specific fields at media_intf_devnode */
struct media_v2_intf_devnode {
__u32 major;
__u32 minor;
};
struct media_v2_interface {
__u32 id;
__u32 intf_type;
__u32 flags;
__u32 reserved[9];
union {
struct media_v2_intf_devnode devnode;
__u32 raw[16];
};
};
struct media_v2_pad {
__u32 id;
__u32 entity_id;
__u32 flags;
__u16 reserved[9];
};
struct media_v2_link {
__u32 id;
__u32 source_id;
__u32 sink_id;
__u32 flags;
__u32 reserved[5];
};
struct media_v2_topology {
__u32 topology_version;
__u32 num_entities;
struct media_v2_entity *entities;
__u32 num_interfaces;
struct media_v2_interface *interfaces;
__u32 num_pads;
struct media_v2_pad *pads;
__u32 num_links;
struct media_v2_link *links;
struct {
__u32 reserved_num;
void *reserved_ptr;
} reserved_types[16];
__u32 reserved[8];
};
/* ioctls */
#define MEDIA_IOC_DEVICE_INFO _IOWR('|', 0x00, struct media_device_info)
#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)
#define MEDIA_IOC_G_TOPOLOGY _IOWR('|', 0x04, struct media_v2_topology)
#endif /* __LINUX_MEDIA_H */