Em Sun, 12 Jun 2016 00:20:59 +0200 Philippe De Muyter <phdm@xxxxxxxxx> escreveu: > add max_interval and step_interval to struct > v4l2_subdev_frame_interval_enum. > > When filled correctly by the sensor driver, those fields must be > used as follows by the intermediate level : > > struct v4l2_frmivalenum *fival; > struct v4l2_subdev_frame_interval_enum fie; > > if (fie.max_interval.numerator == 0) { > fival->type = V4L2_FRMIVAL_TYPE_DISCRETE; > fival->discrete = fie.interval; > } else if (fie.step_interval.numerator == 0) { > fival->type = V4L2_FRMIVAL_TYPE_CONTINUOUS; > fival->stepwise.min = fie.interval; > fival->stepwise.max = fie.max_interval; > } else { > fival->type = V4L2_FRMIVAL_TYPE_STEPWISE; > fival->stepwise.min = fie.interval; > fival->stepwise.max = fie.max_interval; > fival->stepwise.step = fie.step_interval; > } > > Signed-off-by: Philippe De Muyter <phdm@xxxxxxxxx> > --- > include/uapi/linux/v4l2-subdev.h | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/include/uapi/linux/v4l2-subdev.h b/include/uapi/linux/v4l2-subdev.h > index dbce2b554..846dd36 100644 > --- a/include/uapi/linux/v4l2-subdev.h > +++ b/include/uapi/linux/v4l2-subdev.h > @@ -127,7 +127,9 @@ struct v4l2_subdev_frame_interval_enum { > __u32 height; > struct v4l2_fract interval; > __u32 which; > - __u32 reserved[8]; > + struct v4l2_fract max_interval; > + struct v4l2_fract step_interval; > + __u32 reserved[4]; As this changes the userspace API, you need to also patch the Documentation/media to reflect such change and explain the meaning for the new fields. Please notice that the rst documentation is under the "docs-next" branch at the media_tree.git. You should either patch against that or wait for the end for 4.8-rc1, where the documentation will be merged back on the master branch. > }; > > /** -- Thanks, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html