From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans Verkuil Subject: Re: [PATCH 14/18] [media] media-device: export the entity function via new ioctl Date: Fri, 11 Sep 2015 17:26:34 +0200 Message-ID: <55F2F2AA.1040802@xs4all.nl> References: <13a08789f63775c6f014c08969bc8ed3f0550c82.1441559233.git.mchehab@osg.samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <13a08789f63775c6f014c08969bc8ed3f0550c82.1441559233.git.mchehab@osg.samsung.com> Sender: linux-media-owner@vger.kernel.org To: Mauro Carvalho Chehab , Linux Media Mailing List Cc: linux-api@vger.kernel.org List-Id: linux-api@vger.kernel.org On 09/06/2015 07:30 PM, Mauro Carvalho Chehab wrote: > Now that entities have a main function, expose it via > MEDIA_IOC_G_TOPOLOGY ioctl. > > Signed-off-by: Mauro Carvalho Chehab Acked-by: Hans Verkuil > > 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; > strncpy(uentity.name, entity->name, > sizeof(uentity.name)); > > 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 */ >