Re: [PULL] http://www.linuxtv.org/hg/~hverkuil/v4l-dvb | |
| [Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] | |
Hmm... I've produced a slicely different changeset. v4l2-common header
does contain some things that seems to be better fitted at v4l2-ioctl.
what do you think?
On Sun, 20 Jul 2008, Hans Verkuil wrote:
> Hi Mauro,
>
> Please pull from http://www.linuxtv.org/hg/~hverkuil/v4l-dvb for the
> following:
>
> - videodev: add three missing includes to fix 64-bit compile errors.
>
--
Cheers,
Mauro
diff -r c4f55ac41b8f linux/drivers/media/video/compat_ioctl32.c
--- a/linux/drivers/media/video/compat_ioctl32.c Sun Jul 20 10:49:39 2008 -0300
+++ b/linux/drivers/media/video/compat_ioctl32.c Sun Jul 20 12:16:29 2008 -0300
@@ -17,7 +17,7 @@
#include <linux/videodev2.h>
#include <linux/module.h>
#include <linux/smp_lock.h>
-#include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
#include "compat.h"
#ifdef CONFIG_COMPAT
diff -r c4f55ac41b8f linux/drivers/media/video/stradis.c
--- a/linux/drivers/media/video/stradis.c Sun Jul 20 10:49:39 2008 -0300
+++ b/linux/drivers/media/video/stradis.c Sun Jul 20 12:16:29 2008 -0300
@@ -43,6 +43,7 @@
#include <linux/vmalloc.h>
#include <linux/videodev.h>
#include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
#include "saa7146.h"
#include "saa7146reg.h"
diff -r c4f55ac41b8f linux/drivers/media/video/w9968cf.c
--- a/linux/drivers/media/video/w9968cf.c Sun Jul 20 10:49:39 2008 -0300
+++ b/linux/drivers/media/video/w9968cf.c Sun Jul 20 12:16:29 2008 -0300
@@ -42,6 +42,7 @@
#include <asm/page.h>
#include <asm/uaccess.h>
#include <linux/page-flags.h>
+#include <media/v4l2-ioctl.h>
#include "w9968cf.h"
#include "w9968cf_decoder.h"
diff -r c4f55ac41b8f linux/include/media/v4l2-common.h
--- a/linux/include/media/v4l2-common.h Sun Jul 20 10:49:39 2008 -0300
+++ b/linux/include/media/v4l2-common.h Sun Jul 20 12:16:29 2008 -0300
@@ -28,12 +28,6 @@
#include <media/v4l2-dev.h>
-/* v4l debugging and diagnostics */
-
-/* Debug bitmask flags to be used on V4L2 */
-#define V4L2_DEBUG_IOCTL 0x01
-#define V4L2_DEBUG_IOCTL_ARG 0x02
-
/* Common printk constucts for v4l-i2c drivers. These macros create a unique
prefix consisting of the driver name, the adapter number and the i2c
address. */
@@ -59,22 +53,6 @@
do { \
if (debug >= (level)) \
v4l_client_printk(KERN_DEBUG, client, fmt , ## arg); \
- } while (0)
-
-
-/* Use this macro for non-I2C drivers. Pass the driver name as the first arg. */
-#define v4l_print_ioctl(name, cmd) \
- do { \
- printk(KERN_DEBUG "%s: ", name); \
- v4l_printk_ioctl(cmd); \
- } while (0)
-
-/* Use this macro in I2C drivers where 'client' is the struct i2c_client
- pointer */
-#define v4l_i2c_print_ioctl(client, cmd) \
- do { \
- v4l_client_printk(KERN_DEBUG, client, ""); \
- v4l_printk_ioctl(cmd); \
} while (0)
/* ------------------------------------------------------------------------- */
diff -r c4f55ac41b8f linux/include/media/v4l2-ioctl.h
--- a/linux/include/media/v4l2-ioctl.h Sun Jul 20 10:49:39 2008 -0300
+++ b/linux/include/media/v4l2-ioctl.h Sun Jul 20 12:16:29 2008 -0300
@@ -19,6 +19,27 @@
#else
#include <linux/videodev2.h>
#endif
+
+/* v4l debugging and diagnostics */
+
+/* Debug bitmask flags to be used on V4L2 */
+#define V4L2_DEBUG_IOCTL 0x01
+#define V4L2_DEBUG_IOCTL_ARG 0x02
+
+/* Use this macro for non-I2C drivers. Pass the driver name as the first arg. */
+#define v4l_print_ioctl(name, cmd) \
+ do { \
+ printk(KERN_DEBUG "%s: ", name); \
+ v4l_printk_ioctl(cmd); \
+ } while (0)
+
+/* Use this macro in I2C drivers where 'client' is the struct i2c_client
+ pointer */
+#define v4l_i2c_print_ioctl(client, cmd) \
+ do { \
+ v4l_client_printk(KERN_DEBUG, client, ""); \
+ v4l_printk_ioctl(cmd); \
+ } while (0)
/* Video standard functions */
extern const char *v4l2_norm_to_name(v4l2_std_id id);
_______________________________________________
v4l-dvb-maintainer mailing list
v4l-dvb-maintainer@xxxxxxxxxxx
http://www.linuxtv.org/cgi-bin/mailman/listinfo/v4l-dvb-maintainer
|
|
-->
