From d81b1198dfc83d73aa2885c4043bb341e4d4b586 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Fri, 6 Feb 2009 18:59:35 -0300
Subject: [PATCH] --- yaml --- r: 138239 b: refs/heads/master c:
 2da9479aaa331bdfaadab0d14f75fd76bfa5e56a h: refs/heads/master i:   138237:
 4d19acd5d6f99f24af9a1902c0d8476b5e355c2b   138235:
 5160707e18fb49e95126baa121e01407051e0dd6   138231:
 09091745dfcc206995e67fdf1eeea14aa449d06b   138223:
 7bd3a5bdae7de5e6b5d0141ad8ff664d16b73f45   138207:
 b484c1c6f3f3a0367d1b887b083fff68bb0998fb   138175:
 ce72ddb7932f29c34746d64652908b7202a1954b   138111:
 32bfdb2b5aa2785d5c12ad3133489cc538324a68   137983:
 8e4fde78bda23e0aa1ac8a646942edda28e35479   137727:
 10008544683729c886e749dd518779bcefa35144   137215:
 db91301455c129402251b6435a6e6c198d10c30b v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/media/video/v4l2-subdev.c | 8 ++++++++
 trunk/include/media/v4l2-subdev.h       | 6 +++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 138915342fcc..889a89748cd2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e34184edfbe3ea818408f0ac1cb1fe538301e67d
+refs/heads/master: 2da9479aaa331bdfaadab0d14f75fd76bfa5e56a
diff --git a/trunk/drivers/media/video/v4l2-subdev.c b/trunk/drivers/media/video/v4l2-subdev.c
index 923ec8d01991..dc881671d536 100644
--- a/trunk/drivers/media/video/v4l2-subdev.c
+++ b/trunk/drivers/media/video/v4l2-subdev.c
@@ -98,6 +98,10 @@ int v4l2_subdev_command(struct v4l2_subdev *sd, unsigned cmd, void *arg)
 		return v4l2_subdev_call(sd, video, g_vbi_data, arg);
 	case VIDIOC_G_SLICED_VBI_CAP:
 		return v4l2_subdev_call(sd, video, g_sliced_vbi_cap, arg);
+	case VIDIOC_ENUM_FMT:
+		return v4l2_subdev_call(sd, video, enum_fmt, arg);
+	case VIDIOC_TRY_FMT:
+		return v4l2_subdev_call(sd, video, try_fmt, arg);
 	case VIDIOC_S_FMT:
 		return v4l2_subdev_call(sd, video, s_fmt, arg);
 	case VIDIOC_G_FMT:
@@ -112,6 +116,10 @@ int v4l2_subdev_command(struct v4l2_subdev *sd, unsigned cmd, void *arg)
 		return v4l2_subdev_call(sd, video, s_stream, 1);
 	case VIDIOC_STREAMOFF:
 		return v4l2_subdev_call(sd, video, s_stream, 0);
+	case VIDIOC_S_PARM:
+		return v4l2_subdev_call(sd, video, s_parm, arg);
+	case VIDIOC_G_PARM:
+		return v4l2_subdev_call(sd, video, g_parm, arg);
 
 	default:
 		return v4l2_subdev_call(sd, core, ioctl, cmd, arg);
diff --git a/trunk/include/media/v4l2-subdev.h b/trunk/include/media/v4l2-subdev.h
index 1b97a2c33a73..d7a72d2d1f00 100644
--- a/trunk/include/media/v4l2-subdev.h
+++ b/trunk/include/media/v4l2-subdev.h
@@ -118,8 +118,12 @@ struct v4l2_subdev_video_ops {
 	int (*querystd)(struct v4l2_subdev *sd, v4l2_std_id *std);
 	int (*g_input_status)(struct v4l2_subdev *sd, u32 *status);
 	int (*s_stream)(struct v4l2_subdev *sd, int enable);
-	int (*s_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
+	int (*enum_fmt)(struct v4l2_subdev *sd, struct v4l2_fmtdesc *fmtdesc);
 	int (*g_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
+	int (*try_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
+	int (*s_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
+	int (*g_parm)(struct v4l2_subdev *sd, struct v4l2_streamparm *param);
+	int (*s_parm)(struct v4l2_subdev *sd, struct v4l2_streamparm *param);
 };
 
 struct v4l2_subdev_ops {