Commit 46108b41 authored by Ricardo Ribalda's avatar Ricardo Ribalda Committed by Mauro Carvalho Chehab
Browse files

media: ioctl: Simulate v4l2_queryctrl with v4l2_query_ext_ctrl 



v4l2_queryctrl is a subset of v4l2_query_ext_ctrl. If the driver does
not implement v4l2_queryctrl we can implement it with
v4l2_query_ext_ctrl.

Suggested-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent a79efc44

drivers/media/v4l2-core/v4l2-dev.c

+2 −1
Original line number Diff line number Diff line
@@ -572,7 +572,8 @@ static void determine_valid_ioctls(struct video_device *vdev) 
	   and that can't be tested here. If the bit for these control ioctls

	   is set, then the ioctl is valid. But if it is 0, then it can still

	   be valid if the filehandle passed the control handler. */

	if (vdev->ctrl_handler || ops->vidioc_queryctrl)

	if (vdev->ctrl_handler || ops->vidioc_queryctrl ||

	    ops->vidioc_query_ext_ctrl)

		__set_bit(_IOC_NR(VIDIOC_QUERYCTRL), valid_ioctls);

	if (vdev->ctrl_handler || ops->vidioc_query_ext_ctrl)

		__set_bit(_IOC_NR(VIDIOC_QUERY_EXT_CTRL), valid_ioctls);

drivers/media/v4l2-core/v4l2-ioctl.c

+36 −1
Original line number Diff line number Diff line
@@ -2286,9 +2286,11 @@ static int v4l_queryctrl(const struct v4l2_ioctl_ops *ops, 
				struct file *file, void *fh, void *arg)

{

	struct video_device *vfd = video_devdata(file);

	struct v4l2_query_ext_ctrl qec = {};

	struct v4l2_queryctrl *p = arg;

	struct v4l2_fh *vfh =

		test_bit(V4L2_FL_USES_V4L2_FH, &vfd->flags) ? fh : NULL;

	int ret;



	if (vfh && vfh->ctrl_handler)

		return v4l2_queryctrl(vfh->ctrl_handler, p);
@@ -2296,7 +2298,40 @@ static int v4l_queryctrl(const struct v4l2_ioctl_ops *ops, 
		return v4l2_queryctrl(vfd->ctrl_handler, p);

	if (ops->vidioc_queryctrl)

		return ops->vidioc_queryctrl(file, fh, p);

	if (!ops->vidioc_query_ext_ctrl)

		return -ENOTTY;



	/* Simulate query_ext_ctr using query_ctrl. */

	qec.id = p->id;

	ret = ops->vidioc_query_ext_ctrl(file, fh, &qec);

	if (ret)

		return ret;



	p->id = qec.id;

	p->type = qec.type;

	p->flags = qec.flags;

	strscpy(p->name, qec.name, sizeof(p->name));

	switch (p->type) {

	case V4L2_CTRL_TYPE_INTEGER:

	case V4L2_CTRL_TYPE_BOOLEAN:

	case V4L2_CTRL_TYPE_MENU:

	case V4L2_CTRL_TYPE_INTEGER_MENU:

	case V4L2_CTRL_TYPE_STRING:

	case V4L2_CTRL_TYPE_BITMASK:

		p->minimum = qec.minimum;

		p->maximum = qec.maximum;

		p->step = qec.step;

		p->default_value = qec.default_value;

		break;

	default:

		p->minimum = 0;

		p->maximum = 0;

		p->step = 0;

		p->default_value = 0;

		break;

	}



	return 0;

}



static int v4l_query_ext_ctrl(const struct v4l2_ioctl_ops *ops,