V4L/DVB (10907): avoid loading the entire videodev.h header on V4L2 drivers
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
@ -14,7 +14,7 @@
|
|||||||
#ifndef _BTTV_H_
|
#ifndef _BTTV_H_
|
||||||
#define _BTTV_H_
|
#define _BTTV_H_
|
||||||
|
|
||||||
#include <linux/videodev.h>
|
#include <linux/videodev2.h>
|
||||||
#include <linux/i2c.h>
|
#include <linux/i2c.h>
|
||||||
#include <media/ir-common.h>
|
#include <media/ir-common.h>
|
||||||
#include <media/ir-kbd-i2c.h>
|
#include <media/ir-kbd-i2c.h>
|
||||||
|
@ -32,7 +32,6 @@
|
|||||||
#include <linux/wait.h>
|
#include <linux/wait.h>
|
||||||
#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/pci.h>
|
#include <linux/pci.h>
|
||||||
#include <linux/input.h>
|
#include <linux/input.h>
|
||||||
#include <linux/mutex.h>
|
#include <linux/mutex.h>
|
||||||
|
@ -37,6 +37,7 @@
|
|||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
|
#include <linux/videodev.h>
|
||||||
#include <media/v4l2-ioctl.h>
|
#include <media/v4l2-ioctl.h>
|
||||||
|
|
||||||
#include "cpia2.h"
|
#include "cpia2.h"
|
||||||
|
@ -35,11 +35,6 @@
|
|||||||
#include <media/v4l2-common.h>
|
#include <media/v4l2-common.h>
|
||||||
#include <media/v4l2-ioctl.h>
|
#include <media/v4l2-ioctl.h>
|
||||||
|
|
||||||
#ifdef CONFIG_VIDEO_V4L1_COMPAT
|
|
||||||
/* Include V4L1 specific functions. Should be removed soon */
|
|
||||||
#include <linux/videodev.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
MODULE_DESCRIPTION("v4l2 driver module for cx23885 based TV cards");
|
MODULE_DESCRIPTION("v4l2 driver module for cx23885 based TV cards");
|
||||||
MODULE_AUTHOR("Steven Toth <stoth@linuxtv.org>");
|
MODULE_AUTHOR("Steven Toth <stoth@linuxtv.org>");
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
|
@ -41,11 +41,6 @@
|
|||||||
#include <media/v4l2-common.h>
|
#include <media/v4l2-common.h>
|
||||||
#include <media/v4l2-ioctl.h>
|
#include <media/v4l2-ioctl.h>
|
||||||
|
|
||||||
#ifdef CONFIG_VIDEO_V4L1_COMPAT
|
|
||||||
/* Include V4L1 specific functions. Should be removed soon */
|
|
||||||
#include <linux/videodev.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
MODULE_DESCRIPTION("v4l2 driver module for cx2388x based TV cards");
|
MODULE_DESCRIPTION("v4l2 driver module for cx2388x based TV cards");
|
||||||
MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
|
MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
|
||||||
MODULE_LICENSE("GPL");
|
MODULE_LICENSE("GPL");
|
||||||
|
@ -53,7 +53,7 @@
|
|||||||
#include <linux/i2c.h>
|
#include <linux/i2c.h>
|
||||||
#include <linux/kthread.h>
|
#include <linux/kthread.h>
|
||||||
#include <linux/freezer.h>
|
#include <linux/freezer.h>
|
||||||
#include <linux/videodev2.h>
|
#include <linux/videodev.h>
|
||||||
#include <media/v4l2-device.h>
|
#include <media/v4l2-device.h>
|
||||||
#include <media/v4l2-ioctl.h>
|
#include <media/v4l2-ioctl.h>
|
||||||
#include <media/v4l2-i2c-drv-legacy.h>
|
#include <media/v4l2-i2c-drv-legacy.h>
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
#include <linux/videodev.h>
|
#include <linux/videodev2.h>
|
||||||
#include <media/v4l2-common.h>
|
#include <media/v4l2-common.h>
|
||||||
#include <media/v4l2-chip-ident.h>
|
#include <media/v4l2-chip-ident.h>
|
||||||
#include <linux/i2c.h>
|
#include <linux/i2c.h>
|
||||||
|
@ -31,11 +31,6 @@
|
|||||||
#include "saa7134.h"
|
#include "saa7134.h"
|
||||||
#include <media/v4l2-common.h>
|
#include <media/v4l2-common.h>
|
||||||
|
|
||||||
#ifdef CONFIG_VIDEO_V4L1_COMPAT
|
|
||||||
/* Include V4L1 specific functions. Should be removed soon */
|
|
||||||
#include <linux/videodev.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* ------------------------------------------------------------------ */
|
/* ------------------------------------------------------------------ */
|
||||||
|
|
||||||
unsigned int video_debug;
|
unsigned int video_debug;
|
||||||
|
@ -25,8 +25,6 @@
|
|||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <linux/wait.h>
|
#include <linux/wait.h>
|
||||||
|
|
||||||
#include <linux/videodev.h>
|
|
||||||
|
|
||||||
#ifndef O_NONCAP
|
#ifndef O_NONCAP
|
||||||
#define O_NONCAP O_TRUNC
|
#define O_NONCAP O_TRUNC
|
||||||
#endif
|
#endif
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
|
|
||||||
#define __OLD_VIDIOC_ /* To allow fixing old calls */
|
#define __OLD_VIDIOC_ /* To allow fixing old calls */
|
||||||
|
#include <linux/videodev.h>
|
||||||
#include <linux/videodev2.h>
|
#include <linux/videodev2.h>
|
||||||
|
|
||||||
#ifdef CONFIG_VIDEO_V4L1
|
#ifdef CONFIG_VIDEO_V4L1
|
||||||
|
@ -28,10 +28,6 @@
|
|||||||
#include <linux/mutex.h>
|
#include <linux/mutex.h>
|
||||||
#include <linux/videodev2.h>
|
#include <linux/videodev2.h>
|
||||||
#include <linux/dma-mapping.h>
|
#include <linux/dma-mapping.h>
|
||||||
#ifdef CONFIG_VIDEO_V4L1_COMPAT
|
|
||||||
/* Include V4L1 specific functions. Should be removed soon */
|
|
||||||
#include <linux/videodev.h>
|
|
||||||
#endif
|
|
||||||
#include <linux/interrupt.h>
|
#include <linux/interrupt.h>
|
||||||
#include <linux/kthread.h>
|
#include <linux/kthread.h>
|
||||||
#include <linux/highmem.h>
|
#include <linux/highmem.h>
|
||||||
|
@ -57,7 +57,7 @@
|
|||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
#include <linux/videodev2.h>
|
#include <linux/videodev.h>
|
||||||
#include <media/v4l2-common.h>
|
#include <media/v4l2-common.h>
|
||||||
#include <media/v4l2-ioctl.h>
|
#include <media/v4l2-ioctl.h>
|
||||||
#include <linux/parport.h>
|
#include <linux/parport.h>
|
||||||
|
@ -42,6 +42,7 @@
|
|||||||
#include <asm/page.h>
|
#include <asm/page.h>
|
||||||
#include <asm/uaccess.h>
|
#include <asm/uaccess.h>
|
||||||
#include <linux/page-flags.h>
|
#include <linux/page-flags.h>
|
||||||
|
#include <linux/videodev.h>
|
||||||
#include <media/v4l2-ioctl.h>
|
#include <media/v4l2-ioctl.h>
|
||||||
|
|
||||||
#include "w9968cf.h"
|
#include "w9968cf.h"
|
||||||
|
@ -59,7 +59,7 @@
|
|||||||
|
|
||||||
#include <linux/spinlock.h>
|
#include <linux/spinlock.h>
|
||||||
|
|
||||||
#include <linux/videodev2.h>
|
#include <linux/videodev.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"
|
||||||
|
@ -16,6 +16,23 @@
|
|||||||
#include <linux/ioctl.h>
|
#include <linux/ioctl.h>
|
||||||
#include <linux/videodev2.h>
|
#include <linux/videodev2.h>
|
||||||
|
|
||||||
|
#if defined(__MIN_V4L1) && defined (__KERNEL__)
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Used by those V4L2 core functions that need a minimum V4L1 support,
|
||||||
|
* in order to allow V4L1 Compatibilty code compilation.
|
||||||
|
*/
|
||||||
|
|
||||||
|
struct video_mbuf
|
||||||
|
{
|
||||||
|
int size; /* Total memory to map */
|
||||||
|
int frames; /* Frames */
|
||||||
|
int offsets[VIDEO_MAX_FRAME];
|
||||||
|
};
|
||||||
|
|
||||||
|
#define VIDIOCGMBUF _IOR('v',20, struct video_mbuf) /* Memory map buffer info */
|
||||||
|
|
||||||
|
#else
|
||||||
#if defined(CONFIG_VIDEO_V4L1_COMPAT) || !defined (__KERNEL__)
|
#if defined(CONFIG_VIDEO_V4L1_COMPAT) || !defined (__KERNEL__)
|
||||||
|
|
||||||
#define VID_TYPE_CAPTURE 1 /* Can capture */
|
#define VID_TYPE_CAPTURE 1 /* Can capture */
|
||||||
@ -312,6 +329,7 @@ struct video_code
|
|||||||
#define VID_PLAY_END_MARK 14
|
#define VID_PLAY_END_MARK 14
|
||||||
|
|
||||||
#endif /* CONFIG_VIDEO_V4L1_COMPAT */
|
#endif /* CONFIG_VIDEO_V4L1_COMPAT */
|
||||||
|
#endif /* __MIN_V4L1 */
|
||||||
|
|
||||||
#endif /* __LINUX_VIDEODEV_H */
|
#endif /* __LINUX_VIDEODEV_H */
|
||||||
|
|
||||||
|
@ -15,6 +15,7 @@
|
|||||||
#include <linux/mutex.h>
|
#include <linux/mutex.h>
|
||||||
#include <linux/compiler.h> /* need __user */
|
#include <linux/compiler.h> /* need __user */
|
||||||
#ifdef CONFIG_VIDEO_V4L1_COMPAT
|
#ifdef CONFIG_VIDEO_V4L1_COMPAT
|
||||||
|
#define __MIN_V4L1
|
||||||
#include <linux/videodev.h>
|
#include <linux/videodev.h>
|
||||||
#else
|
#else
|
||||||
#include <linux/videodev2.h>
|
#include <linux/videodev2.h>
|
||||||
|
Reference in New Issue
Block a user