Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6bee368 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] v4l2: integrate support for VIDIOC_QUERY_EXT_CTRL 



Add the v4l2 core plumbing for the new VIDIOC_QUERY_EXT_CTRL ioctl.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent d9a25471

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

+2 −0
Original line number Diff line number Diff line
@@ -575,6 +575,8 @@ static void determine_valid_ioctls(struct video_device *vdev) 
	   be valid if the filehandle passed the control handler. */

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

		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);

	if (vdev->ctrl_handler || ops->vidioc_g_ctrl || ops->vidioc_g_ext_ctrls)

		set_bit(_IOC_NR(VIDIOC_G_CTRL), valid_ioctls);

	if (vdev->ctrl_handler || ops->vidioc_s_ctrl || ops->vidioc_s_ext_ctrls)

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

+33 −0
Original line number Diff line number Diff line
@@ -525,6 +525,21 @@ static void v4l_print_queryctrl(const void *arg, bool write_only) 
			p->step, p->default_value, p->flags);

}



static void v4l_print_query_ext_ctrl(const void *arg, bool write_only)

{

	const struct v4l2_query_ext_ctrl *p = arg;



	pr_cont("id=0x%x, type=%d, name=%.*s, min/max=%lld/%lld, "

		"step=%lld, default=%lld, flags=0x%08x, elem_size=%u, elems=%u, "

		"nr_of_dims=%u, dims=%u,%u,%u,%u,%u,%u,%u,%u\n",

			p->id, p->type, (int)sizeof(p->name), p->name,

			p->minimum, p->maximum,

			p->step, p->default_value, p->flags,

			p->elem_size, p->elems, p->nr_of_dims,

			p->dims[0], p->dims[1], p->dims[2], p->dims[3],

			p->dims[4], p->dims[5], p->dims[6], p->dims[7]);

}



static void v4l_print_querymenu(const void *arg, bool write_only)

{

	const struct v4l2_querymenu *p = arg;
@@ -1561,6 +1576,23 @@ static int v4l_queryctrl(const struct v4l2_ioctl_ops *ops, 
	return -ENOTTY;

}



static int v4l_query_ext_ctrl(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 *p = arg;

	struct v4l2_fh *vfh =

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



	if (vfh && vfh->ctrl_handler)

		return v4l2_query_ext_ctrl(vfh->ctrl_handler, p);

	if (vfd->ctrl_handler)

		return v4l2_query_ext_ctrl(vfd->ctrl_handler, p);

	if (ops->vidioc_query_ext_ctrl)

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

	return -ENOTTY;

}



static int v4l_querymenu(const struct v4l2_ioctl_ops *ops,

				struct file *file, void *fh, void *arg)

{
@@ -2121,6 +2153,7 @@ static struct v4l2_ioctl_info v4l2_ioctls[] = { 
	IOCTL_INFO_STD(VIDIOC_DV_TIMINGS_CAP, vidioc_dv_timings_cap, v4l_print_dv_timings_cap, INFO_FL_CLEAR(v4l2_dv_timings_cap, type)),

	IOCTL_INFO_FNC(VIDIOC_ENUM_FREQ_BANDS, v4l_enum_freq_bands, v4l_print_freq_band, 0),

	IOCTL_INFO_FNC(VIDIOC_DBG_G_CHIP_INFO, v4l_dbg_g_chip_info, v4l_print_dbg_chip_info, INFO_FL_CLEAR(v4l2_dbg_chip_info, match)),

	IOCTL_INFO_FNC(VIDIOC_QUERY_EXT_CTRL, v4l_query_ext_ctrl, v4l_print_query_ext_ctrl, INFO_FL_CTRL | INFO_FL_CLEAR(v4l2_query_ext_ctrl, id)),

};

#define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)

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

+3 −0
Original line number Diff line number Diff line
@@ -139,6 +139,9 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg) 
	case VIDIOC_QUERYCTRL:

		return v4l2_queryctrl(vfh->ctrl_handler, arg);



	case VIDIOC_QUERY_EXT_CTRL:

		return v4l2_query_ext_ctrl(vfh->ctrl_handler, arg);



	case VIDIOC_QUERYMENU:

		return v4l2_querymenu(vfh->ctrl_handler, arg);

include/media/v4l2-ioctl.h

+2 −0
Original line number Diff line number Diff line
@@ -158,6 +158,8 @@ struct v4l2_ioctl_ops { 
		/* Control handling */

	int (*vidioc_queryctrl)        (struct file *file, void *fh,

					struct v4l2_queryctrl *a);

	int (*vidioc_query_ext_ctrl)   (struct file *file, void *fh,

					struct v4l2_query_ext_ctrl *a);

	int (*vidioc_g_ctrl)           (struct file *file, void *fh,

					struct v4l2_control *a);

	int (*vidioc_s_ctrl)           (struct file *file, void *fh,