aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/common
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-12-24 08:33:19 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-29 05:17:07 -0500
commit08af245de0cf6ab5f4ed008ee2bb99273774fce0 (patch)
treed07a9b38eb4b9442ef0e935063a5f7f40248e19e /drivers/media/common
parentb69a219e0e97441dbeb0262cf85468b61a161399 (diff)
[media] V4L: remove V4L1 compatibility mode
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common')
-rw-r--r--drivers/media/common/saa7146_video.c32
1 files changed, 0 insertions, 32 deletions
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index d246910129e8..0ac5c619aecf 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -1129,35 +1129,6 @@ static int vidioc_g_chip_ident(struct file *file, void *__fh,
1129 core, g_chip_ident, chip); 1129 core, g_chip_ident, chip);
1130} 1130}
1131 1131
1132#ifdef CONFIG_VIDEO_V4L1_COMPAT
1133static int vidiocgmbuf(struct file *file, void *__fh, struct video_mbuf *mbuf)
1134{
1135 struct saa7146_fh *fh = __fh;
1136 struct videobuf_queue *q = &fh->video_q;
1137 int err, i;
1138
1139 /* fixme: number of capture buffers and sizes for v4l apps */
1140 int gbuffers = 2;
1141 int gbufsize = 768 * 576 * 4;
1142
1143 DEB_D(("VIDIOCGMBUF \n"));
1144
1145 q = &fh->video_q;
1146 err = videobuf_mmap_setup(q, gbuffers, gbufsize,
1147 V4L2_MEMORY_MMAP);
1148 if (err < 0)
1149 return err;
1150
1151 gbuffers = err;
1152 memset(mbuf, 0, sizeof(*mbuf));
1153 mbuf->frames = gbuffers;
1154 mbuf->size = gbuffers * gbufsize;
1155 for (i = 0; i < gbuffers; i++)
1156 mbuf->offsets[i] = i * gbufsize;
1157 return 0;
1158}
1159#endif
1160
1161const struct v4l2_ioctl_ops saa7146_video_ioctl_ops = { 1132const struct v4l2_ioctl_ops saa7146_video_ioctl_ops = {
1162 .vidioc_querycap = vidioc_querycap, 1133 .vidioc_querycap = vidioc_querycap,
1163 .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap, 1134 .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
@@ -1186,9 +1157,6 @@ const struct v4l2_ioctl_ops saa7146_video_ioctl_ops = {
1186 .vidioc_streamon = vidioc_streamon, 1157 .vidioc_streamon = vidioc_streamon,
1187 .vidioc_streamoff = vidioc_streamoff, 1158 .vidioc_streamoff = vidioc_streamoff,
1188 .vidioc_g_parm = vidioc_g_parm, 1159 .vidioc_g_parm = vidioc_g_parm,
1189#ifdef CONFIG_VIDEO_V4L1_COMPAT
1190 .vidiocgmbuf = vidiocgmbuf,
1191#endif
1192}; 1160};
1193 1161
1194/*********************************************************************************/ 1162/*********************************************************************************/