Commit 5e87efa3 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

V4L/DVB (4068): Removed all references to kernel stuff from videodev.h and videodev2.h

The videodev.h and videodev2.h describe the public API for V4L and V4L2.
It shouldn't have there any kernel-specific stuff. Those were moved to
v4l2-dev.h.
This patch removes some uneeded headers and include v4l2-common.h on all
V4L driver. This header includes device implementation of V4L2 API provided
on v4l2-dev.h as well as V4L2 internal ioctls that provides connections
between master driver and its i2c devices.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 839e4a4a
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include "oss/aci.h" #include "oss/aci.h"
#include "miropcm20-rds-core.h" #include "miropcm20-rds-core.h"
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <asm/io.h> /* outb, outb_p */ #include <asm/io.h> /* outb, outb_p */
#include <asm/uaccess.h> /* copy to/from user */ #include <asm/uaccess.h> /* copy to/from user */
#include <linux/videodev.h> /* kernel radio structs */ #include <linux/videodev.h> /* kernel radio structs */
#include <media/v4l2-common.h>
#include <linux/config.h> /* CONFIG_RADIO_RTRACK_PORT */ #include <linux/config.h> /* CONFIG_RADIO_RTRACK_PORT */
#include <asm/semaphore.h> /* Lock for the I/O */ #include <asm/semaphore.h> /* Lock for the I/O */
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <asm/io.h> /* outb, outb_p */ #include <asm/io.h> /* outb, outb_p */
#include <asm/uaccess.h> /* copy to/from user */ #include <asm/uaccess.h> /* copy to/from user */
#include <linux/videodev.h> /* kernel radio structs */ #include <linux/videodev.h> /* kernel radio structs */
#include <media/v4l2-common.h>
#include <linux/config.h> /* CONFIG_RADIO_AZTECH_PORT */ #include <linux/config.h> /* CONFIG_RADIO_AZTECH_PORT */
/* acceptable ports: 0x350 (JP3 shorted), 0x358 (JP3 open) */ /* acceptable ports: 0x350 (JP3 shorted), 0x358 (JP3 open) */
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <asm/io.h> /* outb, outb_p */ #include <asm/io.h> /* outb, outb_p */
#include <asm/uaccess.h> /* copy to/from user */ #include <asm/uaccess.h> /* copy to/from user */
#include <linux/videodev.h> /* kernel radio structs */ #include <linux/videodev.h> /* kernel radio structs */
#include <media/v4l2-common.h>
#include <linux/param.h> #include <linux/param.h>
#include <linux/pnp.h> #include <linux/pnp.h>
......
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <asm/io.h> #include <asm/io.h>
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <asm/io.h> /* outb, outb_p */ #include <asm/io.h> /* outb, outb_p */
#include <asm/uaccess.h> /* copy to/from user */ #include <asm/uaccess.h> /* copy to/from user */
#include <linux/videodev.h> /* kernel radio structs */ #include <linux/videodev.h> /* kernel radio structs */
#include <media/v4l2-common.h>
#include <linux/config.h> /* CONFIG_RADIO_GEMTEK_PORT */ #include <linux/config.h> /* CONFIG_RADIO_GEMTEK_PORT */
#include <linux/spinlock.h> #include <linux/spinlock.h>
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#define DRIVER_VERSION "0.05" #define DRIVER_VERSION "0.05"
......
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
/* version 0.75 Sun Feb 4 22:51:27 EET 2001 */ /* version 0.75 Sun Feb 4 22:51:27 EET 2001 */
#define DRIVER_VERSION "0.75" #define DRIVER_VERSION "0.75"
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <asm/io.h> /* outb, outb_p */ #include <asm/io.h> /* outb, outb_p */
#include <asm/uaccess.h> /* copy to/from user */ #include <asm/uaccess.h> /* copy to/from user */
#include <linux/videodev.h> /* kernel radio structs */ #include <linux/videodev.h> /* kernel radio structs */
#include <media/v4l2-common.h>
#include <linux/config.h> /* CONFIG_RADIO_RTRACK2_PORT */ #include <linux/config.h> /* CONFIG_RADIO_RTRACK2_PORT */
#include <linux/spinlock.h> #include <linux/spinlock.h>
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <linux/ioport.h> /* request_region */ #include <linux/ioport.h> /* request_region */
#include <linux/delay.h> /* udelay */ #include <linux/delay.h> /* udelay */
#include <linux/videodev.h> /* kernel radio structs */ #include <linux/videodev.h> /* kernel radio structs */
#include <media/v4l2-common.h>
#include <linux/isapnp.h> #include <linux/isapnp.h>
#include <asm/io.h> /* outb, outb_p */ #include <asm/io.h> /* outb, outb_p */
#include <asm/uaccess.h> /* copy to/from user */ #include <asm/uaccess.h> /* copy to/from user */
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <asm/io.h> /* outb, outb_p */ #include <asm/io.h> /* outb, outb_p */
#include <asm/uaccess.h> /* copy to/from user */ #include <asm/uaccess.h> /* copy to/from user */
#include <linux/videodev.h> /* kernel radio structs */ #include <linux/videodev.h> /* kernel radio structs */
#include <media/v4l2-common.h>
#include <linux/mutex.h> #include <linux/mutex.h>
static struct mutex lock; static struct mutex lock;
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <asm/io.h> /* outb, outb_p */ #include <asm/io.h> /* outb, outb_p */
#include <asm/uaccess.h> /* copy to/from user */ #include <asm/uaccess.h> /* copy to/from user */
#include <linux/videodev.h> /* kernel radio structs */ #include <linux/videodev.h> /* kernel radio structs */
#include <media/v4l2-common.h>
#include <linux/config.h> /* CONFIG_RADIO_TERRATEC_PORT */ #include <linux/config.h> /* CONFIG_RADIO_TERRATEC_PORT */
#include <linux/spinlock.h> #include <linux/spinlock.h>
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/config.h> /* CONFIG_RADIO_TRUST_PORT */ #include <linux/config.h> /* CONFIG_RADIO_TRUST_PORT */
/* acceptable ports: 0x350 (JP3 shorted), 0x358 (JP3 open) */ /* acceptable ports: 0x350 (JP3 shorted), 0x358 (JP3 open) */
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <asm/io.h> /* outb, outb_p */ #include <asm/io.h> /* outb, outb_p */
#include <asm/uaccess.h> /* copy to/from user */ #include <asm/uaccess.h> /* copy to/from user */
#include <linux/videodev.h> /* kernel radio structs */ #include <linux/videodev.h> /* kernel radio structs */
#include <media/v4l2-common.h>
#include <linux/config.h> /* CONFIG_RADIO_TYPHOON_* */ #include <linux/config.h> /* CONFIG_RADIO_TYPHOON_* */
#define BANNER "Typhoon Radio Card driver v0.1\n" #define BANNER "Typhoon Radio Card driver v0.1\n"
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <asm/io.h> /* outb, outb_p */ #include <asm/io.h> /* outb, outb_p */
#include <asm/uaccess.h> /* copy to/from user */ #include <asm/uaccess.h> /* copy to/from user */
#include <linux/videodev.h> /* kernel radio structs */ #include <linux/videodev.h> /* kernel radio structs */
#include <media/v4l2-common.h>
#include <linux/config.h> /* CONFIG_RADIO_ZOLTRIX_PORT */ #include <linux/config.h> /* CONFIG_RADIO_ZOLTRIX_PORT */
#ifndef CONFIG_RADIO_ZOLTRIX_PORT #ifndef CONFIG_RADIO_ZOLTRIX_PORT
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-algo-bit.h> #include <linux/i2c-algo-bit.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/mutex.h> #include <linux/mutex.h>
......
...@@ -73,6 +73,7 @@ OTHER DEALINGS IN THE SOFTWARE. ...@@ -73,6 +73,7 @@ OTHER DEALINGS IN THE SOFTWARE.
#include <linux/parport.h> #include <linux/parport.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <linux/parport.h> #include <linux/parport.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
......
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <linux/mutex.h> #include <linux/mutex.h>
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <linux/version.h> #include <linux/version.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/poll.h> #include <linux/poll.h>
......
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/io.h> #include <asm/io.h>
#include <linux/delay.h> #include <linux/delay.h>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/mutex.h> #include <linux/mutex.h>
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/io.h> #include <asm/io.h>
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <asm/semaphore.h> #include <asm/semaphore.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <linux/videodev2.h> #include <media/v4l2-common.h>
#include "pwc-uncompress.h" #include "pwc-uncompress.h"
#include <media/pwc-ioctl.h> #include <media/pwc-ioctl.h>
......
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/videotext.h> #include <linux/videotext.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include "saa5246a.h" #include "saa5246a.h"
......
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/videotext.h> #include <linux/videotext.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/mutex.h> #include <linux/mutex.h>
......
...@@ -43,6 +43,7 @@ MODULE_LICENSE("GPL"); ...@@ -43,6 +43,7 @@ MODULE_LICENSE("GPL");
#define I2C_NAME(s) (s)->name #define I2C_NAME(s) (s)->name
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/video_decoder.h> #include <linux/video_decoder.h>
static int debug = 0; static int debug = 0;
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <linux/mutex.h> #include <linux/mutex.h>
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include "saa7146.h" #include "saa7146.h"
#include "saa7146reg.h" #include "saa7146reg.h"
......
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/mutex.h> #include <linux/mutex.h>
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-algo-bit.h> #include <linux/i2c-algo-bit.h>
#include <linux/init.h> #include <linux/init.h>
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <media/tuner.h> #include <media/tuner.h>
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <linux/config.h> #include <linux/config.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/usb.h> #include <linux/usb.h>
#include <linux/mutex.h> #include <linux/mutex.h>
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/system.h> #include <asm/system.h>
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <linux/i2c-algo-sgi.h> #include <linux/i2c-algo-sgi.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <linux/videodev2.h> #include <media/v4l2-common.h>
#include <linux/video_decoder.h> #include <linux/video_decoder.h>
#include <linux/mutex.h> #include <linux/mutex.h>
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#define I2C_NAME(x) (x)->name #define I2C_NAME(x) (x)->name
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/video_decoder.h> #include <linux/video_decoder.h>
#define I2C_VPX3220 0x86 #define I2C_VPX3220 0x86
......
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/parport.h> #include <linux/parport.h>
//#define DEBUG // Undef me for production //#define DEBUG // Undef me for production
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-algo-bit.h> #include <linux/i2c-algo-bit.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/sem.h> #include <linux/sem.h>
#include <linux/kmod.h> #include <linux/kmod.h>
......
...@@ -73,6 +73,7 @@ ...@@ -73,6 +73,7 @@
) )
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include "videocodec.h" #include "videocodec.h"
#include <asm/io.h> #include <asm/io.h>
......
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/poll.h>
#include <asm/io.h> #include <asm/io.h>
#include "videocodec.h" #include "videocodec.h"
......
...@@ -12,13 +12,6 @@ ...@@ -12,13 +12,6 @@
#ifndef __LINUX_VIDEODEV_H #ifndef __LINUX_VIDEODEV_H
#define __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 #define HAVE_V4L1 1
#include <linux/videodev2.h> #include <linux/videodev2.h>
...@@ -343,10 +336,6 @@ struct video_code ...@@ -343,10 +336,6 @@ struct video_code
#define VID_HARDWARE_SN9C102 38 #define VID_HARDWARE_SN9C102 38
#define VID_HARDWARE_ARV 39 #define VID_HARDWARE_ARV 39
#ifdef __KERNEL__
#include <media/v4l2-dev.h>
#endif /* __KERNEL__ */
#endif /* __LINUX_VIDEODEV_H */ #endif /* __LINUX_VIDEODEV_H */
/* /*
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
* Common stuff for both V4L1 and V4L2 * Common stuff for both V4L1 and V4L2
* Moved from videodev.h * Moved from videodev.h
*/ */
#define VIDEO_MAX_FRAME 32 #define VIDEO_MAX_FRAME 32
#define VID_TYPE_CAPTURE 1 /* Can capture */ #define VID_TYPE_CAPTURE 1 /* Can capture */
...@@ -200,7 +199,6 @@ struct v4l2_capability ...@@ -200,7 +199,6 @@ struct v4l2_capability
/* /*
* V I D E O I M A G E F O R M A T * V I D E O I M A G E F O R M A T
*/ */
struct v4l2_pix_format struct v4l2_pix_format
{ {
__u32 width; __u32 width;
...@@ -213,7 +211,7 @@ struct v4l2_pix_format ...@@ -213,7 +211,7 @@ struct v4l2_pix_format
__u32 priv; /* private data, depends on pixelformat */ __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_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_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 */ #define V4L2_PIX_FMT_RGB565 v4l2_fourcc('R','G','B','P') /* 16 RGB-5-6-5 */
...@@ -273,7 +271,6 @@ struct v4l2_fmtdesc ...@@ -273,7 +271,6 @@ struct v4l2_fmtdesc
#define V4L2_FMT_FLAG_COMPRESSED 0x0001 #define V4L2_FMT_FLAG_COMPRESSED 0x0001
/* /*
* T I M E C O D E * T I M E C O D E
*/ */
...@@ -303,7 +300,6 @@ struct v4l2_timecode ...@@ -303,7 +300,6 @@ struct v4l2_timecode
#define V4L2_TC_USERBITS_8BITCHARS 0x0008 #define V4L2_TC_USERBITS_8BITCHARS 0x0008
/* The above is based on SMPTE timecodes */ /* 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 * 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 ...@@ -311,8 +307,6 @@ struct v4l2_timecode
* ### there will be some incompatible changes. * ### there will be some incompatible changes.
* *
*/ */
enum v4l2_bitrate_mode { enum v4l2_bitrate_mode {
V4L2_BITRATE_NONE = 0, /* not specified */ V4L2_BITRATE_NONE = 0, /* not specified */
V4L2_BITRATE_CBR, /* constant bitrate */ V4L2_BITRATE_CBR, /* constant bitrate */
...@@ -421,7 +415,6 @@ struct v4l2_jpegcompression ...@@ -421,7 +415,6 @@ struct v4l2_jpegcompression
* allways use APP0 */ * allways use APP0 */
}; };
/* /*
* M E M O R Y - M A P P I N G B U F F E R S * 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 ...@@ -503,7 +496,6 @@ struct v4l2_window
void __user *bitmap; void __user *bitmap;
}; };
/* /*
* C A P T U R E P A R A M E T E R S * C A P T U R E P A R A M E T E R S
*/ */
...@@ -516,6 +508,7 @@ struct v4l2_captureparm ...@@ -516,6 +508,7 @@ struct v4l2_captureparm
__u32 readbuffers; /* # of buffers for read */ __u32 readbuffers; /* # of buffers for read */
__u32 reserved[4]; __u32 reserved[4];
}; };
/* Flags for 'capability' and 'capturemode' fields */ /* Flags for 'capability' and 'capturemode' fields */
#define V4L2_MODE_HIGHQUALITY 0x0001 /* High quality imaging mode */ #define V4L2_MODE_HIGHQUALITY 0x0001 /* High quality imaging mode */
#define V4L2_CAP_TIMEPERFRAME 0x1000 /* timeperframe field is supported */ #define V4L2_CAP_TIMEPERFRAME 0x1000 /* timeperframe field is supported */
...@@ -533,7 +526,6 @@ struct v4l2_outputparm ...@@ -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 * I N P U T I M A G E C R O P P I N G
*/ */
struct v4l2_cropcap { struct v4l2_cropcap {
enum v4l2_buf_type type; enum v4l2_buf_type type;
struct v4l2_rect bounds; struct v4l2_rect bounds;
...@@ -640,7 +632,6 @@ struct v4l2_standard ...@@ -640,7 +632,6 @@ struct v4l2_standard
__u32 reserved[4]; __u32 reserved[4];
}; };
/* /*
* V I D E O I N P U T S * V I D E O I N P U T S
*/ */
...@@ -655,6 +646,7 @@ struct v4l2_input ...@@ -655,6 +646,7 @@ struct v4l2_input
__u32 status; __u32 status;
__u32 reserved[4]; __u32 reserved[4];
}; };
/* Values for the 'type' field */ /* Values for the 'type' field */
#define V4L2_INPUT_TYPE_TUNER 1 #define V4L2_INPUT_TYPE_TUNER 1
#define V4L2_INPUT_TYPE_CAMERA 2 #define V4L2_INPUT_TYPE_CAMERA 2
...@@ -834,6 +826,7 @@ struct v4l2_audio ...@@ -834,6 +826,7 @@ struct v4l2_audio
__u32 mode; __u32 mode;
__u32 reserved[2]; __u32 reserved[2];
}; };
/* Flags for the 'capability' field */ /* Flags for the 'capability' field */
#define V4L2_AUDCAP_STEREO 0x00001 #define V4L2_AUDCAP_STEREO 0x00001
#define V4L2_AUDCAP_AVL 0x00002 #define V4L2_AUDCAP_AVL 0x00002
...@@ -857,7 +850,6 @@ struct v4l2_audioout ...@@ -857,7 +850,6 @@ struct v4l2_audioout
*/ */
/* Raw VBI */ /* Raw VBI */
struct v4l2_vbi_format struct v4l2_vbi_format
{ {
__u32 sampling_rate; /* in 1 Hz */ __u32 sampling_rate; /* in 1 Hz */
...@@ -964,8 +956,6 @@ struct v4l2_streamparm ...@@ -964,8 +956,6 @@ struct v4l2_streamparm
} parm; } 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 * 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
* *
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#define __LINUX_OVCAMCHIP_H #define __LINUX_OVCAMCHIP_H
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/i2c.h> #include <linux/i2c.h>
/* --------------------------------- */ /* --------------------------------- */
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define __SAA7146_VV__ #define __SAA7146_VV__
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <media/saa7146.h> #include <media/saa7146.h>
#include <media/video-buf.h> #include <media/video-buf.h>
......
...@@ -40,8 +40,6 @@ ...@@ -40,8 +40,6 @@
#define VFL_TYPE_RADIO 2 #define VFL_TYPE_RADIO 2
#define VFL_TYPE_VTX 3 #define VFL_TYPE_VTX 3
const struct file_operations *fops;
/* Video standard functions */ /* Video standard functions */
extern unsigned int v4l2_video_std_fps(struct v4l2_standard *vs); extern unsigned int v4l2_video_std_fps(struct v4l2_standard *vs);
extern int v4l2_video_std_construct(struct v4l2_standard *vs, extern int v4l2_video_std_construct(struct v4l2_standard *vs,
...@@ -92,7 +90,7 @@ struct v4l2_tvnorm { ...@@ -92,7 +90,7 @@ struct v4l2_tvnorm {
struct video_device struct video_device
{ {
/* device ops */ /* device ops */
struct file_operations *fops; const struct file_operations *fops;
/* device info */ /* device info */
struct device *dev; struct device *dev;
...@@ -297,7 +295,7 @@ struct video_device ...@@ -297,7 +295,7 @@ struct video_device
int (*vidioc_log_status) (struct file *file, void *fh); 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 */ /* obsolete -- fops->owner is used instead */
struct module *owner; struct module *owner;
/* dev->driver_data will be used instead some day. /* dev->driver_data will be used instead some day.
...@@ -351,7 +349,7 @@ video_device_remove_file(struct video_device *vfd, ...@@ -351,7 +349,7 @@ video_device_remove_file(struct video_device *vfd,
class_device_remove_file(&vfd->class_dev, attr); 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. */ /* helper functions to access driver private data. */
static inline void *video_get_drvdata(struct video_device *dev) static inline void *video_get_drvdata(struct video_device *dev)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment