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

Commit 84099a28 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: add new tuner types for SDR 



Define tuner types V4L2_TUNER_ADC and V4L2_TUNER_RF for SDR usage.

ADC is used for setting sampling rate (sampling frequency) to SDR
device.

Another tuner type, named as V4L2_TUNER_RF, is possible RF tuner.
Is is used to down-convert RF frequency to range ADC could sample.
Having RF tuner is optional, whilst in practice it is almost always
there.

Also add checks to VIDIOC_G_FREQUENCY, VIDIOC_S_FREQUENCY and
VIDIOC_ENUM_FREQ_BANDS only allow these two tuner types when device
type is SDR (VFL_TYPE_SDR). For VIDIOC_G_FREQUENCY we do not check
tuner type, instead override type with V4L2_TUNER_ADC in every
case (requested by Hans in order to keep functionality in line with
existing tuners and existing API does not specify it).

Prohibit VIDIOC_S_HW_FREQ_SEEK explicitly when device type is SDR,
as device cannot do hardware seek without a hardware demodulator.

Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent d42626bd

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

+28 −11
Original line number Diff line number Diff line
@@ -1291,6 +1291,9 @@ static int v4l_g_frequency(const struct v4l2_ioctl_ops *ops, 
	struct video_device *vfd = video_devdata(file);

	struct v4l2_frequency *p = arg;



	if (vfd->vfl_type == VFL_TYPE_SDR)

		p->type = V4L2_TUNER_ADC;

	else

		p->type = (vfd->vfl_type == VFL_TYPE_RADIO) ?

				V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;

	return ops->vidioc_g_frequency(file, fh, p);
@@ -1303,10 +1306,15 @@ static int v4l_s_frequency(const struct v4l2_ioctl_ops *ops, 
	const struct v4l2_frequency *p = arg;

	enum v4l2_tuner_type type;



	if (vfd->vfl_type == VFL_TYPE_SDR) {

		if (p->type != V4L2_TUNER_ADC && p->type != V4L2_TUNER_RF)

			return -EINVAL;

	} else {

		type = (vfd->vfl_type == VFL_TYPE_RADIO) ?

				V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;

	if (p->type != type)

		if (type != p->type)

			return -EINVAL;

	}

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

}
@@ -1386,6 +1394,10 @@ static int v4l_s_hw_freq_seek(const struct v4l2_ioctl_ops *ops, 
	struct v4l2_hw_freq_seek *p = arg;

	enum v4l2_tuner_type type;



	/* s_hw_freq_seek is not supported for SDR for now */

	if (vfd->vfl_type == VFL_TYPE_SDR)

		return -EINVAL;



	type = (vfd->vfl_type == VFL_TYPE_RADIO) ?

		V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;

	if (p->type != type)
@@ -1885,11 +1897,16 @@ static int v4l_enum_freq_bands(const struct v4l2_ioctl_ops *ops, 
	enum v4l2_tuner_type type;

	int err;



	if (vfd->vfl_type == VFL_TYPE_SDR) {

		if (p->type != V4L2_TUNER_ADC && p->type != V4L2_TUNER_RF)

			return -EINVAL;

		type = p->type;

	} else {

		type = (vfd->vfl_type == VFL_TYPE_RADIO) ?

				V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;



		if (type != p->type)

			return -EINVAL;

	}

	if (ops->vidioc_enum_freq_bands)

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

	if (is_valid_ioctl(vfd, VIDIOC_G_TUNER)) {

include/uapi/linux/videodev2.h

+2 −0
Original line number Diff line number Diff line
@@ -159,6 +159,8 @@ enum v4l2_tuner_type { 
	V4L2_TUNER_RADIO	     = 1,

	V4L2_TUNER_ANALOG_TV	     = 2,

	V4L2_TUNER_DIGITAL_TV	     = 3,

	V4L2_TUNER_ADC               = 4,

	V4L2_TUNER_RF                = 5,

};



enum v4l2_memory {