diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-12-23 19:57:17 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-12-23 19:57:17 +0100 |
| commit | ac2c9fd519acfcea10f4b1b17b69e9f3d8f49555 (patch) | |
| tree | 3aa28180723e897e8ae6704940ed70d0679ed680 /linux/include/media/v4l2-subdev.h | |
| parent | e3ed9d5ccedc1a7a60c7cf106fbfb795448b32ea (diff) | |
| parent | d8fa5b2669acb99dcbc246d93bef9f2028c1aff0 (diff) | |
| download | mediapointer-dvb-s2-ac2c9fd519acfcea10f4b1b17b69e9f3d8f49555.tar.gz mediapointer-dvb-s2-ac2c9fd519acfcea10f4b1b17b69e9f3d8f49555.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/include/media/v4l2-subdev.h')
| -rw-r--r-- | linux/include/media/v4l2-subdev.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/include/media/v4l2-subdev.h b/linux/include/media/v4l2-subdev.h index bc9e0fbf2..ceef016bb 100644 --- a/linux/include/media/v4l2-subdev.h +++ b/linux/include/media/v4l2-subdev.h @@ -79,7 +79,7 @@ struct v4l2_subdev_core_ops { int (*g_ctrl)(struct v4l2_subdev *sd, struct v4l2_control *ctrl); int (*s_ctrl)(struct v4l2_subdev *sd, struct v4l2_control *ctrl); int (*querymenu)(struct v4l2_subdev *sd, struct v4l2_querymenu *qm); - int (*ioctl)(struct v4l2_subdev *sd, int cmd, void *arg); + int (*ioctl)(struct v4l2_subdev *sd, unsigned int cmd, void *arg); #ifdef CONFIG_VIDEO_ADV_DEBUG int (*g_register)(struct v4l2_subdev *sd, struct v4l2_register *reg); int (*s_register)(struct v4l2_subdev *sd, struct v4l2_register *reg); @@ -110,6 +110,7 @@ struct v4l2_subdev_video_ops { int (*decode_vbi_line)(struct v4l2_subdev *sd, struct v4l2_decode_vbi_line *vbi_line); int (*s_vbi_data)(struct v4l2_subdev *sd, const struct v4l2_sliced_vbi_data *vbi_data); int (*g_vbi_data)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_data *vbi_data); + int (*g_sliced_vbi_cap)(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_cap *cap); int (*s_std_output)(struct v4l2_subdev *sd, v4l2_std_id std); int (*s_stream)(struct v4l2_subdev *sd, int enable); int (*s_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt); |