aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/zoran
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-03-22 04:25:46 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-17 23:52:41 -0400
commitdebff5a79595356b1d10063c5f5a7bcdf1b54bec (patch)
tree3680743fc9d5bdf5a2350228b2b7f7aa2e3c22d0 /drivers/media/video/zoran
parent51270617a52793c423ef68ddd3f18745e9abd15b (diff)
V4L/DVB: zoran: remove V4L1 videodev.h include
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/zoran')
-rw-r--r--drivers/media/video/zoran/zoran.h24
-rw-r--r--drivers/media/video/zoran/zoran_driver.c16
2 files changed, 22 insertions, 18 deletions
diff --git a/drivers/media/video/zoran/zoran.h b/drivers/media/video/zoran/zoran.h
index cb1de7ea197a..8997add1248e 100644
--- a/drivers/media/video/zoran/zoran.h
+++ b/drivers/media/video/zoran/zoran.h
@@ -33,6 +33,10 @@
33 33
34#include <media/v4l2-device.h> 34#include <media/v4l2-device.h>
35 35
36#define ZORAN_VIDMODE_PAL 0
37#define ZORAN_VIDMODE_NTSC 1
38#define ZORAN_VIDMODE_SECAM 2
39
36struct zoran_requestbuffers { 40struct zoran_requestbuffers {
37 unsigned long count; /* Number of buffers for MJPEG grabbing */ 41 unsigned long count; /* Number of buffers for MJPEG grabbing */
38 unsigned long size; /* Size PER BUFFER in bytes */ 42 unsigned long size; /* Size PER BUFFER in bytes */
@@ -48,7 +52,7 @@ struct zoran_sync {
48struct zoran_status { 52struct zoran_status {
49 int input; /* Input channel, has to be set prior to BUZIOC_G_STATUS */ 53 int input; /* Input channel, has to be set prior to BUZIOC_G_STATUS */
50 int signal; /* Returned: 1 if valid video signal detected */ 54 int signal; /* Returned: 1 if valid video signal detected */
51 int norm; /* Returned: VIDEO_MODE_PAL or VIDEO_MODE_NTSC */ 55 int norm; /* Returned: ZORAN_VIDMODE_PAL or ZORAN_VIDMODE_NTSC */
52 int color; /* Returned: 1 if color signal detected */ 56 int color; /* Returned: 1 if color signal detected */
53}; 57};
54 58
@@ -62,7 +66,7 @@ struct zoran_params {
62 /* Main control parameters */ 66 /* Main control parameters */
63 67
64 int input; /* Input channel: 0 = Composite, 1 = S-VHS */ 68 int input; /* Input channel: 0 = Composite, 1 = S-VHS */
65 int norm; /* Norm: VIDEO_MODE_PAL or VIDEO_MODE_NTSC */ 69 int norm; /* Norm: ZORAN_VIDMODE_PAL or ZORAN_VIDMODE_NTSC */
66 int decimation; /* decimation of captured video, 70 int decimation; /* decimation of captured video,
67 * enlargement of video played back. 71 * enlargement of video played back.
68 * Valid values are 1, 2, 4 or 0. 72 * Valid values are 1, 2, 4 or 0.
@@ -131,13 +135,13 @@ struct zoran_params {
131/* 135/*
132Private IOCTL to set up for displaying MJPEG 136Private IOCTL to set up for displaying MJPEG
133*/ 137*/
134#define BUZIOC_G_PARAMS _IOR ('v', BASE_VIDIOCPRIVATE+0, struct zoran_params) 138#define BUZIOC_G_PARAMS _IOR ('v', BASE_VIDIOC_PRIVATE+0, struct zoran_params)
135#define BUZIOC_S_PARAMS _IOWR('v', BASE_VIDIOCPRIVATE+1, struct zoran_params) 139#define BUZIOC_S_PARAMS _IOWR('v', BASE_VIDIOC_PRIVATE+1, struct zoran_params)
136#define BUZIOC_REQBUFS _IOWR('v', BASE_VIDIOCPRIVATE+2, struct zoran_requestbuffers) 140#define BUZIOC_REQBUFS _IOWR('v', BASE_VIDIOC_PRIVATE+2, struct zoran_requestbuffers)
137#define BUZIOC_QBUF_CAPT _IOW ('v', BASE_VIDIOCPRIVATE+3, int) 141#define BUZIOC_QBUF_CAPT _IOW ('v', BASE_VIDIOC_PRIVATE+3, int)
138#define BUZIOC_QBUF_PLAY _IOW ('v', BASE_VIDIOCPRIVATE+4, int) 142#define BUZIOC_QBUF_PLAY _IOW ('v', BASE_VIDIOC_PRIVATE+4, int)
139#define BUZIOC_SYNC _IOR ('v', BASE_VIDIOCPRIVATE+5, struct zoran_sync) 143#define BUZIOC_SYNC _IOR ('v', BASE_VIDIOC_PRIVATE+5, struct zoran_sync)
140#define BUZIOC_G_STATUS _IOWR('v', BASE_VIDIOCPRIVATE+6, struct zoran_status) 144#define BUZIOC_G_STATUS _IOWR('v', BASE_VIDIOC_PRIVATE+6, struct zoran_status)
141 145
142 146
143#ifdef __KERNEL__ 147#ifdef __KERNEL__
@@ -401,7 +405,7 @@ struct zoran {
401 spinlock_t spinlock; /* Spinlock */ 405 spinlock_t spinlock; /* Spinlock */
402 406
403 /* Video for Linux parameters */ 407 /* Video for Linux parameters */
404 int input; /* card's norm and input - norm=VIDEO_MODE_* */ 408 int input; /* card's norm and input */
405 v4l2_std_id norm; 409 v4l2_std_id norm;
406 410
407 /* Current buffer params */ 411 /* Current buffer params */
diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index ec41303544e5..6f89d0a096ea 100644
--- a/drivers/media/video/zoran/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
@@ -60,7 +60,7 @@
60 60
61#include <linux/spinlock.h> 61#include <linux/spinlock.h>
62 62
63#include <linux/videodev.h> 63#include <linux/videodev2.h>
64#include <media/v4l2-common.h> 64#include <media/v4l2-common.h>
65#include <media/v4l2-ioctl.h> 65#include <media/v4l2-ioctl.h>
66#include "videocodec.h" 66#include "videocodec.h"
@@ -1549,11 +1549,11 @@ static long zoran_default(struct file *file, void *__fh, int cmd, void *arg)
1549 mutex_lock(&zr->resource_lock); 1549 mutex_lock(&zr->resource_lock);
1550 1550
1551 if (zr->norm & V4L2_STD_NTSC) 1551 if (zr->norm & V4L2_STD_NTSC)
1552 bparams->norm = VIDEO_MODE_NTSC; 1552 bparams->norm = ZORAN_VIDMODE_NTSC;
1553 else if (zr->norm & V4L2_STD_PAL) 1553 else if (zr->norm & V4L2_STD_SECAM)
1554 bparams->norm = VIDEO_MODE_PAL; 1554 bparams->norm = ZORAN_VIDMODE_SECAM;
1555 else 1555 else
1556 bparams->norm = VIDEO_MODE_SECAM; 1556 bparams->norm = ZORAN_VIDMODE_PAL;
1557 1557
1558 bparams->input = zr->input; 1558 bparams->input = zr->input;
1559 1559
@@ -1789,11 +1789,11 @@ gstat_unlock_and_return:
1789 bstat->signal = 1789 bstat->signal =
1790 (status & V4L2_IN_ST_NO_SIGNAL) ? 0 : 1; 1790 (status & V4L2_IN_ST_NO_SIGNAL) ? 0 : 1;
1791 if (norm & V4L2_STD_NTSC) 1791 if (norm & V4L2_STD_NTSC)
1792 bstat->norm = VIDEO_MODE_NTSC; 1792 bstat->norm = ZORAN_VIDMODE_NTSC;
1793 else if (norm & V4L2_STD_SECAM) 1793 else if (norm & V4L2_STD_SECAM)
1794 bstat->norm = VIDEO_MODE_SECAM; 1794 bstat->norm = ZORAN_VIDMODE_SECAM;
1795 else 1795 else
1796 bstat->norm = VIDEO_MODE_PAL; 1796 bstat->norm = ZORAN_VIDMODE_PAL;
1797 1797
1798 bstat->color = 1798 bstat->color =
1799 (status & V4L2_IN_ST_NO_COLOR) ? 0 : 1; 1799 (status & V4L2_IN_ST_NO_COLOR) ? 0 : 1;