tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Hans Verkuil and committed by
Mauro Carvalho Chehab debff5a7 51270617

+22 -18
+14 -10
drivers/media/video/zoran/zoran.h
··· 33 33 34 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 + 36 40 struct zoran_requestbuffers { 37 41 unsigned long count; /* Number of buffers for MJPEG grabbing */ 38 42 unsigned long size; /* Size PER BUFFER in bytes */ ··· 52 48 struct zoran_status { 53 49 int input; /* Input channel, has to be set prior to BUZIOC_G_STATUS */ 54 50 int signal; /* Returned: 1 if valid video signal detected */ 55 - int norm; /* Returned: VIDEO_MODE_PAL or VIDEO_MODE_NTSC */ 51 + int norm; /* Returned: ZORAN_VIDMODE_PAL or ZORAN_VIDMODE_NTSC */ 56 52 int color; /* Returned: 1 if color signal detected */ 57 53 }; 58 54 ··· 66 62 /* Main control parameters */ 67 63 68 64 int input; /* Input channel: 0 = Composite, 1 = S-VHS */ 69 - int norm; /* Norm: VIDEO_MODE_PAL or VIDEO_MODE_NTSC */ 65 + int norm; /* Norm: ZORAN_VIDMODE_PAL or ZORAN_VIDMODE_NTSC */ 70 66 int decimation; /* decimation of captured video, 71 67 * enlargement of video played back. 72 68 * Valid values are 1, 2, 4 or 0. ··· 135 131 /* 136 132 Private IOCTL to set up for displaying MJPEG 137 133 */ 138 - #define BUZIOC_G_PARAMS _IOR ('v', BASE_VIDIOCPRIVATE+0, struct zoran_params) 139 - #define BUZIOC_S_PARAMS _IOWR('v', BASE_VIDIOCPRIVATE+1, struct zoran_params) 140 - #define BUZIOC_REQBUFS _IOWR('v', BASE_VIDIOCPRIVATE+2, struct zoran_requestbuffers) 141 - #define BUZIOC_QBUF_CAPT _IOW ('v', BASE_VIDIOCPRIVATE+3, int) 142 - #define BUZIOC_QBUF_PLAY _IOW ('v', BASE_VIDIOCPRIVATE+4, int) 143 - #define BUZIOC_SYNC _IOR ('v', BASE_VIDIOCPRIVATE+5, struct zoran_sync) 144 - #define BUZIOC_G_STATUS _IOWR('v', BASE_VIDIOCPRIVATE+6, struct zoran_status) 134 + #define BUZIOC_G_PARAMS _IOR ('v', BASE_VIDIOC_PRIVATE+0, struct zoran_params) 135 + #define BUZIOC_S_PARAMS _IOWR('v', BASE_VIDIOC_PRIVATE+1, struct zoran_params) 136 + #define BUZIOC_REQBUFS _IOWR('v', BASE_VIDIOC_PRIVATE+2, struct zoran_requestbuffers) 137 + #define BUZIOC_QBUF_CAPT _IOW ('v', BASE_VIDIOC_PRIVATE+3, int) 138 + #define BUZIOC_QBUF_PLAY _IOW ('v', BASE_VIDIOC_PRIVATE+4, int) 139 + #define BUZIOC_SYNC _IOR ('v', BASE_VIDIOC_PRIVATE+5, struct zoran_sync) 140 + #define BUZIOC_G_STATUS _IOWR('v', BASE_VIDIOC_PRIVATE+6, struct zoran_status) 145 141 146 142 147 143 #ifdef __KERNEL__ ··· 405 401 spinlock_t spinlock; /* Spinlock */ 406 402 407 403 /* Video for Linux parameters */ 408 - int input; /* card's norm and input - norm=VIDEO_MODE_* */ 404 + int input; /* card's norm and input */ 409 405 v4l2_std_id norm; 410 406 411 407 /* Current buffer params */
+8 -8
drivers/media/video/zoran/zoran_driver.c
··· 60 60 61 61 #include <linux/spinlock.h> 62 62 63 - #include <linux/videodev.h> 63 + #include <linux/videodev2.h> 64 64 #include <media/v4l2-common.h> 65 65 #include <media/v4l2-ioctl.h> 66 66 #include "videocodec.h" ··· 1549 1549 mutex_lock(&zr->resource_lock); 1550 1550 1551 1551 if (zr->norm & V4L2_STD_NTSC) 1552 - bparams->norm = VIDEO_MODE_NTSC; 1553 - else if (zr->norm & V4L2_STD_PAL) 1554 - bparams->norm = VIDEO_MODE_PAL; 1552 + bparams->norm = ZORAN_VIDMODE_NTSC; 1553 + else if (zr->norm & V4L2_STD_SECAM) 1554 + bparams->norm = ZORAN_VIDMODE_SECAM; 1555 1555 else 1556 - bparams->norm = VIDEO_MODE_SECAM; 1556 + bparams->norm = ZORAN_VIDMODE_PAL; 1557 1557 1558 1558 bparams->input = zr->input; 1559 1559 ··· 1789 1789 bstat->signal = 1790 1790 (status & V4L2_IN_ST_NO_SIGNAL) ? 0 : 1; 1791 1791 if (norm & V4L2_STD_NTSC) 1792 - bstat->norm = VIDEO_MODE_NTSC; 1792 + bstat->norm = ZORAN_VIDMODE_NTSC; 1793 1793 else if (norm & V4L2_STD_SECAM) 1794 - bstat->norm = VIDEO_MODE_SECAM; 1794 + bstat->norm = ZORAN_VIDMODE_SECAM; 1795 1795 else 1796 - bstat->norm = VIDEO_MODE_PAL; 1796 + bstat->norm = ZORAN_VIDMODE_PAL; 1797 1797 1798 1798 bstat->color = 1799 1799 (status & V4L2_IN_ST_NO_COLOR) ? 0 : 1;