aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@nokia.com>2008-10-18 11:29:15 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-21 12:31:22 -0400
commitf496bc716613378f2a3f9097a8e3ea4e4e30e79d (patch)
tree1286aba130dc9c79025e58e4808e82fb6da0506f
parent36499e525f6d2c0aba7c7f619d7a6081c56707ca (diff)
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>
-rw-r--r--include/media/v4l2-int-device.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/media/v4l2-int-device.h b/include/media/v4l2-int-device.h
index b5cee8909238..9c2df41dbf92 100644
--- a/include/media/v4l2-int-device.h
+++ b/include/media/v4l2-int-device.h
@@ -204,6 +204,8 @@ enum v4l2_int_ioctl_num {
204 vidioc_int_g_ifparm_num, 204 vidioc_int_g_ifparm_num,
205 /* Does the slave need to be reset after VIDIOC_DQBUF? */ 205 /* Does the slave need to be reset after VIDIOC_DQBUF? */
206 vidioc_int_g_needs_reset_num, 206 vidioc_int_g_needs_reset_num,
207 vidioc_int_enum_framesizes_num,
208 vidioc_int_enum_frameintervals_num,
207 209
208 /* 210 /*
209 * 211 *
@@ -289,6 +291,8 @@ V4L2_INT_WRAPPER_1(s_power, enum v4l2_power, );
289V4L2_INT_WRAPPER_1(g_priv, void, *); 291V4L2_INT_WRAPPER_1(g_priv, void, *);
290V4L2_INT_WRAPPER_1(g_ifparm, struct v4l2_ifparm, *); 292V4L2_INT_WRAPPER_1(g_ifparm, struct v4l2_ifparm, *);
291V4L2_INT_WRAPPER_1(g_needs_reset, void, *); 293V4L2_INT_WRAPPER_1(g_needs_reset, void, *);
294V4L2_INT_WRAPPER_1(enum_framesizes, struct v4l2_frmsizeenum, *);
295V4L2_INT_WRAPPER_1(enum_frameintervals, struct v4l2_frmivalenum, *);
292 296
293V4L2_INT_WRAPPER_0(reset); 297V4L2_INT_WRAPPER_0(reset);
294V4L2_INT_WRAPPER_0(init); 298V4L2_INT_WRAPPER_0(init);