diff options
| author | Hartmut Hackmann <hartmut.hackmann@t-online.de> | 2007-02-17 01:16:41 +0100 |
|---|---|---|
| committer | Hartmut Hackmann <hartmut.hackmann@t-online.de> | 2007-02-17 01:16:41 +0100 |
| commit | 5a728a822e3d6d1fc62e86410ec71cb87504f08b (patch) | |
| tree | 63be62ced84f42da611fe8cda64da85e39a76337 /linux/include/media/v4l2-common.h | |
| parent | 4850e008216efdfb888352955d0d166d7363743c (diff) | |
| parent | 14f8694a006fc440ea2f5f18aaefd3ff7d98e313 (diff) | |
| download | mediapointer-dvb-s2-5a728a822e3d6d1fc62e86410ec71cb87504f08b.tar.gz mediapointer-dvb-s2-5a728a822e3d6d1fc62e86410ec71cb87504f08b.tar.bz2 | |
merge with main repository
From: Hartmut Hackmann <hartmut.hackmann@t-online.de>
Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
Diffstat (limited to 'linux/include/media/v4l2-common.h')
| -rw-r--r-- | linux/include/media/v4l2-common.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/linux/include/media/v4l2-common.h b/linux/include/media/v4l2-common.h index 6e7500f1d..ef4f6cfcd 100644 --- a/linux/include/media/v4l2-common.h +++ b/linux/include/media/v4l2-common.h @@ -70,9 +70,6 @@ /* Prints the ioctl in a human-readable format */ extern void v4l_printk_ioctl(unsigned int cmd); -/* Prints the ioctl and arg in a human-readable format */ -extern void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg); - /* Use this macro for non-I2C drivers. Pass the driver name as the first arg. */ #define v4l_print_ioctl(name, cmd) \ do { \ @@ -105,13 +102,6 @@ u32 v4l2_ctrl_next(const u32 * const *ctrl_classes, u32 id); /* Internal ioctls */ -/* VIDIOC_INT_G_REGISTER and VIDIOC_INT_S_REGISTER */ -struct v4l2_register { - u32 i2c_id; /* I2C driver ID of the I2C chip. 0 for the I2C adapter. */ - unsigned long reg; - u32 val; -}; - /* VIDIOC_INT_DECODE_VBI_LINE */ struct v4l2_decode_vbi_line { u32 is_second_field; /* Set to 0 for the first (odd) field, @@ -181,9 +171,7 @@ enum v4l2_chip_ident { Replacement of TUNER_SET_STANDBY. */ #define VIDIOC_INT_S_STANDBY _IOW('d', 94, u32) -/* only implemented if CONFIG_VIDEO_ADV_DEBUG is defined */ -#define VIDIOC_INT_S_REGISTER _IOW ('d', 100, struct v4l2_register) -#define VIDIOC_INT_G_REGISTER _IOWR('d', 101, struct v4l2_register) +/* 100, 101 used by VIDIOC_DBG_[SG]_REGISTER */ /* Generic reset command. The argument selects which subsystems to reset. Passing 0 will always reset the whole chip. */ |