diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-09-12 17:05:11 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 01:05:57 -0200 |
| commit | 479567ce3af7b99d645a3c53b8ca2fc65e46efdc (patch) | |
| tree | d16fd87d5eec337c82fd195cd03ed301e883b68f /drivers/media/video/pwc/pwc.h | |
| parent | a1de2e4b72f27b906cb2eea3003fd62377dbf5ea (diff) | |
| download | kernel_samsung_smdk4412-479567ce3af7b99d645a3c53b8ca2fc65e46efdc.zip kernel_samsung_smdk4412-479567ce3af7b99d645a3c53b8ca2fc65e46efdc.tar.gz kernel_samsung_smdk4412-479567ce3af7b99d645a3c53b8ca2fc65e46efdc.tar.bz2 | |
V4L/DVB: pwc: fully convert driver to V4L2
Remove the V4L1 API from this driver, making it fully V4L2.
Also fix a bug where the /dev/videoX device was created too early, which led
to initialization problems of the camera, making it unable to capture video.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/pwc/pwc.h')
| -rw-r--r-- | drivers/media/video/pwc/pwc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/pwc/pwc.h b/drivers/media/video/pwc/pwc.h index f1b2066..36a9c83 100644 --- a/drivers/media/video/pwc/pwc.h +++ b/drivers/media/video/pwc/pwc.h @@ -34,7 +34,7 @@ #include <linux/mm.h> #include <linux/slab.h> #include <asm/errno.h> -#include <linux/videodev.h> +#include <linux/videodev2.h> #include <media/v4l2-common.h> #include <media/v4l2-ioctl.h> #ifdef CONFIG_USB_PWC_INPUT_EVDEV @@ -49,7 +49,7 @@ #define PWC_MINOR 0 #define PWC_EXTRAMINOR 12 #define PWC_VERSION_CODE KERNEL_VERSION(PWC_MAJOR,PWC_MINOR,PWC_EXTRAMINOR) -#define PWC_VERSION "10.0.13" +#define PWC_VERSION "10.0.14" #define PWC_NAME "pwc" #define PFX PWC_NAME ": " @@ -180,7 +180,7 @@ struct pwc_device int vcinterface; /* video control interface */ int valternate; /* alternate interface needed */ int vframes, vsize; /* frames-per-second & size (see PSZ_*) */ - int vpalette; /* palette: 420P, RAW or RGBBAYER */ + int pixfmt; /* pixelformat: V4L2_PIX_FMT_YUV420 or raw: _PWC1, _PWC2 */ int vframe_count; /* received frames */ int vframes_dumped; /* counter for dumped frames */ int vframes_error; /* frames received in error */ |