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

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

[media] v4l2-ioctl.c: use the new table for debug ioctls 



Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d806f2df

drivers/media/video/v4l2-ioctl.c

+89 −50
Original line number Diff line number Diff line
@@ -629,11 +629,42 @@ static void v4l_print_decoder_cmd(const void *arg, bool write_only) 
		pr_info("pts=%llu\n", p->stop.pts);

}



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

{

	const struct v4l2_dbg_chip_ident *p = arg;



	pr_cont("type=%u, ", p->match.type);

	if (p->match.type == V4L2_CHIP_MATCH_I2C_DRIVER)

		pr_cont("name=%s, ", p->match.name);

	else

		pr_cont("addr=%u, ", p->match.addr);

	pr_cont("chip_ident=%u, revision=0x%x\n",

			p->ident, p->revision);

}



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

{

	const struct v4l2_dbg_register *p = arg;



	pr_cont("type=%u, ", p->match.type);

	if (p->match.type == V4L2_CHIP_MATCH_I2C_DRIVER)

		pr_cont("name=%s, ", p->match.name);

	else

		pr_cont("addr=%u, ", p->match.addr);

	pr_cont("reg=0x%llx, val=0x%llx\n",

			p->reg, p->val);

}



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

{

	pr_cont("value=%u\n", *(const u32 *)arg);

}



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

{

	pr_cont("\n");

}



static void dbgtimings(struct video_device *vfd,

			const struct v4l2_dv_timings *p)

