diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-12 02:10:06 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-12 02:10:06 -0200 |
| commit | 5021ce47870d8ce6b8efe93938138795dcc16553 (patch) | |
| tree | 1a21631be8d469ae591d7d997bd1f378287a526a /linux/include/media/v4l2-ioctl.h | |
| parent | d2fdf36ebdc0970621958a5b6a7df809ed103bf8 (diff) | |
| parent | a3c3f7456fd59e54b7c0333ca9bb32b8be70044e (diff) | |
| download | mediapointer-dvb-s2-5021ce47870d8ce6b8efe93938138795dcc16553.tar.gz mediapointer-dvb-s2-5021ce47870d8ce6b8efe93938138795dcc16553.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/cx18-bugfix
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include/media/v4l2-ioctl.h')
| -rw-r--r-- | linux/include/media/v4l2-ioctl.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/linux/include/media/v4l2-ioctl.h b/linux/include/media/v4l2-ioctl.h index e6ba25b3d..c884432f9 100644 --- a/linux/include/media/v4l2-ioctl.h +++ b/linux/include/media/v4l2-ioctl.h @@ -232,6 +232,12 @@ struct v4l2_ioctl_ops { int (*vidioc_g_chip_ident) (struct file *file, void *fh, struct v4l2_chip_ident *chip); + int (*vidioc_enum_framesizes) (struct file *file, void *fh, + struct v4l2_frmsizeenum *fsize); + + int (*vidioc_enum_frameintervals) (struct file *file, void *fh, + struct v4l2_frmivalenum *fival); + /* For other private ioctls */ int (*vidioc_default) (struct file *file, void *fh, int cmd, void *arg); @@ -285,10 +291,8 @@ extern long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg); /* Include support for obsoleted stuff */ -extern int video_usercopy(struct inode *inode, struct file *file, - unsigned int cmd, unsigned long arg, - int (*func)(struct inode *inode, struct file *file, - unsigned int cmd, void *arg)); +extern int video_usercopy(struct file *file, unsigned int cmd, + unsigned long arg, v4l2_kioctl func); /* Standard handlers for V4L ioctl's */ |