The patch number 10907 was added via Mauro Carvalho Chehab <[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <[email protected]>
------
From: Mauro Carvalho Chehab <[email protected]>
avoid loading the entire videodev.h header for drivers that are already V4L2
only
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
linux/drivers/media/video/bt8xx/bttv.h | 2 -
linux/drivers/media/video/bt8xx/bttvp.h | 1
linux/drivers/media/video/cpia2/cpia2_v4l.c | 1
linux/drivers/media/video/cx23885/cx23885-video.c | 5 ---
linux/drivers/media/video/cx88/cx88-video.c | 5 ---
linux/drivers/media/video/msp3400-driver.c | 2 -
linux/drivers/media/video/mxb.c | 1
linux/drivers/media/video/ov7670.c | 2 -
linux/drivers/media/video/saa7134/saa7134-video.c | 5 ---
linux/drivers/media/video/saa7146.h | 2 -
linux/drivers/media/video/v4l2-ioctl.c | 1
linux/drivers/media/video/vivi.c | 4 ---
linux/drivers/media/video/w9966.c | 2 -
linux/drivers/media/video/w9968cf.c | 1
linux/drivers/media/video/zoran/zoran_driver.c | 2 -
linux/include/linux/videodev.h | 18 ++++++++++++++
linux/include/media/v4l2-ioctl.h | 1
17 files changed, 27 insertions(+), 28 deletions(-)
diff -r 615fb8f01610 -r f7f2fb8805eb linux/drivers/media/video/bt8xx/bttv.h
--- a/linux/drivers/media/video/bt8xx/bttv.h Tue Mar 10 02:33:02 2009 -0300
+++ b/linux/drivers/media/video/bt8xx/bttv.h Tue Mar 10 05:31:34 2009 -0300
@@ -14,7 +14,7 @@
#ifndef _BTTV_H_
#define _BTTV_H_
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
#include <linux/i2c.h>
#include "compat.h"
#include <media/ir-common.h>
diff -r 615fb8f01610 -r f7f2fb8805eb linux/drivers/media/video/bt8xx/bttvp.h
--- a/linux/drivers/media/video/bt8xx/bttvp.h Tue Mar 10 02:33:02 2009 -0300
+++ b/linux/drivers/media/video/bt8xx/bttvp.h Tue Mar 10 05:31:34 2009 -0300
@@ -32,7 +32,6 @@
#include <linux/wait.h>
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
-#include <linux/videodev.h>
#include <linux/pci.h>
#include <linux/input.h>
#include <linux/mutex.h>
diff -r 615fb8f01610 -r f7f2fb8805eb linux/drivers/media/video/cpia2/cpia2_v4l.c
--- a/linux/drivers/media/video/cpia2/cpia2_v4l.c Tue Mar 10 02:33:02
2009 -0300
+++ b/linux/drivers/media/video/cpia2/cpia2_v4l.c Tue Mar 10 05:31:34
2009 -0300
@@ -37,6 +37,7 @@
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/init.h>
+#include <linux/videodev.h>
#include <media/v4l2-ioctl.h>
#include "cpia2.h"
diff -r 615fb8f01610 -r f7f2fb8805eb
linux/drivers/media/video/cx23885/cx23885-video.c
--- a/linux/drivers/media/video/cx23885/cx23885-video.c Tue Mar 10 02:33:02
2009 -0300
+++ b/linux/drivers/media/video/cx23885/cx23885-video.c Tue Mar 10 05:31:34
2009 -0300
@@ -35,11 +35,6 @@
#include "cx23885.h"
#include <media/v4l2-common.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_AUTHOR("Steven Toth <[email protected]>");
diff -r 615fb8f01610 -r f7f2fb8805eb linux/drivers/media/video/cx88/cx88-video.c
--- a/linux/drivers/media/video/cx88/cx88-video.c Tue Mar 10 02:33:02
2009 -0300
+++ b/linux/drivers/media/video/cx88/cx88-video.c Tue Mar 10 05:31:34
2009 -0300
@@ -41,11 +41,6 @@
#include "cx88.h"
#include <media/v4l2-common.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_AUTHOR("Gerd Knorr <[email protected]> [SuSE Labs]");
diff -r 615fb8f01610 -r f7f2fb8805eb linux/drivers/media/video/msp3400-driver.c
--- a/linux/drivers/media/video/msp3400-driver.c Tue Mar 10 02:33:02
2009 -0300
+++ b/linux/drivers/media/video/msp3400-driver.c Tue Mar 10 05:31:34
2009 -0300
@@ -57,7 +57,7 @@
#else
#include <linux/freezer.h>
#endif
-#include <linux/videodev2.h>
+#include <linux/videodev.h>
#include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>
#include <media/v4l2-i2c-drv-legacy.h>
diff -r 615fb8f01610 -r f7f2fb8805eb linux/drivers/media/video/mxb.c
--- a/linux/drivers/media/video/mxb.c Tue Mar 10 02:33:02 2009 -0300
+++ b/linux/drivers/media/video/mxb.c Tue Mar 10 05:31:34 2009 -0300
@@ -25,7 +25,6 @@
#include <media/saa7146_vv.h>
#include <media/tuner.h>
-#include <linux/video_decoder.h>
#include <media/v4l2-common.h>
#include <media/saa7115.h>
#include "compat.h"
diff -r 615fb8f01610 -r f7f2fb8805eb linux/drivers/media/video/ov7670.c
--- a/linux/drivers/media/video/ov7670.c Tue Mar 10 02:33:02 2009 -0300
+++ b/linux/drivers/media/video/ov7670.c Tue Mar 10 05:31:34 2009 -0300
@@ -14,7 +14,7 @@
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/delay.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
#include <media/v4l2-common.h>
#include <media/v4l2-chip-ident.h>
#include <linux/i2c.h>
diff -r 615fb8f01610 -r f7f2fb8805eb
linux/drivers/media/video/saa7134/saa7134-video.c
--- a/linux/drivers/media/video/saa7134/saa7134-video.c Tue Mar 10 02:33:02
2009 -0300
+++ b/linux/drivers/media/video/saa7134/saa7134-video.c Tue Mar 10 05:31:34
2009 -0300
@@ -30,11 +30,6 @@
#include "saa7134-reg.h"
#include "saa7134.h"
#include <media/v4l2-common.h>
-
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-/* Include V4L1 specific functions. Should be removed soon */
-#include <linux/videodev.h>
-#endif
/* ------------------------------------------------------------------ */
diff -r 615fb8f01610 -r f7f2fb8805eb linux/drivers/media/video/saa7146.h
--- a/linux/drivers/media/video/saa7146.h Tue Mar 10 02:33:02 2009 -0300
+++ b/linux/drivers/media/video/saa7146.h Tue Mar 10 05:31:34 2009 -0300
@@ -24,8 +24,6 @@
#include <linux/types.h>
#include <linux/wait.h>
-
-#include <linux/videodev.h>
#ifndef O_NONCAP
#define O_NONCAP O_TRUNC
diff -r 615fb8f01610 -r f7f2fb8805eb linux/drivers/media/video/v4l2-ioctl.c
--- a/linux/drivers/media/video/v4l2-ioctl.c Tue Mar 10 02:33:02 2009 -0300
+++ b/linux/drivers/media/video/v4l2-ioctl.c Tue Mar 10 05:31:34 2009 -0300
@@ -17,6 +17,7 @@
#include <linux/kernel.h>
#define __OLD_VIDIOC_ /* To allow fixing old calls */
+#include <linux/videodev.h>
#include <linux/videodev2.h>
#ifdef CONFIG_VIDEO_V4L1
diff -r 615fb8f01610 -r f7f2fb8805eb linux/drivers/media/video/vivi.c
--- a/linux/drivers/media/video/vivi.c Tue Mar 10 02:33:02 2009 -0300
+++ b/linux/drivers/media/video/vivi.c Tue Mar 10 05:31:34 2009 -0300
@@ -29,10 +29,6 @@
#include "compat.h"
#include <linux/videodev2.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/kthread.h>
#include <linux/highmem.h>
diff -r 615fb8f01610 -r f7f2fb8805eb linux/drivers/media/video/w9966.c
--- a/linux/drivers/media/video/w9966.c Tue Mar 10 02:33:02 2009 -0300
+++ b/linux/drivers/media/video/w9966.c Tue Mar 10 05:31:34 2009 -0300
@@ -58,7 +58,7 @@
#include <linux/init.h>
#include <linux/delay.h>
#include "compat.h"
-#include <linux/videodev2.h>
+#include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <media/v4l2-ioctl.h>
#include <linux/parport.h>
diff -r 615fb8f01610 -r f7f2fb8805eb linux/drivers/media/video/w9968cf.c
--- a/linux/drivers/media/video/w9968cf.c Tue Mar 10 02:33:02 2009 -0300
+++ b/linux/drivers/media/video/w9968cf.c Tue Mar 10 05:31:34 2009 -0300
@@ -42,6 +42,7 @@
#include <asm/page.h>
#include <asm/uaccess.h>
#include <linux/page-flags.h>
+#include <linux/videodev.h>
#include <media/v4l2-ioctl.h>
#include "w9968cf.h"
diff -r 615fb8f01610 -r f7f2fb8805eb
linux/drivers/media/video/zoran/zoran_driver.c
--- a/linux/drivers/media/video/zoran/zoran_driver.c Tue Mar 10 02:33:02
2009 -0300
+++ b/linux/drivers/media/video/zoran/zoran_driver.c Tue Mar 10 05:31:34
2009 -0300
@@ -59,7 +59,7 @@
#include <linux/spinlock.h>
-#include <linux/videodev2.h>
+#include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <media/v4l2-ioctl.h>
#include "videocodec.h"
diff -r 615fb8f01610 -r f7f2fb8805eb linux/include/linux/videodev.h
--- a/linux/include/linux/videodev.h Tue Mar 10 02:33:02 2009 -0300
+++ b/linux/include/linux/videodev.h Tue Mar 10 05:31:34 2009 -0300
@@ -16,6 +16,23 @@
#include <linux/ioctl.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__)
#define VID_TYPE_CAPTURE 1 /* Can capture */
@@ -312,6 +329,7 @@ struct video_code
#define VID_PLAY_END_MARK 14
#endif /* CONFIG_VIDEO_V4L1_COMPAT */
+#endif /* __MIN_V4L1 */
#endif /* __LINUX_VIDEODEV_H */
diff -r 615fb8f01610 -r f7f2fb8805eb linux/include/media/v4l2-ioctl.h
--- a/linux/include/media/v4l2-ioctl.h Tue Mar 10 02:33:02 2009 -0300
+++ b/linux/include/media/v4l2-ioctl.h Tue Mar 10 05:31:34 2009 -0300
@@ -15,6 +15,7 @@
#include <linux/mutex.h>
#include <linux/compiler.h> /* need __user */
#ifdef CONFIG_VIDEO_V4L1_COMPAT
+#define __MIN_V4L1
#include <linux/videodev.h>
#else
#include <linux/videodev2.h>
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/f7f2fb8805ebfdab6d62c5f0af7c71e7164ef555
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
