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

Commit af1d9afa authored by Brian Johnson's avatar Brian Johnson Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (12282): gspca - main: Support for vidioc_g_chip_ident and vidioc_g/s_register. 



Signed-off-by: default avatarBrian Johnson <brijohn@gmail.com>
Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a2f5a811

drivers/media/video/gspca/gspca.c

+73 −0
Original line number Diff line number Diff line
@@ -727,6 +727,74 @@ static int gspca_get_mode(struct gspca_dev *gspca_dev, 
	return -EINVAL;

}



#ifdef CONFIG_VIDEO_ADV_DEBUG

static int vidioc_g_register(struct file *file, void *priv,

			struct v4l2_dbg_register *reg)

{

	int ret;

	struct gspca_dev *gspca_dev = priv;



	if (!gspca_dev->sd_desc->get_chip_ident)

		return -EINVAL;



	if (!gspca_dev->sd_desc->get_register)

		return -EINVAL;



	if (mutex_lock_interruptible(&gspca_dev->usb_lock))

		return -ERESTARTSYS;

	if (gspca_dev->present)

		ret = gspca_dev->sd_desc->get_register(gspca_dev, reg);

	else

		ret = -ENODEV;

	mutex_unlock(&gspca_dev->usb_lock);



	return ret;

}



static int vidioc_s_register(struct file *file, void *priv,

			struct v4l2_dbg_register *reg)

{

	int ret;

	struct gspca_dev *gspca_dev = priv;



	if (!gspca_dev->sd_desc->get_chip_ident)

		return -EINVAL;



	if (!gspca_dev->sd_desc->set_register)

		return -EINVAL;



	if (mutex_lock_interruptible(&gspca_dev->usb_lock))

		return -ERESTARTSYS;

	if (gspca_dev->present)

		ret = gspca_dev->sd_desc->set_register(gspca_dev, reg);

	else

		ret = -ENODEV;

	mutex_unlock(&gspca_dev->usb_lock);



	return ret;

}

#endif



static int vidioc_g_chip_ident(struct file *file, void *priv,

			struct v4l2_dbg_chip_ident *chip)

{

	int ret;

	struct gspca_dev *gspca_dev = priv;



	if (!gspca_dev->sd_desc->get_chip_ident)

		return -EINVAL;



	if (mutex_lock_interruptible(&gspca_dev->usb_lock))

		return -ERESTARTSYS;

	if (gspca_dev->present)

		ret = gspca_dev->sd_desc->get_chip_ident(gspca_dev, chip);

	else

		ret = -ENODEV;

	mutex_unlock(&gspca_dev->usb_lock);



	return ret;

}



static int vidioc_enum_fmt_vid_cap(struct file *file, void  *priv,

				struct v4l2_fmtdesc *fmtdesc)

{
@@ -1883,6 +1951,11 @@ static const struct v4l2_ioctl_ops dev_ioctl_ops = { 
	.vidioc_s_parm		= vidioc_s_parm,

	.vidioc_s_std		= vidioc_s_std,

	.vidioc_enum_framesizes = vidioc_enum_framesizes,

#ifdef CONFIG_VIDEO_ADV_DEBUG

	.vidioc_g_register	= vidioc_g_register,

	.vidioc_s_register	= vidioc_s_register,

#endif

	.vidioc_g_chip_ident	= vidioc_g_chip_ident,

#ifdef CONFIG_VIDEO_V4L1_COMPAT

	.vidiocgmbuf          = vidiocgmbuf,

#endif

drivers/media/video/gspca/gspca.h

+9 −0
Original line number Diff line number Diff line
@@ -69,6 +69,10 @@ typedef void (*cam_v_op) (struct gspca_dev *); 
typedef int (*cam_cf_op) (struct gspca_dev *, const struct usb_device_id *);

typedef int (*cam_jpg_op) (struct gspca_dev *,

				struct v4l2_jpegcompression *);

typedef int (*cam_reg_op) (struct gspca_dev *,

				struct v4l2_dbg_register *);

typedef int (*cam_ident_op) (struct gspca_dev *,

				struct v4l2_dbg_chip_ident *);

typedef int (*cam_streamparm_op) (struct gspca_dev *,

				  struct v4l2_streamparm *);

typedef int (*cam_qmnu_op) (struct gspca_dev *,
@@ -105,6 +109,11 @@ struct sd_desc { 
	cam_qmnu_op querymenu;

	cam_streamparm_op get_streamparm;

	cam_streamparm_op set_streamparm;

#ifdef CONFIG_VIDEO_ADV_DEBUG

	cam_reg_op set_register;

	cam_reg_op get_register;

#endif

	cam_ident_op get_chip_ident;

};



/* packet types when moving from iso buf to frame buf */