From d3e4bd8e10cd70d35a59854dcdcd7280c5ed240c Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Wed, 4 Mar 2015 01:47:59 -0800 Subject: [PATCH] [media] DocBook media: document the new 'which' field The subdev enum ioctls now have a new 'which' field. Document this. Signed-off-by: Hans Verkuil Acked-by: Lad, Prabhakar Acked-by: Laurent Pinchart Acked-by: Sakari Ailus Acked-by: Sylwester Nawrocki Signed-off-by: Mauro Carvalho Chehab --- .../DocBook/media/v4l/vidioc-subdev-enum-frame-interval.xml | 13 +++++++++---- .../DocBook/media/v4l/vidioc-subdev-enum-frame-size.xml | 13 +++++++++---- .../DocBook/media/v4l/vidioc-subdev-enum-mbus-code.xml | 11 ++++++++--- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/Documentation/DocBook/media/v4l/vidioc-subdev-enum-frame-interval.xml b/Documentation/DocBook/media/v4l/vidioc-subdev-enum-frame-interval.xml index 2f8f4f0a0235..cff59f5cbf04 100644 --- a/Documentation/DocBook/media/v4l/vidioc-subdev-enum-frame-interval.xml +++ b/Documentation/DocBook/media/v4l/vidioc-subdev-enum-frame-interval.xml @@ -67,9 +67,9 @@ To enumerate frame intervals applications initialize the index, pad, - code, width and - height fields of - &v4l2-subdev-frame-interval-enum; and call the + which, code, + width and height + fields of &v4l2-subdev-frame-interval-enum; and call the VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL ioctl with a pointer to this structure. Drivers fill the rest of the structure or return an &EINVAL; if one of the input fields is invalid. All frame intervals are @@ -123,7 +123,12 @@ __u32 - reserved[9] + which + Frame intervals to be enumerated, from &v4l2-subdev-format-whence;. + + + __u32 + reserved[8] Reserved for future extensions. Applications and drivers must set the array to zero. diff --git a/Documentation/DocBook/media/v4l/vidioc-subdev-enum-frame-size.xml b/Documentation/DocBook/media/v4l/vidioc-subdev-enum-frame-size.xml index 79ce42b7c60c..abd545ede67a 100644 --- a/Documentation/DocBook/media/v4l/vidioc-subdev-enum-frame-size.xml +++ b/Documentation/DocBook/media/v4l/vidioc-subdev-enum-frame-size.xml @@ -61,9 +61,9 @@ ioctl. To enumerate frame sizes applications initialize the - pad, code and - index fields of the - &v4l2-subdev-mbus-code-enum; and call the + pad, which , + code and index + fields of the &v4l2-subdev-mbus-code-enum; and call the VIDIOC_SUBDEV_ENUM_FRAME_SIZE ioctl with a pointer to the structure. Drivers fill the minimum and maximum frame sizes or return an &EINVAL; if one of the input parameters is invalid. @@ -127,7 +127,12 @@ __u32 - reserved[9] + which + Frame sizes to be enumerated, from &v4l2-subdev-format-whence;. + + + __u32 + reserved[8] Reserved for future extensions. Applications and drivers must set the array to zero. diff --git a/Documentation/DocBook/media/v4l/vidioc-subdev-enum-mbus-code.xml b/Documentation/DocBook/media/v4l/vidioc-subdev-enum-mbus-code.xml index a6b3432449f6..0bcb278fd062 100644 --- a/Documentation/DocBook/media/v4l/vidioc-subdev-enum-mbus-code.xml +++ b/Documentation/DocBook/media/v4l/vidioc-subdev-enum-mbus-code.xml @@ -56,8 +56,8 @@ To enumerate media bus formats available at a given sub-device pad - applications initialize the pad and - index fields of &v4l2-subdev-mbus-code-enum; and + applications initialize the pad, which + and index fields of &v4l2-subdev-mbus-code-enum; and call the VIDIOC_SUBDEV_ENUM_MBUS_CODE ioctl with a pointer to this structure. Drivers fill the rest of the structure or return an &EINVAL; if either the pad or @@ -93,7 +93,12 @@ __u32 - reserved[9] + which + Media bus format codes to be enumerated, from &v4l2-subdev-format-whence;. + + + __u32 + reserved[8] Reserved for future extensions. Applications and drivers must set the array to zero. -- 2.11.0