From: Sakari Ailus <sakari.ailus@nokia.com>
Date: Sat, 18 Oct 2008 15:29:15 +0000 (-0300)
Subject: V4L/DVB (9323): v4l2-int-if: Add enum_framesizes and enum_frameintervals ioctls.
X-Git-Tag: v2.6.28-rc1~37^2~12
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f496bc716613378f2a3f9097a8e3ea4e4e30e79d;p=linux-2.6-omap-h63xx.git

V4L/DVB (9323): v4l2-int-if: Add enum_framesizes and enum_frameintervals ioctls.

Signed-off-by: Sakari Ailus <sakari.ailus@nokia.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/include/media/v4l2-int-device.h b/include/media/v4l2-int-device.h
index b5cee890923..9c2df41dbf9 100644
--- a/include/media/v4l2-int-device.h
+++ b/include/media/v4l2-int-device.h
@@ -204,6 +204,8 @@ enum v4l2_int_ioctl_num {
 	vidioc_int_g_ifparm_num,
 	/* Does the slave need to be reset after VIDIOC_DQBUF? */
 	vidioc_int_g_needs_reset_num,
+	vidioc_int_enum_framesizes_num,
+	vidioc_int_enum_frameintervals_num,
 
 	/*
 	 *
@@ -289,6 +291,8 @@ V4L2_INT_WRAPPER_1(s_power, enum v4l2_power, );
 V4L2_INT_WRAPPER_1(g_priv, void, *);
 V4L2_INT_WRAPPER_1(g_ifparm, struct v4l2_ifparm, *);
 V4L2_INT_WRAPPER_1(g_needs_reset, void, *);
+V4L2_INT_WRAPPER_1(enum_framesizes, struct v4l2_frmsizeenum, *);
+V4L2_INT_WRAPPER_1(enum_frameintervals, struct v4l2_frmivalenum, *);
 
 V4L2_INT_WRAPPER_0(reset);
 V4L2_INT_WRAPPER_0(init);