lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (8434): Fix x86_64 compilation and move some macros to v4l2-ioctl.h

Browse Source 
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Mauro Carvalho Chehab
2008-07-20 20:26:54 -03:00
parent 35ea11ff84
commit 2864462eaf
5 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/video/compat_ioctl32.c
View File

@@ -17,7 +17,7 @@
#include <linux/videodev2.h> #include <linux/videodev2.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
#include <media/v4l2-common.h> #include <media/v4l2-ioctl.h>
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT

1
drivers/media/video/stradis.c
View File

@@ -43,6 +43,7 @@
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/videodev.h> #include <linux/videodev.h>
#include <media/v4l2-common.h> #include <media/v4l2-common.h>
#include <media/v4l2-ioctl.h>
#include "saa7146.h" #include "saa7146.h"
#include "saa7146reg.h" #include "saa7146reg.h"

1
drivers/media/video/w9968cf.c
View File

@@ -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 <media/v4l2-ioctl.h>
#include "w9968cf.h" #include "w9968cf.h"
#include "w9968cf_decoder.h" #include "w9968cf_decoder.h"

22
include/media/v4l2-common.h
View File

@@ -28,12 +28,6 @@
#include <media/v4l2-dev.h> #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 /* Common printk constucts for v4l-i2c drivers. These macros create a unique
prefix consisting of the driver name, the adapter number and the i2c prefix consisting of the driver name, the adapter number and the i2c
address. */ address. */
@@ -61,22 +55,6 @@
v4l_client_printk(KERN_DEBUG, client, fmt , ## arg); \ v4l_client_printk(KERN_DEBUG, client, fmt , ## arg); \
} while (0) } 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)
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
/* Priority helper functions */ /* Priority helper functions */

21
include/media/v4l2-ioctl.h
View File

@@ -20,6 +20,27 @@
#include <linux/videodev2.h> #include <linux/videodev2.h>
#endif #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 */ /* Video standard functions */
extern const char *v4l2_norm_to_name(v4l2_std_id id); extern const char *v4l2_norm_to_name(v4l2_std_id id);
extern int v4l2_video_std_construct(struct v4l2_standard *vs, extern int v4l2_video_std_construct(struct v4l2_standard *vs,