aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
Diffstat (limited to 'include/media')
-rw-r--r--include/media/v4l2-common.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 234e9cf7e844..c44741e78f20 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -58,6 +58,9 @@
58/* Prints the ioctl in a human-readable format */ 58/* Prints the ioctl in a human-readable format */
59extern void v4l_printk_ioctl(unsigned int cmd); 59extern void v4l_printk_ioctl(unsigned int cmd);
60 60
61/* Prints the ioctl and arg in a human-readable format */
62extern void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg);
63
61/* Use this macro for non-I2C drivers. Pass the driver name as the first arg. */ 64/* Use this macro for non-I2C drivers. Pass the driver name as the first arg. */
62#define v4l_print_ioctl(name, cmd) \ 65#define v4l_print_ioctl(name, cmd) \
63 do { \ 66 do { \
@@ -185,11 +188,11 @@ struct msp_matrix {
185 register contains invalid or erroneous data -EIO is returned. Note that 188 register contains invalid or erroneous data -EIO is returned. Note that
186 you must fill in the 'id' member and the 'field' member (to determine 189 you must fill in the 'id' member and the 'field' member (to determine
187 whether CC data from the first or second field should be obtained). */ 190 whether CC data from the first or second field should be obtained). */
188#define VIDIOC_INT_G_VBI_DATA _IOWR('d', 106, struct v4l2_sliced_vbi_data *) 191#define VIDIOC_INT_G_VBI_DATA _IOWR('d', 106, struct v4l2_sliced_vbi_data)
189 192
190/* Returns the chip identifier or V4L2_IDENT_UNKNOWN if no identification can 193/* Returns the chip identifier or V4L2_IDENT_UNKNOWN if no identification can
191 be made. */ 194 be made. */
192#define VIDIOC_INT_G_CHIP_IDENT _IOR ('d', 107, enum v4l2_chip_ident *) 195#define VIDIOC_INT_G_CHIP_IDENT _IOR ('d', 107, enum v4l2_chip_ident)
193 196
194/* Sets I2S speed in bps. This is used to provide a standard way to select I2S 197/* Sets I2S speed in bps. This is used to provide a standard way to select I2S
195 clock used by driving digital audio streams at some board designs. 198 clock used by driving digital audio streams at some board designs.
@@ -214,8 +217,8 @@ struct v4l2_routing {
214 These four commands should only be sent directly to an i2c device, they 217 These four commands should only be sent directly to an i2c device, they
215 should not be broadcast as the routing is very device specific. */ 218 should not be broadcast as the routing is very device specific. */
216#define VIDIOC_INT_S_AUDIO_ROUTING _IOW ('d', 109, struct v4l2_routing) 219#define VIDIOC_INT_S_AUDIO_ROUTING _IOW ('d', 109, struct v4l2_routing)
217#define VIDIOC_INT_G_AUDIO_ROUTING _IOR ('d', 110, struct v4l2_routing *) 220#define VIDIOC_INT_G_AUDIO_ROUTING _IOR ('d', 110, struct v4l2_routing)
218#define VIDIOC_INT_S_VIDEO_ROUTING _IOW ('d', 111, struct v4l2_routing) 221#define VIDIOC_INT_S_VIDEO_ROUTING _IOW ('d', 111, struct v4l2_routing)
219#define VIDIOC_INT_G_VIDEO_ROUTING _IOR ('d', 112, struct v4l2_routing *) 222#define VIDIOC_INT_G_VIDEO_ROUTING _IOR ('d', 112, struct v4l2_routing)
220 223
221#endif /* V4L2_COMMON_H_ */ 224#endif /* V4L2_COMMON_H_ */