diff options
Diffstat (limited to 'include/media/v4l2-common.h')
| -rw-r--r-- | include/media/v4l2-common.h | 14 | 
1 files changed, 1 insertions, 13 deletions
| diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h index 91b19921f958..244e440edb53 100644 --- a/include/media/v4l2-common.h +++ b/include/media/v4l2-common.h | |||
| @@ -64,9 +64,6 @@ | |||
| 64 | /* Prints the ioctl in a human-readable format */ | 64 | /* Prints the ioctl in a human-readable format */ | 
| 65 | extern void v4l_printk_ioctl(unsigned int cmd); | 65 | extern void v4l_printk_ioctl(unsigned int cmd); | 
| 66 | 66 | ||
| 67 | /* Prints the ioctl and arg in a human-readable format */ | ||
| 68 | extern void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg); | ||
| 69 | |||
| 70 | /* Use this macro for non-I2C drivers. Pass the driver name as the first arg. */ | 67 | /* Use this macro for non-I2C drivers. Pass the driver name as the first arg. */ | 
| 71 | #define v4l_print_ioctl(name, cmd) \ | 68 | #define v4l_print_ioctl(name, cmd) \ | 
| 72 | do { \ | 69 | do { \ | 
| @@ -99,13 +96,6 @@ u32 v4l2_ctrl_next(const u32 * const *ctrl_classes, u32 id); | |||
| 99 | 96 | ||
| 100 | /* Internal ioctls */ | 97 | /* Internal ioctls */ | 
| 101 | 98 | ||
| 102 | /* VIDIOC_INT_G_REGISTER and VIDIOC_INT_S_REGISTER */ | ||
| 103 | struct v4l2_register { | ||
| 104 | u32 i2c_id; /* I2C driver ID of the I2C chip. 0 for the I2C adapter. */ | ||
| 105 | unsigned long reg; | ||
| 106 | u32 val; | ||
| 107 | }; | ||
| 108 | |||
| 109 | /* VIDIOC_INT_DECODE_VBI_LINE */ | 99 | /* VIDIOC_INT_DECODE_VBI_LINE */ | 
| 110 | struct v4l2_decode_vbi_line { | 100 | struct v4l2_decode_vbi_line { | 
| 111 | u32 is_second_field; /* Set to 0 for the first (odd) field, | 101 | u32 is_second_field; /* Set to 0 for the first (odd) field, | 
| @@ -175,9 +165,7 @@ enum v4l2_chip_ident { | |||
| 175 | Replacement of TUNER_SET_STANDBY. */ | 165 | Replacement of TUNER_SET_STANDBY. */ | 
| 176 | #define VIDIOC_INT_S_STANDBY _IOW('d', 94, u32) | 166 | #define VIDIOC_INT_S_STANDBY _IOW('d', 94, u32) | 
| 177 | 167 | ||
| 178 | /* only implemented if CONFIG_VIDEO_ADV_DEBUG is defined */ | 168 | /* 100, 101 used by VIDIOC_DBG_[SG]_REGISTER */ | 
| 179 | #define VIDIOC_INT_S_REGISTER _IOW ('d', 100, struct v4l2_register) | ||
| 180 | #define VIDIOC_INT_G_REGISTER _IOWR('d', 101, struct v4l2_register) | ||
| 181 | 169 | ||
| 182 | /* Generic reset command. The argument selects which subsystems to reset. | 170 | /* Generic reset command. The argument selects which subsystems to reset. | 
| 183 | Passing 0 will always reset the whole chip. */ | 171 | Passing 0 will always reset the whole chip. */ | 
