From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-bw0-f46.google.com ([209.85.214.46]:55291 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754376Ab1KXXSC (ORCPT ); Thu, 24 Nov 2011 18:18:02 -0500 Received: by bke11 with SMTP id 11so3569985bke.19 for ; Thu, 24 Nov 2011 15:18:01 -0800 (PST) Message-ID: <4ECED0A6.40607@gmail.com> Date: Fri, 25 Nov 2011 00:17:58 +0100 From: Sylwester Nawrocki MIME-Version: 1.0 To: Sakari Ailus CC: linux-media@vger.kernel.org, laurent.pinchart@ideasonboard.com, hverkuil@xs4all.nl Subject: Re: [RFC/PATCH 2/3] v4l: Document integer menu controls References: <20111124161228.GA29342@valkosipuli.localdomain> <1322151172-5362-2-git-send-email-sakari.ailus@iki.fi> In-Reply-To: <1322151172-5362-2-git-send-email-sakari.ailus@iki.fi> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org List-ID: On 11/24/2011 05:12 PM, Sakari Ailus wrote: > Signed-off-by: Sakari Ailus > --- > Documentation/DocBook/media/v4l/compat.xml | 10 +++++ > Documentation/DocBook/media/v4l/v4l2.xml | 7 ++++ > .../DocBook/media/v4l/vidioc-queryctrl.xml | 39 +++++++++++++++++++- > 3 files changed, 54 insertions(+), 2 deletions(-) > > diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml > index b68698f..569efd1 100644 > --- a/Documentation/DocBook/media/v4l/compat.xml > +++ b/Documentation/DocBook/media/v4l/compat.xml > @@ -2379,6 +2379,16 @@ that used it. It was originally scheduled for removal in 2.6.35. > > > > +
> +V4L2 in Linux 3.3 > + > + > + Added integer menus, the new type will be > + V4L2_CTRL_TYPE_INTEGER_MENU. > + > + > +
> + >
> Relation of V4L2 to other Linux multimedia APIs > > diff --git a/Documentation/DocBook/media/v4l/v4l2.xml b/Documentation/DocBook/media/v4l/v4l2.xml > index 2ab365c..affe1ba 100644 > --- a/Documentation/DocBook/media/v4l/v4l2.xml > +++ b/Documentation/DocBook/media/v4l/v4l2.xml > @@ -128,6 +128,13 @@ structs, ioctls) must be noted in more detail in the history chapter > applications. --> > > > + 3.3 > + 2011-11-24 > + sa > + Added V4L2_CTRL_TYPE_INTEGER_MENU. > + > + > + > 3.2 > 2011-08-26 > hv > diff --git a/Documentation/DocBook/media/v4l/vidioc-queryctrl.xml b/Documentation/DocBook/media/v4l/vidioc-queryctrl.xml > index 0ac0057..049cd46 100644 > --- a/Documentation/DocBook/media/v4l/vidioc-queryctrl.xml > +++ b/Documentation/DocBook/media/v4l/vidioc-queryctrl.xml > @@ -215,11 +215,12 @@ the array to zero. > > > struct<structname>v4l2_querymenu</structname> > - > + > &cs-str; > > > __u32 > + > id > Identifies the control, set by the application > from the respective&v4l2-queryctrl; > @@ -227,18 +228,38 @@ from the respective&v4l2-queryctrl; > > > __u32 > + > index > Index of the menu item, starting at zero, set by > the application. > > > + union > + > + > + > + > + > + > __u8 > name[32] > Name of the menu item, a NUL-terminated ASCII > -string. This information is intended for the user. > +string. This information is intended for the user. This field is valid > +forV4L2_CTRL_FLAG_MENU type controls. > + > + > + > + __s64 > + value > + > + Value of the integer menu item. This field is valid for > +V4L2_CTRL_FLAG_INTEGER_MENU type > + controls. > + > > > __u32 > + > reserved > Reserved for future extensions. Drivers must set > the array to zero. > @@ -292,6 +313,20 @@ the menu items can be enumerated with the > VIDIOC_QUERYMENU ioctl. > > > + V4L2_CTRL_TYPE_INTEGER_MENU > + ≥ 0 > + 1 > + N-1 > + > + The control has a menu of N choices. The names of the > + menu items can be enumerated with the Shouldn't it be something along the lines of "The integer values of the menu items can be enumerated..." ? > +VIDIOC_QUERYMENU ioctl. This is > + similar toV4L2_CTRL_TYPE_MENU > + except that instead of integers, the menu items are > + signed 64-bit integers. > + > + > + > V4L2_CTRL_TYPE_BITMASK > 0 > n/a -- Regards, Sylwester