On 10/12/2015 06:44 PM, Mauro Carvalho Chehab wrote:
Now that entities have a main function, expose it via MEDIA_IOC_G_TOPOLOGY ioctl.
Change-Id: I52c9968e3b8ad766f714cabc31a6b7505ba4801d Signed-off-by: Mauro Carvalho Chehab mchehab@osg.samsung.com
Acked-by: Hans Verkuil hans.verkuil@cisco.com
drivers/media/media-device.c | 1 + include/uapi/linux/media.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index ccef9621d147..32090030c342 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -263,6 +263,7 @@ static long __media_device_get_topology(struct media_device *mdev, /* Copy fields to userspace struct if not error */ memset(&uentity, 0, sizeof(uentity)); uentity.id = entity->graph_obj.id;
uentity.function = entity->function;diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h index 69433405aec2..d232cc680c67 100644 --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h @@ -284,7 +284,8 @@ struct media_links_enum { struct media_v2_entity { __u32 id; char name[64]; /* FIXME: move to a property? (RFC says so) */
- __u16 reserved[14];
- __u32 function; /* Main function of the entity */
- __u16 reserved[12];
};
/* Should match the specific fields at media_intf_devnode */