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

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

[media] em28xx: remove sliced VBI support 



The sliced VBI support in the tvp5150 is completely broken. And there is no
support for the saa7115 sliced VBI implementation in the em28xx driver. So
we remove the sliced VBI support completely.
It should be possible to get it to work with the tvp5150, but that will
require someone to really dig into that driver.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarDevin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d8c95c08

drivers/media/usb/em28xx/em28xx-video.c

+2 −47
Original line number Original line Diff line number Diff line
@@ -1438,8 +1438,7 @@ static int vidioc_querycap(struct file *file, void *priv, 
	else if (vdev->vfl_type == VFL_TYPE_RADIO)

	else if (vdev->vfl_type == VFL_TYPE_RADIO)

		cap->device_caps = V4L2_CAP_RADIO;

		cap->device_caps = V4L2_CAP_RADIO;

	else

	else

		cap->device_caps = V4L2_CAP_READWRITE |

		cap->device_caps = V4L2_CAP_READWRITE | V4L2_CAP_VBI_CAPTURE;

			V4L2_CAP_VBI_CAPTURE | V4L2_CAP_SLICED_VBI_CAPTURE;





	if (dev->audio_mode.has_audio)

	if (dev->audio_mode.has_audio)

		cap->device_caps |= V4L2_CAP_AUDIO;

		cap->device_caps |= V4L2_CAP_AUDIO;
@@ -1450,8 +1449,7 @@ static int vidioc_querycap(struct file *file, void *priv, 
	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS |

	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS |

		V4L2_CAP_READWRITE | V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;

		V4L2_CAP_READWRITE | V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;

	if (dev->vbi_dev)

	if (dev->vbi_dev)

		cap->capabilities |=

		cap->capabilities |= V4L2_CAP_VBI_CAPTURE;

			V4L2_CAP_VBI_CAPTURE | V4L2_CAP_SLICED_VBI_CAPTURE;

	if (dev->radio_dev)

	if (dev->radio_dev)

		cap->capabilities |= V4L2_CAP_RADIO;

		cap->capabilities |= V4L2_CAP_RADIO;

	return 0;

	return 0;
@@ -1508,46 +1506,6 @@ static int vidioc_enum_framesizes(struct file *file, void *priv, 
	return 0;

	return 0;

}

}





/* Sliced VBI ioctls */

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

					struct v4l2_format *f)

{

	struct em28xx_fh      *fh  = priv;

	struct em28xx         *dev = fh->dev;

	int                   rc;



	rc = check_dev(dev);

	if (rc < 0)

		return rc;



	f->fmt.sliced.service_set = 0;

	v4l2_device_call_all(&dev->v4l2_dev, 0, vbi, g_sliced_fmt, &f->fmt.sliced);



	if (f->fmt.sliced.service_set == 0)

		rc = -EINVAL;



	return rc;

}



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

			struct v4l2_format *f)

{

	struct em28xx_fh      *fh  = priv;

	struct em28xx         *dev = fh->dev;

	int                   rc;



	rc = check_dev(dev);

	if (rc < 0)

		return rc;



	v4l2_device_call_all(&dev->v4l2_dev, 0, vbi, g_sliced_fmt, &f->fmt.sliced);



	if (f->fmt.sliced.service_set == 0)

		return -EINVAL;



	return 0;

}



/* RAW VBI ioctls */

/* RAW VBI ioctls */





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

static int vidioc_g_fmt_vbi_cap(struct file *file, void *priv,
@@ -2038,9 +1996,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = { 
	.vidioc_g_audio             = vidioc_g_audio,

	.vidioc_g_audio             = vidioc_g_audio,

	.vidioc_s_audio             = vidioc_s_audio,

	.vidioc_s_audio             = vidioc_s_audio,

	.vidioc_cropcap             = vidioc_cropcap,

	.vidioc_cropcap             = vidioc_cropcap,

	.vidioc_g_fmt_sliced_vbi_cap   = vidioc_g_fmt_sliced_vbi_cap,

	.vidioc_try_fmt_sliced_vbi_cap = vidioc_try_set_sliced_vbi_cap,

	.vidioc_s_fmt_sliced_vbi_cap   = vidioc_try_set_sliced_vbi_cap,





	.vidioc_reqbufs             = vidioc_reqbufs,

	.vidioc_reqbufs             = vidioc_reqbufs,

	.vidioc_querybuf            = vidioc_querybuf,

	.vidioc_querybuf            = vidioc_querybuf,