[media] DocBook media: document new u8 and u16 control types
authorHans Verkuil <hans.verkuil@cisco.com>
Tue, 10 Jun 2014 10:34:31 +0000 (07:34 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Thu, 17 Jul 2014 14:57:25 +0000 (11:57 -0300)
These types are needed for the upcoming Motion Detection matrix
controls, so document them.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml
Documentation/DocBook/media/v4l/vidioc-queryctrl.xml

index 2a157b3f2ab25092776b9ed3b48bf7fb4e3454bb..c5bdbfcc42b310c576e91938b79dcfa3e44bf4de 100644 (file)
@@ -183,6 +183,20 @@ type <constant>V4L2_CTRL_TYPE_INTEGER64</constant> and
            <entry><structfield>string</structfield></entry>
            <entry>A pointer to a string. Valid if this control is of
 type <constant>V4L2_CTRL_TYPE_STRING</constant>.</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>__u8 *</entry>
+           <entry><structfield>p_u8</structfield></entry>
+           <entry>A pointer to a matrix control of unsigned 8-bit values.
+Valid if this control is of type <constant>V4L2_CTRL_TYPE_U8</constant>.</entry>
+         </row>
+         <row>
+           <entry></entry>
+           <entry>__u16 *</entry>
+           <entry><structfield>p_u16</structfield></entry>
+           <entry>A pointer to a matrix control of unsigned 16-bit values.
+Valid if this control is of type <constant>V4L2_CTRL_TYPE_U16</constant>.</entry>
          </row>
          <row>
            <entry></entry>
index 04589e53f38b6af3511d6e87111b59541bd4916c..d9a3f23371e28fa642a97e833c32a5e4ed5c49b2 100644 (file)
@@ -289,7 +289,8 @@ accepts values 0-511 and the driver reports 0-65535, step should be
            <entry>The default value of a
 <constant>V4L2_CTRL_TYPE_INTEGER</constant>, <constant>_INTEGER64</constant>,
 <constant>_BOOLEAN</constant>, <constant>_BITMASK</constant>,
-<constant>_MENU</constant> or <constant>_INTEGER_MENU</constant> control.
+<constant>_MENU</constant>, <constant>_INTEGER_MENU</constant>,
+<constant>_U8</constant> or <constant>_U16</constant> control.
 Not valid for other types of controls.
 Note that drivers reset controls to their default value only when the
 driver is first loaded, never afterwards.
@@ -510,6 +511,26 @@ ioctl returns the name of the control class and this control type.
 Older drivers which do not support this feature return an
 &EINVAL;.</entry>
          </row>
+         <row>
+           <entry><constant>V4L2_CTRL_TYPE_U8</constant></entry>
+           <entry>any</entry>
+           <entry>any</entry>
+           <entry>any</entry>
+           <entry>An unsigned 8-bit valued control ranging from minimum to
+maximum inclusive. The step value indicates the increment between
+values which are actually different on the hardware. This type is only used
+in array controls.</entry>
+         </row>
+         <row>
+           <entry><constant>V4L2_CTRL_TYPE_U16</constant></entry>
+           <entry>any</entry>
+           <entry>any</entry>
+           <entry>any</entry>
+           <entry>An unsigned 16-bit valued control ranging from minimum to
+maximum inclusive. The step value indicates the increment between
+values which are actually different on the hardware. This type is only used
+in array controls.</entry>
+         </row>
        </tbody>
       </tgroup>
     </table>