From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from bombadil.infradead.org ([198.137.202.133]:50176 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726894AbeHIWbV (ORCPT ); Thu, 9 Aug 2018 18:31:21 -0400 Date: Thu, 9 Aug 2018 17:04:52 -0300 From: Mauro Carvalho Chehab To: Hans Verkuil Cc: linux-media@vger.kernel.org, Alexandre Courbot , Hans Verkuil Subject: Re: [PATCHv17 09/34] videodev2.h: add request_fd field to v4l2_ext_controls Message-ID: <20180809170452.59179334@coco.lan> In-Reply-To: <20180804124526.46206-10-hverkuil@xs4all.nl> References: <20180804124526.46206-1-hverkuil@xs4all.nl> <20180804124526.46206-10-hverkuil@xs4all.nl> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org List-ID: Em Sat, 4 Aug 2018 14:45:01 +0200 Hans Verkuil escreveu: > From: Alexandre Courbot > > If 'which' is V4L2_CTRL_WHICH_REQUEST_VAL, then the 'request_fd' field > can be used to specify a request for the G/S/TRY_EXT_CTRLS ioctls. > > Signed-off-by: Alexandre Courbot > Signed-off-by: Hans Verkuil Reviewed-by: Mauro Carvalho Chehab > --- > drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 5 ++++- > drivers/media/v4l2-core/v4l2-ioctl.c | 6 +++--- > include/uapi/linux/videodev2.h | 4 +++- > 3 files changed, 10 insertions(+), 5 deletions(-) > > diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c > index 6481212fda77..dcce86c1fe40 100644 > --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c > +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c > @@ -834,7 +834,8 @@ struct v4l2_ext_controls32 { > __u32 which; > __u32 count; > __u32 error_idx; > - __u32 reserved[2]; > + __s32 request_fd; > + __u32 reserved[1]; > compat_caddr_t controls; /* actually struct v4l2_ext_control32 * */ > }; > > @@ -909,6 +910,7 @@ static int get_v4l2_ext_controls32(struct file *file, > get_user(count, &p32->count) || > put_user(count, &p64->count) || > assign_in_user(&p64->error_idx, &p32->error_idx) || > + assign_in_user(&p64->request_fd, &p32->request_fd) || > copy_in_user(p64->reserved, p32->reserved, sizeof(p64->reserved))) > return -EFAULT; > > @@ -974,6 +976,7 @@ static int put_v4l2_ext_controls32(struct file *file, > get_user(count, &p64->count) || > put_user(count, &p32->count) || > assign_in_user(&p32->error_idx, &p64->error_idx) || > + assign_in_user(&p32->request_fd, &p64->request_fd) || > copy_in_user(p32->reserved, p64->reserved, sizeof(p32->reserved)) || > get_user(kcontrols, &p64->controls)) > return -EFAULT; > diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c > index ea475d833dd6..03241d6b7ef8 100644 > --- a/drivers/media/v4l2-core/v4l2-ioctl.c > +++ b/drivers/media/v4l2-core/v4l2-ioctl.c > @@ -590,8 +590,8 @@ static void v4l_print_ext_controls(const void *arg, bool write_only) > const struct v4l2_ext_controls *p = arg; > int i; > > - pr_cont("which=0x%x, count=%d, error_idx=%d", > - p->which, p->count, p->error_idx); > + pr_cont("which=0x%x, count=%d, error_idx=%d, request_fd=%d", > + p->which, p->count, p->error_idx, p->request_fd); > for (i = 0; i < p->count; i++) { > if (!p->controls[i].size) > pr_cont(", id/val=0x%x/0x%x", > @@ -907,7 +907,7 @@ static int check_ext_ctrls(struct v4l2_ext_controls *c, int allow_priv) > __u32 i; > > /* zero the reserved fields */ > - c->reserved[0] = c->reserved[1] = 0; > + c->reserved[0] = 0; > for (i = 0; i < c->count; i++) > c->controls[i].reserved2[0] = 0; > > diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h > index 5d1a3685bea9..1df0fa983db6 100644 > --- a/include/uapi/linux/videodev2.h > +++ b/include/uapi/linux/videodev2.h > @@ -1599,7 +1599,8 @@ struct v4l2_ext_controls { > }; > __u32 count; > __u32 error_idx; > - __u32 reserved[2]; > + __s32 request_fd; > + __u32 reserved[1]; > struct v4l2_ext_control *controls; > }; > > @@ -1612,6 +1613,7 @@ struct v4l2_ext_controls { > #define V4L2_CTRL_MAX_DIMS (4) > #define V4L2_CTRL_WHICH_CUR_VAL 0 > #define V4L2_CTRL_WHICH_DEF_VAL 0x0f000000 > +#define V4L2_CTRL_WHICH_REQUEST_VAL 0x0f010000 > > enum v4l2_ctrl_type { > V4L2_CTRL_TYPE_INTEGER = 1, Thanks, Mauro