diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-06-10 06:34:31 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-17 10:57:25 -0400 |
commit | 5e6ec6b0f74f226f705e7b32b57c409dd6ee7a68 (patch) | |
tree | 43c79a1a3aff9d28d6cbc116f8edc5c783c468d5 /Documentation/DocBook | |
parent | dda4a4d5ea245591b788b70116fb52b0d145fb33 (diff) |
[media] DocBook media: document new u8 and u16 control types
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>
Diffstat (limited to 'Documentation/DocBook')
-rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml | 14 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-queryctrl.xml | 23 |
2 files changed, 36 insertions, 1 deletions
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml b/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml index 2a157b3f2ab2..c5bdbfcc42b3 100644 --- a/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml +++ b/Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml | |||
@@ -186,6 +186,20 @@ type <constant>V4L2_CTRL_TYPE_STRING</constant>.</entry> | |||
186 | </row> | 186 | </row> |
187 | <row> | 187 | <row> |
188 | <entry></entry> | 188 | <entry></entry> |
189 | <entry>__u8 *</entry> | ||
190 | <entry><structfield>p_u8</structfield></entry> | ||
191 | <entry>A pointer to a matrix control of unsigned 8-bit values. | ||
192 | Valid if this control is of type <constant>V4L2_CTRL_TYPE_U8</constant>.</entry> | ||
193 | </row> | ||
194 | <row> | ||
195 | <entry></entry> | ||
196 | <entry>__u16 *</entry> | ||
197 | <entry><structfield>p_u16</structfield></entry> | ||
198 | <entry>A pointer to a matrix control of unsigned 16-bit values. | ||
199 | Valid if this control is of type <constant>V4L2_CTRL_TYPE_U16</constant>.</entry> | ||
200 | </row> | ||
201 | <row> | ||
202 | <entry></entry> | ||
189 | <entry>void *</entry> | 203 | <entry>void *</entry> |
190 | <entry><structfield>ptr</structfield></entry> | 204 | <entry><structfield>ptr</structfield></entry> |
191 | <entry>A pointer to a compound type which can be an N-dimensional array and/or a | 205 | <entry>A pointer to a compound type which can be an N-dimensional array and/or a |
diff --git a/Documentation/DocBook/media/v4l/vidioc-queryctrl.xml b/Documentation/DocBook/media/v4l/vidioc-queryctrl.xml index 04589e53f38b..d9a3f23371e2 100644 --- a/Documentation/DocBook/media/v4l/vidioc-queryctrl.xml +++ b/Documentation/DocBook/media/v4l/vidioc-queryctrl.xml | |||
@@ -289,7 +289,8 @@ accepts values 0-511 and the driver reports 0-65535, step should be | |||
289 | <entry>The default value of a | 289 | <entry>The default value of a |
290 | <constant>V4L2_CTRL_TYPE_INTEGER</constant>, <constant>_INTEGER64</constant>, | 290 | <constant>V4L2_CTRL_TYPE_INTEGER</constant>, <constant>_INTEGER64</constant>, |
291 | <constant>_BOOLEAN</constant>, <constant>_BITMASK</constant>, | 291 | <constant>_BOOLEAN</constant>, <constant>_BITMASK</constant>, |
292 | <constant>_MENU</constant> or <constant>_INTEGER_MENU</constant> control. | 292 | <constant>_MENU</constant>, <constant>_INTEGER_MENU</constant>, |
293 | <constant>_U8</constant> or <constant>_U16</constant> control. | ||
293 | Not valid for other types of controls. | 294 | Not valid for other types of controls. |
294 | Note that drivers reset controls to their default value only when the | 295 | Note that drivers reset controls to their default value only when the |
295 | driver is first loaded, never afterwards. | 296 | driver is first loaded, never afterwards. |
@@ -510,6 +511,26 @@ ioctl returns the name of the control class and this control type. | |||
510 | Older drivers which do not support this feature return an | 511 | Older drivers which do not support this feature return an |
511 | &EINVAL;.</entry> | 512 | &EINVAL;.</entry> |
512 | </row> | 513 | </row> |
514 | <row> | ||
515 | <entry><constant>V4L2_CTRL_TYPE_U8</constant></entry> | ||
516 | <entry>any</entry> | ||
517 | <entry>any</entry> | ||
518 | <entry>any</entry> | ||
519 | <entry>An unsigned 8-bit valued control ranging from minimum to | ||
520 | maximum inclusive. The step value indicates the increment between | ||
521 | values which are actually different on the hardware. This type is only used | ||
522 | in array controls.</entry> | ||
523 | </row> | ||
524 | <row> | ||
525 | <entry><constant>V4L2_CTRL_TYPE_U16</constant></entry> | ||
526 | <entry>any</entry> | ||
527 | <entry>any</entry> | ||
528 | <entry>any</entry> | ||
529 | <entry>An unsigned 16-bit valued control ranging from minimum to | ||
530 | maximum inclusive. The step value indicates the increment between | ||
531 | values which are actually different on the hardware. This type is only used | ||
532 | in array controls.</entry> | ||
533 | </row> | ||
513 | </tbody> | 534 | </tbody> |
514 | </tgroup> | 535 | </tgroup> |
515 | </table> | 536 | </table> |