{
@@ -1537,6 +1568,60 @@ static int v4l_cropcap(const struct v4l2_ioctl_ops *ops, 
	return 0;

}



static int v4l_log_status(const struct v4l2_ioctl_ops *ops,

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

{

	struct video_device *vfd = video_devdata(file);

	int ret;



	if (vfd->v4l2_dev)

		pr_info("%s: =================  START STATUS  =================\n",

			vfd->v4l2_dev->name);

	ret = ops->vidioc_log_status(file, fh);

	if (vfd->v4l2_dev)

		pr_info("%s: ==================  END STATUS  ==================\n",

			vfd->v4l2_dev->name);

	return ret;

}



static int v4l_dbg_g_register(const struct v4l2_ioctl_ops *ops,

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

{

#ifdef CONFIG_VIDEO_ADV_DEBUG

	struct v4l2_dbg_register *p = arg;



	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;

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

#else

	return -ENOTTY;

#endif

}



static int v4l_dbg_s_register(const struct v4l2_ioctl_ops *ops,

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

{

#ifdef CONFIG_VIDEO_ADV_DEBUG

	struct v4l2_dbg_register *p = arg;



	if (!capable(CAP_SYS_ADMIN))

		return -EPERM;

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

#else

	return -ENOTTY;

#endif

}



static int v4l_dbg_g_chip_ident(const struct v4l2_ioctl_ops *ops,

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

{

	struct v4l2_dbg_chip_ident *p = arg;



	p->ident = V4L2_IDENT_NONE;

	p->revision = 0;

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

}



struct v4l2_ioctl_info {

	unsigned int ioctl;

	u32 flags;
@@ -1640,7 +1725,7 @@ static struct v4l2_ioctl_info v4l2_ioctls[] = { 
	IOCTL_INFO_FNC(VIDIOC_G_PRIORITY, v4l_g_priority, v4l_print_u32, 0),

	IOCTL_INFO_FNC(VIDIOC_S_PRIORITY, v4l_s_priority, v4l_print_u32, INFO_FL_PRIO),

	IOCTL_INFO(VIDIOC_G_SLICED_VBI_CAP, INFO_FL_CLEAR(v4l2_sliced_vbi_cap, type)),

	IOCTL_INFO(VIDIOC_LOG_STATUS, 0),

	IOCTL_INFO_FNC(VIDIOC_LOG_STATUS, v4l_log_status, v4l_print_newline, 0),

	IOCTL_INFO_FNC(VIDIOC_G_EXT_CTRLS, v4l_g_ext_ctrls, v4l_print_ext_controls, INFO_FL_CTRL),

	IOCTL_INFO_FNC(VIDIOC_S_EXT_CTRLS, v4l_s_ext_ctrls, v4l_print_ext_controls, INFO_FL_PRIO | INFO_FL_CTRL),

	IOCTL_INFO_FNC(VIDIOC_TRY_EXT_CTRLS, v4l_try_ext_ctrls, v4l_print_ext_controls, 0),
@@ -1651,9 +1736,9 @@ static struct v4l2_ioctl_info v4l2_ioctls[] = { 
	IOCTL_INFO_STD(VIDIOC_TRY_ENCODER_CMD, vidioc_try_encoder_cmd, v4l_print_encoder_cmd, INFO_FL_CLEAR(v4l2_encoder_cmd, flags)),

	IOCTL_INFO_STD(VIDIOC_DECODER_CMD, vidioc_decoder_cmd, v4l_print_decoder_cmd, INFO_FL_PRIO),

	IOCTL_INFO_STD(VIDIOC_TRY_DECODER_CMD, vidioc_try_decoder_cmd, v4l_print_decoder_cmd, 0),

	IOCTL_INFO(VIDIOC_DBG_S_REGISTER, 0),

	IOCTL_INFO(VIDIOC_DBG_G_REGISTER, 0),

	IOCTL_INFO(VIDIOC_DBG_G_CHIP_IDENT, 0),

	IOCTL_INFO_FNC(VIDIOC_DBG_S_REGISTER, v4l_dbg_s_register, v4l_print_dbg_register, 0),

	IOCTL_INFO_FNC(VIDIOC_DBG_G_REGISTER, v4l_dbg_g_register, v4l_print_dbg_register, 0),

	IOCTL_INFO_FNC(VIDIOC_DBG_G_CHIP_IDENT, v4l_dbg_g_chip_ident, v4l_print_dbg_chip_ident, 0),

	IOCTL_INFO_FNC(VIDIOC_S_HW_FREQ_SEEK, v4l_s_hw_freq_seek, v4l_print_hw_freq_seek, INFO_FL_PRIO),

	IOCTL_INFO(VIDIOC_ENUM_DV_PRESETS, 0),

	IOCTL_INFO(VIDIOC_S_DV_PRESET, INFO_FL_PRIO),
@@ -1788,52 +1873,6 @@ static long __video_do_ioctl(struct file *file, 
			dbgarg2("service_set=%d\n", p->service_set);

		break;

	}

	case VIDIOC_LOG_STATUS:

	{

		if (vfd->v4l2_dev)

			pr_info("%s: =================  START STATUS  =================\n",

				vfd->v4l2_dev->name);

		ret = ops->vidioc_log_status(file, fh);

		if (vfd->v4l2_dev)

			pr_info("%s: ==================  END STATUS  ==================\n",

				vfd->v4l2_dev->name);

		break;

	}

	case VIDIOC_DBG_G_REGISTER:

	{

#ifdef CONFIG_VIDEO_ADV_DEBUG

		struct v4l2_dbg_register *p = arg;



		if (!capable(CAP_SYS_ADMIN))

			ret = -EPERM;

		else

			ret = ops->vidioc_g_register(file, fh, p);

#endif

		break;

	}

	case VIDIOC_DBG_S_REGISTER:

	{

#ifdef CONFIG_VIDEO_ADV_DEBUG

		struct v4l2_dbg_register *p = arg;



		if (!capable(CAP_SYS_ADMIN))

			ret = -EPERM;

		else

			ret = ops->vidioc_s_register(file, fh, p);

#endif

		break;

	}

	case VIDIOC_DBG_G_CHIP_IDENT:

	{

		struct v4l2_dbg_chip_ident *p = arg;



		p->ident = V4L2_IDENT_NONE;

		p->revision = 0;

		ret = ops->vidioc_g_chip_ident(file, fh, p);

		if (!ret)

			dbgarg(cmd, "chip_ident=%u, revision=0x%x\n", p->ident, p->revision);

		break;

	}

	case VIDIOC_ENUM_FRAMESIZES:

	{

		struct v4l2_frmsizeenum *p = arg;