Commit aec67f05 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] DocBook: document V4L2_CTRL_TYPE_BITMASK 



[mchehab@redhat.com: Fix a merge conflict and make compat.xml coherent with v4l2.xml]
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b6d17a56

Documentation/DocBook/media/v4l/compat.xml

+10 −0
Original line number Diff line number Diff line
@@ -2360,6 +2360,16 @@ that used it. It was originally scheduled for removal in 2.6.35. 
        </listitem>

      </orderedlist>

    </section>

    <section>

      <title>V4L2 in Linux 3.1</title>

      <orderedlist>

        <listitem>

	  <para>VIDIOC_QUERYCAP now returns a per-subsystem version instead of a per-driver one.</para>

	  <para>Standardize an error code for invalid ioctl.</para>

          <para>Added V4L2_CTRL_TYPE_BITMASK.</para>

        </listitem>

      </orderedlist>

    </section>



    <section id="other">

      <title>Relation of V4L2 to other Linux multimedia APIs</title>

Documentation/DocBook/media/v4l/v4l2.xml

+6 −5
Original line number Diff line number Diff line
@@ -130,9 +130,10 @@ applications. --> 
      <revision>

	<revnumber>3.1</revnumber>

	<date>2011-06-27</date>

	<authorinitials>mcc, po</authorinitials>

	<revremark>Documented that VIDIOC_QUERYCAP now returns a per-subsystem version instead of a per-driver one.</revremark>

	<revremark>Standardize an error code for invalid ioctl.</revremark>

	<authorinitials>mcc, po, hv</authorinitials>

	<revremark>Documented that VIDIOC_QUERYCAP now returns a per-subsystem version instead of a per-driver one.

		   Standardize an error code for invalid ioctl.

		   Added V4L2_CTRL_TYPE_BITMASK.</revremark>

      </revision>



      <revision>
@@ -409,7 +410,7 @@ and discussions on the V4L mailing list.</revremark> 
</partinfo>



<title>Video for Linux Two API Specification</title>

 <subtitle>Revision 2.6.39</subtitle>

 <subtitle>Revision 3.1</subtitle>



  <chapter id="common">

    &sub-common;

Documentation/DocBook/media/v4l/vidioc-queryctrl.xml

+11 −1
Original line number Diff line number Diff line
@@ -156,7 +156,8 @@ signed value.</entry> 
	    <entry>Maximum value, inclusive. This field gives an upper

bound for <constant>V4L2_CTRL_TYPE_INTEGER</constant> controls and the

highest valid index for <constant>V4L2_CTRL_TYPE_MENU</constant>

controls.

controls. For <constant>V4L2_CTRL_TYPE_BITMASK</constant> controls it is the

set of usable bits.

For <constant>V4L2_CTRL_TYPE_STRING</constant> controls the maximum value

gives the maximum length of the string. This length <emphasis>does not include the terminating

zero</emphasis>. It may not be valid for any other type of control, including
@@ -289,6 +290,15 @@ values which are actually different on the hardware.</entry> 
	    <entry>The control has a menu of N choices. The names of

the menu items can be enumerated with the

<constant>VIDIOC_QUERYMENU</constant> ioctl.</entry>

	  </row>

	  <row>

	    <entry><constant>V4L2_CTRL_TYPE_BITMASK</constant></entry>

	    <entry>0</entry>

	    <entry>n/a</entry>

	    <entry>any</entry>

	    <entry>A bitmask field. The maximum value is the set of bits that can

be used, all other bits are to be 0. The maximum value is interpreted as a __u32,

allowing the use of bit 31 in the bitmask.</entry>

	  </row>

	  <row>

	    <entry><constant>V4L2_CTRL_TYPE_BUTTON</constant></entry>