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

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

[media] V4L: remove V4L1 compatibility mode 



Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b69a219e

drivers/media/Kconfig

+0 −15
Original line number Diff line number Diff line
@@ -53,21 +53,6 @@ config VIDEO_ALLOW_V4L1 


	  If you are unsure as to whether this is required, answer Y.



config VIDEO_V4L1_COMPAT

	bool "Enable Video For Linux API 1 compatible Layer" if !VIDEO_ALLOW_V4L1

	depends on VIDEO_DEV

	default y

	---help---

	  Enables a compatibility API used by most V4L2 devices to allow

	  its usage with legacy applications that supports only V4L1 api.



	  Documentation for the original API is included in the file

	  <Documentation/video4linux/API.html>.



	  User tools for this are available from

	  <ftp://ftp.uk.linux.org/pub/linux/video4linux/>.



	  If you are unsure as to whether this is required, answer Y.



#

# DVB Core

drivers/media/common/saa7146_video.c

+0 −32
Original line number Diff line number Diff line
@@ -1129,35 +1129,6 @@ static int vidioc_g_chip_ident(struct file *file, void *__fh, 
			core, g_chip_ident, chip);

}



#ifdef CONFIG_VIDEO_V4L1_COMPAT

static int vidiocgmbuf(struct file *file, void *__fh, struct video_mbuf *mbuf)

{

	struct saa7146_fh *fh = __fh;

	struct videobuf_queue *q = &fh->video_q;

	int err, i;



	/* fixme: number of capture buffers and sizes for v4l apps */

	int gbuffers = 2;

	int gbufsize = 768 * 576 * 4;



	DEB_D(("VIDIOCGMBUF \n"));



	q = &fh->video_q;

	err = videobuf_mmap_setup(q, gbuffers, gbufsize,

			V4L2_MEMORY_MMAP);

	if (err < 0)

		return err;



	gbuffers = err;

	memset(mbuf, 0, sizeof(*mbuf));

	mbuf->frames = gbuffers;

	mbuf->size   = gbuffers * gbufsize;

	for (i = 0; i < gbuffers; i++)

		mbuf->offsets[i] = i * gbufsize;

	return 0;

}

#endif



const struct v4l2_ioctl_ops saa7146_video_ioctl_ops = {

	.vidioc_querycap             = vidioc_querycap,

	.vidioc_enum_fmt_vid_cap     = vidioc_enum_fmt_vid_cap,
@@ -1186,9 +1157,6 @@ const struct v4l2_ioctl_ops saa7146_video_ioctl_ops = { 
	.vidioc_streamon             = vidioc_streamon,

	.vidioc_streamoff            = vidioc_streamoff,

	.vidioc_g_parm 		     = vidioc_g_parm,

#ifdef CONFIG_VIDEO_V4L1_COMPAT

	.vidiocgmbuf                 = vidiocgmbuf,

#endif

};



/*********************************************************************************/

drivers/media/video/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -22,10 +22,6 @@ endif 


obj-$(CONFIG_VIDEO_V4L2_COMMON) += v4l2-common.o



ifeq ($(CONFIG_VIDEO_V4L1_COMPAT),y)

  obj-$(CONFIG_VIDEO_DEV) += v4l1-compat.o

endif



# All i2c modules must come first:



obj-$(CONFIG_VIDEO_TUNER) += tuner.o

drivers/media/video/au0828/au0828-video.c

+0 −12
Original line number Diff line number Diff line
@@ -1809,15 +1809,6 @@ static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *b) 
	return videobuf_dqbuf(&fh->vb_vidq, b, file->f_flags & O_NONBLOCK);

}



#ifdef CONFIG_VIDEO_V4L1_COMPAT

static int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf)

{

	struct au0828_fh *fh = priv;



	return videobuf_cgmbuf(&fh->vb_vidq, mbuf, 8);

}

#endif



static struct v4l2_file_operations au0828_v4l_fops = {

	.owner      = THIS_MODULE,

	.open       = au0828_v4l2_open,
@@ -1861,9 +1852,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = { 
	.vidioc_s_register          = vidioc_s_register,

#endif

	.vidioc_g_chip_ident        = vidioc_g_chip_ident,

#ifdef CONFIG_VIDEO_V4L1_COMPAT

	.vidiocgmbuf                = vidiocgmbuf,

#endif

};



static const struct video_device au0828_video_template = {

drivers/media/video/bt8xx/bttv-driver.c

+0 −28
Original line number Diff line number Diff line
@@ -2597,31 +2597,6 @@ static int bttv_s_fmt_vid_overlay(struct file *file, void *priv, 
	return setup_window_lock(fh, btv, &f->fmt.win, 1);

}



#ifdef CONFIG_VIDEO_V4L1_COMPAT

static int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf)

{

	int retval;

	unsigned int i;

	struct bttv_fh *fh = priv;



	retval = __videobuf_mmap_setup(&fh->cap, gbuffers, gbufsize,

				     V4L2_MEMORY_MMAP);

	if (retval < 0) {

		return retval;

	}



	gbuffers = retval;

	memset(mbuf, 0, sizeof(*mbuf));

	mbuf->frames = gbuffers;

	mbuf->size   = gbuffers * gbufsize;



	for (i = 0; i < gbuffers; i++)

		mbuf->offsets[i] = i * gbufsize;



	return 0;

}

#endif



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

				struct v4l2_capability *cap)

{
@@ -3354,9 +3329,6 @@ static const struct v4l2_ioctl_ops bttv_ioctl_ops = { 
	.vidioc_streamoff               = bttv_streamoff,

	.vidioc_g_tuner                 = bttv_g_tuner,

	.vidioc_s_tuner                 = bttv_s_tuner,

#ifdef CONFIG_VIDEO_V4L1_COMPAT

	.vidiocgmbuf                    = vidiocgmbuf,

#endif

	.vidioc_g_crop                  = bttv_g_crop,

	.vidioc_s_crop                  = bttv_s_crop,

	.vidioc_g_fbuf                  = bttv_g_fbuf,