aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/meye.h
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-03-22 04:22:34 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-17 23:52:36 -0400
commit51270617a52793c423ef68ddd3f18745e9abd15b (patch)
treea3e3f622458f1423b6c6d7fcaeb7f3e253a37066 /drivers/media/video/meye.h
parentc1f2b0f29e51cf44eb6addff1b90f99988055a92 (diff)
V4L/DVB: meye: remove last V4L1 remnants from the code and add v4l2_device
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/meye.h')
-rw-r--r--drivers/media/video/meye.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/media/video/meye.h b/drivers/media/video/meye.h
index 1321ad5d6597..4bdeb03f1644 100644
--- a/drivers/media/video/meye.h
+++ b/drivers/media/video/meye.h
@@ -31,7 +31,7 @@
31#define _MEYE_PRIV_H_ 31#define _MEYE_PRIV_H_
32 32
33#define MEYE_DRIVER_MAJORVERSION 1 33#define MEYE_DRIVER_MAJORVERSION 1
34#define MEYE_DRIVER_MINORVERSION 13 34#define MEYE_DRIVER_MINORVERSION 14
35 35
36#define MEYE_DRIVER_VERSION __stringify(MEYE_DRIVER_MAJORVERSION) "." \ 36#define MEYE_DRIVER_VERSION __stringify(MEYE_DRIVER_MAJORVERSION) "." \
37 __stringify(MEYE_DRIVER_MINORVERSION) 37 __stringify(MEYE_DRIVER_MINORVERSION)
@@ -289,6 +289,7 @@ struct meye_grab_buffer {
289 289
290/* Motion Eye device structure */ 290/* Motion Eye device structure */
291struct meye { 291struct meye {
292 struct v4l2_device v4l2_dev; /* Main v4l2_device struct */
292 struct pci_dev *mchip_dev; /* pci device */ 293 struct pci_dev *mchip_dev; /* pci device */
293 u8 mchip_irq; /* irq */ 294 u8 mchip_irq; /* irq */
294 u8 mchip_mode; /* actual mchip mode: HIC_MODE... */ 295 u8 mchip_mode; /* actual mchip mode: HIC_MODE... */
@@ -308,8 +309,11 @@ struct meye {
308 struct kfifo doneq; /* queue for grabbed buffers */ 309 struct kfifo doneq; /* queue for grabbed buffers */
309 spinlock_t doneq_lock; /* lock protecting the queue */ 310 spinlock_t doneq_lock; /* lock protecting the queue */
310 wait_queue_head_t proc_list; /* wait queue */ 311 wait_queue_head_t proc_list; /* wait queue */
311 struct video_device *video_dev; /* video device parameters */ 312 struct video_device *vdev; /* video device parameters */
312 struct video_picture picture; /* video picture parameters */ 313 u16 brightness;
314 u16 hue;
315 u16 contrast;
316 u16 colour;
313 struct meye_params params; /* additional parameters */ 317 struct meye_params params; /* additional parameters */
314 unsigned long in_use; /* set to 1 if the device is in use */ 318 unsigned long in_use; /* set to 1 if the device is in use */
315#ifdef CONFIG_PM 319#ifdef CONFIG_PM