diff options
48 files changed, 52 insertions, 34 deletions
diff --git a/drivers/media/radio/miropcm20-radio.c b/drivers/media/radio/miropcm20-radio.c index 7765c6a0cfe..c4312fa0e2f 100644 --- a/drivers/media/radio/miropcm20-radio.c +++ b/drivers/media/radio/miropcm20-radio.c @@ -22,6 +22,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include "oss/aci.h" #include "miropcm20-rds-core.h" diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c index 36119d77f86..df22a582e7a 100644 --- a/drivers/media/radio/radio-aimslab.c +++ b/drivers/media/radio/radio-aimslab.c @@ -34,6 +34,7 @@ #include <asm/io.h> /* outb, outb_p */ #include <asm/uaccess.h> /* copy to/from user */ #include <linux/videodev.h> /* kernel radio structs */ +#include <media/v4l2-common.h> #include <linux/config.h> /* CONFIG_RADIO_RTRACK_PORT */ #include <asm/semaphore.h> /* Lock for the I/O */ diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c index ca676245c07..95e6322133e 100644 --- a/drivers/media/radio/radio-aztech.c +++ b/drivers/media/radio/radio-aztech.c @@ -31,6 +31,7 @@ #include <asm/io.h> /* outb, outb_p */ #include <asm/uaccess.h> /* copy to/from user */ #include <linux/videodev.h> /* kernel radio structs */ +#include <media/v4l2-common.h> #include <linux/config.h> /* CONFIG_RADIO_AZTECH_PORT */ /* acceptable ports: 0x350 (JP3 shorted), 0x358 (JP3 open) */ diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c index c048454c7ba..8641aec7baf 100644 --- a/drivers/media/radio/radio-cadet.c +++ b/drivers/media/radio/radio-cadet.c @@ -34,6 +34,7 @@ #include <asm/io.h> /* outb, outb_p */ #include <asm/uaccess.h> /* copy to/from user */ #include <linux/videodev.h> /* kernel radio structs */ +#include <media/v4l2-common.h> #include <linux/param.h> #include <linux/pnp.h> diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c index d5c3c4b878c..9f249e7e60c 100644 --- a/drivers/media/radio/radio-gemtek-pci.c +++ b/drivers/media/radio/radio-gemtek-pci.c @@ -44,6 +44,7 @@ #include <linux/init.h> #include <linux/pci.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/errno.h> #include <asm/io.h> diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c index 77a1e12333a..162f37d8bf9 100644 --- a/drivers/media/radio/radio-gemtek.c +++ b/drivers/media/radio/radio-gemtek.c @@ -22,6 +22,7 @@ #include <asm/io.h> /* outb, outb_p */ #include <asm/uaccess.h> /* copy to/from user */ #include <linux/videodev.h> /* kernel radio structs */ +#include <media/v4l2-common.h> #include <linux/config.h> /* CONFIG_RADIO_GEMTEK_PORT */ #include <linux/spinlock.h> diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c index 2501792e1fa..fcfa6c9fe22 100644 --- a/drivers/media/radio/radio-maestro.c +++ b/drivers/media/radio/radio-maestro.c @@ -26,7 +26,7 @@ #include <linux/mutex.h> #include <linux/pci.h> #include <linux/videodev.h> - +#include <media/v4l2-common.h> #define DRIVER_VERSION "0.05" diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c index fe255256969..f93d7afe730 100644 --- a/drivers/media/radio/radio-maxiradio.c +++ b/drivers/media/radio/radio-maxiradio.c @@ -41,6 +41,7 @@ #include <linux/pci.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> /* version 0.75 Sun Feb 4 22:51:27 EET 2001 */ #define DRIVER_VERSION "0.75" diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c index 3821d25ed41..5b68ac4c732 100644 --- a/drivers/media/radio/radio-rtrack2.c +++ b/drivers/media/radio/radio-rtrack2.c @@ -15,6 +15,7 @@ #include <asm/io.h> /* outb, outb_p */ #include <asm/uaccess.h> /* copy to/from user */ #include <linux/videodev.h> /* kernel radio structs */ +#include <media/v4l2-common.h> #include <linux/config.h> /* CONFIG_RADIO_RTRACK2_PORT */ #include <linux/spinlock.h> diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c index 70cfbc3910d..efee6e339d1 100644 --- a/drivers/media/radio/radio-sf16fmi.c +++ b/drivers/media/radio/radio-sf16fmi.c @@ -21,6 +21,7 @@ #include <linux/ioport.h> /* request_region */ #include <linux/delay.h> /* udelay */ #include <linux/videodev.h> /* kernel radio structs */ +#include <media/v4l2-common.h> #include <linux/isapnp.h> #include <asm/io.h> /* outb, outb_p */ #include <asm/uaccess.h> /* copy to/from user */ diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c index ca560a4cd41..3483b2c7bc9 100644 --- a/drivers/media/radio/radio-sf16fmr2.c +++ b/drivers/media/radio/radio-sf16fmr2.c @@ -19,6 +19,7 @@ #include <asm/io.h> /* outb, outb_p */ #include <asm/uaccess.h> /* copy to/from user */ #include <linux/videodev.h> /* kernel radio structs */ +#include <media/v4l2-common.h> #include <linux/mutex.h> static struct mutex lock; diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c index 3ac0c361b9a..dfba4ae596c 100644 --- a/drivers/media/radio/radio-terratec.c +++ b/drivers/media/radio/radio-terratec.c @@ -30,6 +30,7 @@ #include <asm/io.h> /* outb, outb_p */ #include <asm/uaccess.h> /* copy to/from user */ #include <linux/videodev.h> /* kernel radio structs */ +#include <media/v4l2-common.h> #include <linux/config.h> /* CONFIG_RADIO_TERRATEC_PORT */ #include <linux/spinlock.h> diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c index efcec0181c2..8da4badc22b 100644 --- a/drivers/media/radio/radio-trust.c +++ b/drivers/media/radio/radio-trust.c @@ -22,6 +22,7 @@ #include <asm/io.h> #include <asm/uaccess.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/config.h> /* CONFIG_RADIO_TRUST_PORT */ /* acceptable ports: 0x350 (JP3 shorted), 0x358 (JP3 open) */ diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c index e4240990668..cf4fc08bd8a 100644 --- a/drivers/media/radio/radio-typhoon.c +++ b/drivers/media/radio/radio-typhoon.c @@ -36,6 +36,7 @@ #include <asm/io.h> /* outb, outb_p */ #include <asm/uaccess.h> /* copy to/from user */ #include <linux/videodev.h> /* kernel radio structs */ +#include <media/v4l2-common.h> #include <linux/config.h> /* CONFIG_RADIO_TYPHOON_* */ #define BANNER "Typhoon Radio Card driver v0.1\n" diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c index 8aceea08398..59b86a6b4b0 100644 --- a/drivers/media/radio/radio-zoltrix.c +++ b/drivers/media/radio/radio-zoltrix.c @@ -33,6 +33,7 @@ #include <asm/io.h> /* outb, outb_p */ #include <asm/uaccess.h> /* copy to/from user */ #include <linux/videodev.h> /* kernel radio structs */ +#include <media/v4l2-common.h> #include <linux/config.h> /* CONFIG_RADIO_ZOLTRIX_PORT */ #ifndef CONFIG_RADIO_ZOLTRIX_PORT diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c index dbe02517059..53824cc229f 100644 --- a/drivers/media/video/arv.c +++ b/drivers/media/video/arv.c @@ -31,6 +31,7 @@ #include <linux/mm.h> #include <linux/sched.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/mutex.h> #include <asm/uaccess.h> diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h index 4183a21cf16..d2956010f76 100644 --- a/drivers/media/video/bt8xx/bttvp.h +++ b/drivers/media/video/bt8xx/bttvp.h @@ -33,6 +33,7 @@ #include <linux/i2c.h> #include <linux/i2c-algo-bit.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/pci.h> #include <linux/input.h> #include <linux/mutex.h> diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c index cf61c590f4a..709c07cee29 100644 --- a/drivers/media/video/bw-qcam.c +++ b/drivers/media/video/bw-qcam.c @@ -73,6 +73,7 @@ OTHER DEALINGS IN THE SOFTWARE. #include <linux/parport.h> #include <linux/sched.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/mutex.h> #include <asm/uaccess.h> diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c index 22a7386bbea..a3989bd2f81 100644 --- a/drivers/media/video/c-qcam.c +++ b/drivers/media/video/c-qcam.c @@ -34,6 +34,7 @@ #include <linux/parport.h> #include <linux/sched.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/mutex.h> #include <asm/uaccess.h> diff --git a/drivers/media/video/cpia.h b/drivers/media/video/cpia.h index 3dc88b7558b..6eaa692021c 100644 --- a/drivers/media/video/cpia.h +++ b/drivers/media/video/cpia.h @@ -45,6 +45,7 @@ #include <asm/uaccess.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/list.h> #include <linux/smp_lock.h> #include <linux/mutex.h> diff --git a/drivers/media/video/cpia2/cpia2.h b/drivers/media/video/cpia2/cpia2.h index 1764991b0ac..c5ecb2be5f9 100644 --- a/drivers/media/video/cpia2/cpia2.h +++ b/drivers/media/video/cpia2/cpia2.h @@ -33,6 +33,7 @@ #include <linux/version.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/usb.h> #include <linux/poll.h> diff --git a/drivers/media/video/dsbr100.c b/drivers/media/video/dsbr100.c index 3b4e9985c3d..f7e33f9ee8e 100644 --- a/drivers/media/video/dsbr100.c +++ b/drivers/media/video/dsbr100.c @@ -72,6 +72,7 @@ #include <linux/slab.h> #include <linux/input.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/usb.h> #include <linux/smp_lock.h> diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c index 595a3ea7574..f68ca7d9f53 100644 --- a/drivers/media/video/meye.c +++ b/drivers/media/video/meye.c @@ -32,6 +32,7 @@ #include <linux/sched.h> #include <linux/init.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <asm/uaccess.h> #include <asm/io.h> #include <linux/delay.h> diff --git a/drivers/media/video/ov511.h b/drivers/media/video/ov511.h index 12b3d51e1c3..68b082bcee1 100644 --- a/drivers/media/video/ov511.h +++ b/drivers/media/video/ov511.h @@ -3,6 +3,7 @@ #include <asm/uaccess.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/smp_lock.h> #include <linux/usb.h> #include <linux/mutex.h> diff --git a/drivers/media/video/planb.c b/drivers/media/video/planb.c index d9e3cada52f..3484e36b680 100644 --- a/drivers/media/video/planb.c +++ b/drivers/media/video/planb.c @@ -40,6 +40,7 @@ #include <linux/mm.h> #include <linux/sched.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/wait.h> #include <asm/uaccess.h> #include <asm/io.h> diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c index 09835ca098b..fb6471e74dc 100644 --- a/drivers/media/video/pms.c +++ b/drivers/media/video/pms.c @@ -30,6 +30,7 @@ #include <asm/io.h> #include <linux/sched.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/mutex.h> #include <asm/uaccess.h> diff --git a/drivers/media/video/pwc/pwc.h b/drivers/media/video/pwc/pwc.h index 1fd8c34d118..a087108d0e0 100644 --- a/drivers/media/video/pwc/pwc.h +++ b/drivers/media/video/pwc/pwc.h @@ -35,7 +35,7 @@ #include <asm/semaphore.h> #include <asm/errno.h> #include <linux/videodev.h> -#include <linux/videodev2.h> +#include <media/v4l2-common.h> #include "pwc-uncompress.h" #include <media/pwc-ioctl.h> diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c index dd830e0e5e9..59a187272c8 100644 --- a/drivers/media/video/saa5246a.c +++ b/drivers/media/video/saa5246a.c @@ -46,6 +46,7 @@ #include <linux/i2c.h> #include <linux/videotext.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/mutex.h> #include "saa5246a.h" diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c index 531e9461cb6..19a8d65699f 100644 --- a/drivers/media/video/saa5249.c +++ b/drivers/media/video/saa5249.c @@ -56,6 +56,7 @@ #include <linux/i2c.h> #include <linux/videotext.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/mutex.h> diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c index 41d951db6ec..676b9970eb2 100644 --- a/drivers/media/video/saa7110.c +++ b/drivers/media/video/saa7110.c @@ -43,6 +43,7 @@ MODULE_LICENSE("GPL"); #define I2C_NAME(s) (s)->name #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/video_decoder.h> static int debug = 0; diff --git a/drivers/media/video/se401.h b/drivers/media/video/se401.h index a7a216bd441..c0891b3e001 100644 --- a/drivers/media/video/se401.h +++ b/drivers/media/video/se401.h @@ -4,6 +4,7 @@ #include <asm/uaccess.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/smp_lock.h> #include <linux/mutex.h> diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c index 07476c71174..6be9c1131e1 100644 --- a/drivers/media/video/stradis.c +++ b/drivers/media/video/stradis.c @@ -42,6 +42,7 @@ #include <asm/uaccess.h> #include <linux/vmalloc.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include "saa7146.h" #include "saa7146reg.h" diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c index b38bda83a7c..351b182d921 100644 --- a/drivers/media/video/stv680.c +++ b/drivers/media/video/stv680.c @@ -66,6 +66,7 @@ #include <linux/pagemap.h> #include <linux/errno.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/usb.h> #include <linux/mutex.h> diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c index 103ccb91929..5b6aa49bf4f 100644 --- a/drivers/media/video/tda9875.c +++ b/drivers/media/video/tda9875.c @@ -26,6 +26,7 @@ #include <linux/errno.h> #include <linux/slab.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/i2c.h> #include <linux/i2c-algo-bit.h> #include <linux/init.h> diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c index 74ab48c09c6..bdf506e6ae2 100644 --- a/drivers/media/video/tuner-3036.c +++ b/drivers/media/video/tuner-3036.c @@ -25,6 +25,7 @@ #include <linux/i2c.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <media/tuner.h> diff --git a/drivers/media/video/usbvideo/usbvideo.h b/drivers/media/video/usbvideo/usbvideo.h index 3cbf4fc499a..49dbee5f562 100644 --- a/drivers/media/video/usbvideo/usbvideo.h +++ b/drivers/media/video/usbvideo/usbvideo.h @@ -18,6 +18,7 @@ #include <linux/config.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/usb.h> #include <linux/mutex.h> diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c index 474a29bc176..19d3c20dc7e 100644 --- a/drivers/media/video/v4l1-compat.c +++ b/drivers/media/video/v4l1-compat.c @@ -32,6 +32,7 @@ #include <linux/errno.h> #include <linux/slab.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <asm/uaccess.h> #include <asm/system.h> diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c index a8c101494cf..268e69fdefc 100644 --- a/drivers/media/video/vino.c +++ b/drivers/media/video/vino.c @@ -40,7 +40,7 @@ #include <linux/i2c-algo-sgi.h> #include <linux/videodev.h> -#include <linux/videodev2.h> +#include <media/v4l2-common.h> #include <linux/video_decoder.h> #include <linux/mutex.h> diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c index 40b205b9148..1eca7e65d23 100644 --- a/drivers/media/video/vpx3220.c +++ b/drivers/media/video/vpx3220.c @@ -34,6 +34,7 @@ #define I2C_NAME(x) (x)->name #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/video_decoder.h> #define I2C_VPX3220 0x86 diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c index 80ef8a1b8f6..4bdc886abc4 100644 --- a/drivers/media/video/w9966.c +++ b/drivers/media/video/w9966.c @@ -58,6 +58,7 @@ #include <linux/init.h> #include <linux/delay.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/parport.h> //#define DEBUG // Undef me for production diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran_card.c index 798138599be..958c1e6fc85 100644 --- a/drivers/media/video/zoran_card.c +++ b/drivers/media/video/zoran_card.c @@ -40,6 +40,7 @@ #include <linux/i2c.h> #include <linux/i2c-algo-bit.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/spinlock.h> #include <linux/sem.h> #include <linux/kmod.h> diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c index b5a576a37fd..fd05a7fc492 100644 --- a/drivers/media/video/zoran_driver.c +++ b/drivers/media/video/zoran_driver.c @@ -73,6 +73,7 @@ ) #include <linux/videodev.h> +#include <media/v4l2-common.h> #include "videocodec.h" #include <asm/io.h> diff --git a/drivers/media/video/zoran_procfs.c b/drivers/media/video/zoran_procfs.c index a00fae90229..f4ffe79bdc5 100644 --- a/drivers/media/video/zoran_procfs.c +++ b/drivers/media/video/zoran_procfs.c @@ -43,6 +43,7 @@ #include <linux/seq_file.h> #include <linux/ctype.h> +#include <linux/poll.h> #include <asm/io.h> #include "videocodec.h" diff --git a/include/linux/videodev.h b/include/linux/videodev.h index 5b6205544a7..41bc7e9603c 100644 --- a/include/linux/videodev.h +++ b/include/linux/videodev.h @@ -12,13 +12,6 @@ #ifndef __LINUX_VIDEODEV_H #define __LINUX_VIDEODEV_H -#include <linux/types.h> -#include <linux/poll.h> -#include <linux/fs.h> -#include <linux/device.h> -#include <linux/mutex.h> -#include <linux/compiler.h> /* need __user */ - #define HAVE_V4L1 1 #include <linux/videodev2.h> @@ -343,10 +336,6 @@ struct video_code #define VID_HARDWARE_SN9C102 38 #define VID_HARDWARE_ARV 39 -#ifdef __KERNEL__ -#include <media/v4l2-dev.h> -#endif /* __KERNEL__ */ - #endif /* __LINUX_VIDEODEV_H */ /* diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index bb58197ab6b..795831d9f4d 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -24,7 +24,6 @@ * Common stuff for both V4L1 and V4L2 * Moved from videodev.h */ - #define VIDEO_MAX_FRAME 32 #define VID_TYPE_CAPTURE 1 /* Can capture */ @@ -200,7 +199,6 @@ struct v4l2_capability /* * V I D E O I M A G E F O R M A T */ - struct v4l2_pix_format { __u32 width; @@ -213,7 +211,7 @@ struct v4l2_pix_format __u32 priv; /* private data, depends on pixelformat */ }; -/* Pixel format FOURCC depth Description */ +/* Pixel format FOURCC depth Description */ #define V4L2_PIX_FMT_RGB332 v4l2_fourcc('R','G','B','1') /* 8 RGB-3-3-2 */ #define V4L2_PIX_FMT_RGB555 v4l2_fourcc('R','G','B','O') /* 16 RGB-5-5-5 */ #define V4L2_PIX_FMT_RGB565 v4l2_fourcc('R','G','B','P') /* 16 RGB-5-6-5 */ @@ -273,7 +271,6 @@ struct v4l2_fmtdesc #define V4L2_FMT_FLAG_COMPRESSED 0x0001 - /* * T I M E C O D E */ @@ -303,7 +300,6 @@ struct v4l2_timecode #define V4L2_TC_USERBITS_8BITCHARS 0x0008 /* The above is based on SMPTE timecodes */ - /* * M P E G C O M P R E S S I O N P A R A M E T E R S * @@ -311,8 +307,6 @@ struct v4l2_timecode * ### there will be some incompatible changes. * */ - - enum v4l2_bitrate_mode { V4L2_BITRATE_NONE = 0, /* not specified */ V4L2_BITRATE_CBR, /* constant bitrate */ @@ -421,7 +415,6 @@ struct v4l2_jpegcompression * allways use APP0 */ }; - /* * M E M O R Y - M A P P I N G B U F F E R S */ @@ -503,7 +496,6 @@ struct v4l2_window void __user *bitmap; }; - /* * C A P T U R E P A R A M E T E R S */ @@ -516,6 +508,7 @@ struct v4l2_captureparm __u32 readbuffers; /* # of buffers for read */ __u32 reserved[4]; }; + /* Flags for 'capability' and 'capturemode' fields */ #define V4L2_MODE_HIGHQUALITY 0x0001 /* High quality imaging mode */ #define V4L2_CAP_TIMEPERFRAME 0x1000 /* timeperframe field is supported */ @@ -533,7 +526,6 @@ struct v4l2_outputparm /* * I N P U T I M A G E C R O P P I N G */ - struct v4l2_cropcap { enum v4l2_buf_type type; struct v4l2_rect bounds; @@ -640,7 +632,6 @@ struct v4l2_standard __u32 reserved[4]; }; - /* * V I D E O I N P U T S */ @@ -655,6 +646,7 @@ struct v4l2_input __u32 status; __u32 reserved[4]; }; + /* Values for the 'type' field */ #define V4L2_INPUT_TYPE_TUNER 1 #define V4L2_INPUT_TYPE_CAMERA 2 @@ -834,6 +826,7 @@ struct v4l2_audio __u32 mode; __u32 reserved[2]; }; + /* Flags for the 'capability' field */ #define V4L2_AUDCAP_STEREO 0x00001 #define V4L2_AUDCAP_AVL 0x00002 @@ -857,7 +850,6 @@ struct v4l2_audioout */ /* Raw VBI */ - struct v4l2_vbi_format { __u32 sampling_rate; /* in 1 Hz */ @@ -964,8 +956,6 @@ struct v4l2_streamparm } parm; }; - - /* * I O C T L C O D E S F O R V I D E O D E V I C E S * diff --git a/include/media/ovcamchip.h b/include/media/ovcamchip.h index 8138983adce..0f43451f8bb 100644 --- a/include/media/ovcamchip.h +++ b/include/media/ovcamchip.h @@ -15,6 +15,7 @@ #define __LINUX_OVCAMCHIP_H #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <linux/i2c.h> /* --------------------------------- */ diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h index 4507cb61ae9..83fe2e3d1e2 100644 --- a/include/media/saa7146_vv.h +++ b/include/media/saa7146_vv.h @@ -2,7 +2,7 @@ #define __SAA7146_VV__ #include <linux/videodev.h> - +#include <media/v4l2-common.h> #include <media/saa7146.h> #include <media/video-buf.h> diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h index c2f54d2c9a4..dec6b24e4c4 100644 --- a/include/media/v4l2-dev.h +++ b/include/media/v4l2-dev.h @@ -40,8 +40,6 @@ #define VFL_TYPE_RADIO 2 #define VFL_TYPE_VTX 3 - const struct file_operations *fops; - /* Video standard functions */ extern unsigned int v4l2_video_std_fps(struct v4l2_standard *vs); extern int v4l2_video_std_construct(struct v4l2_standard *vs, @@ -92,7 +90,7 @@ struct v4l2_tvnorm { struct video_device { /* device ops */ - struct file_operations *fops; + const struct file_operations *fops; /* device info */ struct device *dev; @@ -297,7 +295,7 @@ struct video_device int (*vidioc_log_status) (struct file *file, void *fh); -#if OBSOLETE_OWNER /* to be removed soon */ +#ifdef OBSOLETE_OWNER /* to be removed soon */ /* obsolete -- fops->owner is used instead */ struct module *owner; /* dev->driver_data will be used instead some day. @@ -351,7 +349,7 @@ video_device_remove_file(struct video_device *vfd, class_device_remove_file(&vfd->class_dev, attr); } -#if OBSOLETE_OWNER /* to be removed soon */ +#ifdef OBSOLETE_OWNER /* to be removed soon */ /* helper functions to access driver private data. */ static inline void *video_get_drvdata(struct video_device *dev) { |