diff options
author | Trent Piepho <xyzzy@speakeasy.org> | 2007-01-22 21:31:53 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-21 10:34:54 -0500 |
commit | dbbff48f39263f7e5c96a55624da87879de2bf71 (patch) | |
tree | 8baff62c9a7235bc1578952907f5ae6f271afe41 /include | |
parent | 758117c25b65ed5fa502c13f3cdf040a8f954161 (diff) |
V4L/DVB (5144): Restore VIDIOC_INT_[SG]_REGISTER calls
Add support for these ioctls to the video_ioctl2 system and the cx88
driver.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/media/v4l2-dev.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h index fb96472a1bd3..46eb71f5653c 100644 --- a/include/media/v4l2-dev.h +++ b/include/media/v4l2-dev.h | |||
@@ -77,6 +77,9 @@ int v4l_compat_translate_ioctl(struct inode *inode, struct file *file, | |||
77 | extern long v4l_compat_ioctl32(struct file *file, unsigned int cmd, | 77 | extern long v4l_compat_ioctl32(struct file *file, unsigned int cmd, |
78 | unsigned long arg); | 78 | unsigned long arg); |
79 | 79 | ||
80 | /* Forward definition of v4l2-common.h defined structure */ | ||
81 | struct v4l2_register; | ||
82 | |||
80 | /* | 83 | /* |
81 | * Newer version of video_device, handled by videodev2.c | 84 | * Newer version of video_device, handled by videodev2.c |
82 | * This version moves redundant code from video device code to | 85 | * This version moves redundant code from video device code to |
@@ -296,6 +299,15 @@ struct video_device | |||
296 | int (*vidioc_log_status) (struct file *file, void *fh); | 299 | int (*vidioc_log_status) (struct file *file, void *fh); |
297 | 300 | ||
298 | 301 | ||
302 | /* Debugging ioctls */ | ||
303 | #ifdef CONFIG_VIDEO_ADV_DEBUG | ||
304 | int (*vidioc_g_register) (struct file *file, void *fh, | ||
305 | struct v4l2_register *reg); | ||
306 | int (*vidioc_s_register) (struct file *file, void *fh, | ||
307 | struct v4l2_register *reg); | ||
308 | #endif | ||
309 | |||
310 | |||
299 | #ifdef OBSOLETE_OWNER /* to be removed soon */ | 311 | #ifdef OBSOLETE_OWNER /* to be removed soon */ |
300 | /* obsolete -- fops->owner is used instead */ | 312 | /* obsolete -- fops->owner is used instead */ |
301 | struct module *owner; | 313 | struct module *owner; |