microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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>
This commit is contained in:
Hans Verkuil 2010-03-22 05:25:46 -03:00 коммит произвёл Mauro Carvalho Chehab
Родитель 51270617a5
Коммит debff5a795
2 изменённых файлов: 22 добавлений и 18 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

24
drivers/media/video/zoran/zoran.h
Просмотреть файл

@ -33,6 +33,10 @@
#include <media/v4l2-device.h> #include <media/v4l2-device.h>
#define ZORAN_VIDMODE_PAL 0
#define ZORAN_VIDMODE_NTSC 1
#define ZORAN_VIDMODE_SECAM 2
struct zoran_requestbuffers { struct zoran_requestbuffers {
unsigned long count; /* Number of buffers for MJPEG grabbing */ unsigned long count; /* Number of buffers for MJPEG grabbing */
unsigned long size; /* Size PER BUFFER in bytes */ unsigned long size; /* Size PER BUFFER in bytes */
@ -48,7 +52,7 @@ struct zoran_sync {
struct zoran_status { struct zoran_status {
int input; /* Input channel, has to be set prior to BUZIOC_G_STATUS */ int input; /* Input channel, has to be set prior to BUZIOC_G_STATUS */
int signal; /* Returned: 1 if valid video signal detected */ int signal; /* Returned: 1 if valid video signal detected */
int norm; /* Returned: VIDEO_MODE_PAL or VIDEO_MODE_NTSC */ int norm; /* Returned: ZORAN_VIDMODE_PAL or ZORAN_VIDMODE_NTSC */
int color; /* Returned: 1 if color signal detected */ int color; /* Returned: 1 if color signal detected */
}; };
@ -62,7 +66,7 @@ struct zoran_params {
/* Main control parameters */ /* Main control parameters */
int input; /* Input channel: 0 = Composite, 1 = S-VHS */ int input; /* Input channel: 0 = Composite, 1 = S-VHS */
int norm; /* Norm: VIDEO_MODE_PAL or VIDEO_MODE_NTSC */ int norm; /* Norm: ZORAN_VIDMODE_PAL or ZORAN_VIDMODE_NTSC */
int decimation; /* decimation of captured video, int decimation; /* decimation of captured video,
* enlargement of video played back. * enlargement of video played back.
* Valid values are 1, 2, 4 or 0. * Valid values are 1, 2, 4 or 0.
@ -131,13 +135,13 @@ struct zoran_params {
/* /*
Private IOCTL to set up for displaying MJPEG Private IOCTL to set up for displaying MJPEG
*/ */
#define BUZIOC_G_PARAMS _IOR ('v', BASE_VIDIOCPRIVATE+0, struct zoran_params) #define BUZIOC_G_PARAMS _IOR ('v', BASE_VIDIOC_PRIVATE+0, struct zoran_params)
#define BUZIOC_S_PARAMS _IOWR('v', BASE_VIDIOCPRIVATE+1, struct zoran_params) #define BUZIOC_S_PARAMS _IOWR('v', BASE_VIDIOC_PRIVATE+1, struct zoran_params)
#define BUZIOC_REQBUFS _IOWR('v', BASE_VIDIOCPRIVATE+2, struct zoran_requestbuffers) #define BUZIOC_REQBUFS _IOWR('v', BASE_VIDIOC_PRIVATE+2, struct zoran_requestbuffers)
#define BUZIOC_QBUF_CAPT _IOW ('v', BASE_VIDIOCPRIVATE+3, int) #define BUZIOC_QBUF_CAPT _IOW ('v', BASE_VIDIOC_PRIVATE+3, int)
#define BUZIOC_QBUF_PLAY _IOW ('v', BASE_VIDIOCPRIVATE+4, int) #define BUZIOC_QBUF_PLAY _IOW ('v', BASE_VIDIOC_PRIVATE+4, int)
#define BUZIOC_SYNC _IOR ('v', BASE_VIDIOCPRIVATE+5, struct zoran_sync) #define BUZIOC_SYNC _IOR ('v', BASE_VIDIOC_PRIVATE+5, struct zoran_sync)
#define BUZIOC_G_STATUS _IOWR('v', BASE_VIDIOCPRIVATE+6, struct zoran_status) #define BUZIOC_G_STATUS _IOWR('v', BASE_VIDIOC_PRIVATE+6, struct zoran_status)
#ifdef __KERNEL__ #ifdef __KERNEL__
@ -401,7 +405,7 @@ struct zoran {
spinlock_t spinlock; /* Spinlock */ spinlock_t spinlock; /* Spinlock */
/* Video for Linux parameters */ /* Video for Linux parameters */
int input; /* card's norm and input - norm=VIDEO_MODE_* */ int input; /* card's norm and input */
v4l2_std_id norm; v4l2_std_id norm;
/* Current buffer params */ /* Current buffer params */

16
drivers/media/video/zoran/zoran_driver.c
Просмотреть файл

@ -60,7 +60,7 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/videodev.h> #include <linux/videodev2.h>
#include <media/v4l2-common.h> #include <media/v4l2-common.h>
#include <media/v4l2-ioctl.h> #include <media/v4l2-ioctl.h>
#include "videocodec.h" #include "videocodec.h"
@ -1549,11 +1549,11 @@ static long zoran_default(struct file *file, void *__fh, int cmd, void *arg)
mutex_lock(&zr->resource_lock); mutex_lock(&zr->resource_lock);
if (zr->norm & V4L2_STD_NTSC) if (zr->norm & V4L2_STD_NTSC)
bparams->norm = VIDEO_MODE_NTSC; bparams->norm = ZORAN_VIDMODE_NTSC;
else if (zr->norm & V4L2_STD_PAL) else if (zr->norm & V4L2_STD_SECAM)
bparams->norm = VIDEO_MODE_PAL; bparams->norm = ZORAN_VIDMODE_SECAM;
else else
bparams->norm = VIDEO_MODE_SECAM; bparams->norm = ZORAN_VIDMODE_PAL;
bparams->input = zr->input; bparams->input = zr->input;
@ -1789,11 +1789,11 @@ gstat_unlock_and_return:
bstat->signal = bstat->signal =
(status & V4L2_IN_ST_NO_SIGNAL) ? 0 : 1; (status & V4L2_IN_ST_NO_SIGNAL) ? 0 : 1;
if (norm & V4L2_STD_NTSC) if (norm & V4L2_STD_NTSC)
bstat->norm = VIDEO_MODE_NTSC; bstat->norm = ZORAN_VIDMODE_NTSC;
else if (norm & V4L2_STD_SECAM) else if (norm & V4L2_STD_SECAM)
bstat->norm = VIDEO_MODE_SECAM; bstat->norm = ZORAN_VIDMODE_SECAM;
else else
bstat->norm = VIDEO_MODE_PAL; bstat->norm = ZORAN_VIDMODE_PAL;
bstat->color = bstat->color =
(status & V4L2_IN_ST_NO_COLOR) ? 0 : 1; (status & V4L2_IN_ST_NO_COLOR) ? 0 : 1;