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

Commit 4124a3c4 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: add type field to v4l2_modulator struct 



Add type field to that struct like it counterpart v4l2_tuner
already has. We need type field to distinguish different tuner
types from each others for transmitter too.

Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent be8ee526

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

+17 −1
Original line number Diff line number Diff line
@@ -1646,15 +1646,31 @@ static int v4l_s_tuner(const struct v4l2_ioctl_ops *ops, 
static int v4l_g_modulator(const struct v4l2_ioctl_ops *ops,

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

{

	struct video_device *vfd = video_devdata(file);

	struct v4l2_modulator *p = arg;

	int err;



	if (vfd->vfl_type == VFL_TYPE_RADIO)

		p->type = V4L2_TUNER_RADIO;



	err = ops->vidioc_g_modulator(file, fh, p);

	if (!err)

		p->capability |= V4L2_TUNER_CAP_FREQ_BANDS;

	return err;

}



static int v4l_s_modulator(const struct v4l2_ioctl_ops *ops,

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

{

	struct video_device *vfd = video_devdata(file);

	struct v4l2_modulator *p = arg;



	if (vfd->vfl_type == VFL_TYPE_RADIO)

		p->type = V4L2_TUNER_RADIO;



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

}



static int v4l_g_frequency(const struct v4l2_ioctl_ops *ops,

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

{
@@ -2441,7 +2457,7 @@ static struct v4l2_ioctl_info v4l2_ioctls[] = { 
	IOCTL_INFO_STD(VIDIOC_G_AUDOUT, vidioc_g_audout, v4l_print_audioout, 0),

	IOCTL_INFO_STD(VIDIOC_S_AUDOUT, vidioc_s_audout, v4l_print_audioout, INFO_FL_PRIO),

	IOCTL_INFO_FNC(VIDIOC_G_MODULATOR, v4l_g_modulator, v4l_print_modulator, INFO_FL_CLEAR(v4l2_modulator, index)),

	IOCTL_INFO_STD(VIDIOC_S_MODULATOR, vidioc_s_modulator, v4l_print_modulator, INFO_FL_PRIO),

	IOCTL_INFO_FNC(VIDIOC_S_MODULATOR, v4l_s_modulator, v4l_print_modulator, INFO_FL_PRIO),

	IOCTL_INFO_FNC(VIDIOC_G_FREQUENCY, v4l_g_frequency, v4l_print_frequency, INFO_FL_CLEAR(v4l2_frequency, tuner)),

	IOCTL_INFO_FNC(VIDIOC_S_FREQUENCY, v4l_s_frequency, v4l_print_frequency, INFO_FL_PRIO),

	IOCTL_INFO_FNC(VIDIOC_CROPCAP, v4l_cropcap, v4l_print_cropcap, INFO_FL_CLEAR(v4l2_cropcap, type)),

include/uapi/linux/videodev2.h

+2 −1
Original line number Diff line number Diff line
@@ -1593,7 +1593,8 @@ struct v4l2_modulator { 
	__u32			rangelow;

	__u32			rangehigh;

	__u32			txsubchans;

	__u32			reserved[4];

	__u32			type;	/* enum v4l2_tuner_type */

	__u32			reserved[3];

};



/*  Flags for the 'capability' field */