diff options
9 files changed, 65 insertions, 8 deletions
diff --git a/Documentation/DocBook/media/v4l/vidioc-enum-dv-presets.xml b/Documentation/DocBook/media/v4l/vidioc-enum-dv-presets.xml index 509f0012d2a6..fced5fb0dbf0 100644 --- a/Documentation/DocBook/media/v4l/vidioc-enum-dv-presets.xml +++ b/Documentation/DocBook/media/v4l/vidioc-enum-dv-presets.xml | |||
@@ -229,6 +229,12 @@ intended for the user.</entry> | |||
229 | is out of bounds.</para> | 229 | is out of bounds.</para> |
230 | </listitem> | 230 | </listitem> |
231 | </varlistentry> | 231 | </varlistentry> |
232 | <varlistentry> | ||
233 | <term><errorcode>ENODATA</errorcode></term> | ||
234 | <listitem> | ||
235 | <para>Digital video presets are not supported for this input or output.</para> | ||
236 | </listitem> | ||
237 | </varlistentry> | ||
232 | </variablelist> | 238 | </variablelist> |
233 | </refsect1> | 239 | </refsect1> |
234 | </refentry> | 240 | </refentry> |
diff --git a/Documentation/DocBook/media/v4l/vidioc-enum-dv-timings.xml b/Documentation/DocBook/media/v4l/vidioc-enum-dv-timings.xml index 24c3bf4fd29a..b3e17c1dfaf5 100644 --- a/Documentation/DocBook/media/v4l/vidioc-enum-dv-timings.xml +++ b/Documentation/DocBook/media/v4l/vidioc-enum-dv-timings.xml | |||
@@ -106,6 +106,12 @@ application.</entry> | |||
106 | is out of bounds.</para> | 106 | is out of bounds.</para> |
107 | </listitem> | 107 | </listitem> |
108 | </varlistentry> | 108 | </varlistentry> |
109 | <varlistentry> | ||
110 | <term><errorcode>ENODATA</errorcode></term> | ||
111 | <listitem> | ||
112 | <para>Digital video presets are not supported for this input or output.</para> | ||
113 | </listitem> | ||
114 | </varlistentry> | ||
109 | </variablelist> | 115 | </variablelist> |
110 | </refsect1> | 116 | </refsect1> |
111 | </refentry> | 117 | </refentry> |
diff --git a/Documentation/DocBook/media/v4l/vidioc-enumstd.xml b/Documentation/DocBook/media/v4l/vidioc-enumstd.xml index 3a5fc5405f96..8065099401d1 100644 --- a/Documentation/DocBook/media/v4l/vidioc-enumstd.xml +++ b/Documentation/DocBook/media/v4l/vidioc-enumstd.xml | |||
@@ -378,6 +378,12 @@ system)</para></footnote></para></entry> | |||
378 | is out of bounds.</para> | 378 | is out of bounds.</para> |
379 | </listitem> | 379 | </listitem> |
380 | </varlistentry> | 380 | </varlistentry> |
381 | <varlistentry> | ||
382 | <term><errorcode>ENODATA</errorcode></term> | ||
383 | <listitem> | ||
384 | <para>Standard video timings are not supported for this input or output.</para> | ||
385 | </listitem> | ||
386 | </varlistentry> | ||
381 | </variablelist> | 387 | </variablelist> |
382 | </refsect1> | 388 | </refsect1> |
383 | </refentry> | 389 | </refentry> |
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-dv-preset.xml b/Documentation/DocBook/media/v4l/vidioc-g-dv-preset.xml index 61be9fa3803a..b9ea37634f6c 100644 --- a/Documentation/DocBook/media/v4l/vidioc-g-dv-preset.xml +++ b/Documentation/DocBook/media/v4l/vidioc-g-dv-preset.xml | |||
@@ -78,6 +78,12 @@ If the preset is not supported, it returns an &EINVAL; </para> | |||
78 | </listitem> | 78 | </listitem> |
79 | </varlistentry> | 79 | </varlistentry> |
80 | <varlistentry> | 80 | <varlistentry> |
81 | <term><errorcode>ENODATA</errorcode></term> | ||
82 | <listitem> | ||
83 | <para>Digital video presets are not supported for this input or output.</para> | ||
84 | </listitem> | ||
85 | </varlistentry> | ||
86 | <varlistentry> | ||
81 | <term><errorcode>EBUSY</errorcode></term> | 87 | <term><errorcode>EBUSY</errorcode></term> |
82 | <listitem> | 88 | <listitem> |
83 | <para>The device is busy and therefore can not change the preset.</para> | 89 | <para>The device is busy and therefore can not change the preset.</para> |
@@ -104,7 +110,4 @@ If the preset is not supported, it returns an &EINVAL; </para> | |||
104 | </tgroup> | 110 | </tgroup> |
105 | </table> | 111 | </table> |
106 | </refsect1> | 112 | </refsect1> |
107 | <refsect1> | ||
108 | &return-value; | ||
109 | </refsect1> | ||
110 | </refentry> | 113 | </refentry> |
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-dv-timings.xml b/Documentation/DocBook/media/v4l/vidioc-g-dv-timings.xml index eda1a2991bbe..feaa18072e81 100644 --- a/Documentation/DocBook/media/v4l/vidioc-g-dv-timings.xml +++ b/Documentation/DocBook/media/v4l/vidioc-g-dv-timings.xml | |||
@@ -56,7 +56,9 @@ a pointer to the &v4l2-dv-timings; structure as argument. If the ioctl is not su | |||
56 | or the timing values are not correct, the driver returns &EINVAL;.</para> | 56 | or the timing values are not correct, the driver returns &EINVAL;.</para> |
57 | <para>The <filename>linux/v4l2-dv-timings.h</filename> header can be used to get the | 57 | <para>The <filename>linux/v4l2-dv-timings.h</filename> header can be used to get the |
58 | timings of the formats in the <xref linkend="cea861" /> and <xref linkend="vesadmt" /> | 58 | timings of the formats in the <xref linkend="cea861" /> and <xref linkend="vesadmt" /> |
59 | standards.</para> | 59 | standards. If the current input or output does not support DV timings (e.g. if |
60 | &VIDIOC-ENUMINPUT; does not set the <constant>V4L2_IN_CAP_CUSTOM_TIMINGS</constant> flag), then | ||
61 | &ENODATA; is returned.</para> | ||
60 | </refsect1> | 62 | </refsect1> |
61 | 63 | ||
62 | <refsect1> | 64 | <refsect1> |
@@ -71,6 +73,12 @@ standards.</para> | |||
71 | </listitem> | 73 | </listitem> |
72 | </varlistentry> | 74 | </varlistentry> |
73 | <varlistentry> | 75 | <varlistentry> |
76 | <term><errorcode>ENODATA</errorcode></term> | ||
77 | <listitem> | ||
78 | <para>Digital video timings are not supported for this input or output.</para> | ||
79 | </listitem> | ||
80 | </varlistentry> | ||
81 | <varlistentry> | ||
74 | <term><errorcode>EBUSY</errorcode></term> | 82 | <term><errorcode>EBUSY</errorcode></term> |
75 | <listitem> | 83 | <listitem> |
76 | <para>The device is busy and therefore can not change the timings.</para> | 84 | <para>The device is busy and therefore can not change the timings.</para> |
@@ -320,7 +328,4 @@ detected or used depends on the hardware. | |||
320 | </tgroup> | 328 | </tgroup> |
321 | </table> | 329 | </table> |
322 | </refsect1> | 330 | </refsect1> |
323 | <refsect1> | ||
324 | &return-value; | ||
325 | </refsect1> | ||
326 | </refentry> | 331 | </refentry> |
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-std.xml b/Documentation/DocBook/media/v4l/vidioc-g-std.xml index 99ff1a016220..4a898417de28 100644 --- a/Documentation/DocBook/media/v4l/vidioc-g-std.xml +++ b/Documentation/DocBook/media/v4l/vidioc-g-std.xml | |||
@@ -72,7 +72,9 @@ flags, being a write-only ioctl it does not return the actual new standard as | |||
72 | the current input does not support the requested standard the driver | 72 | the current input does not support the requested standard the driver |
73 | returns an &EINVAL;. When the standard set is ambiguous drivers may | 73 | returns an &EINVAL;. When the standard set is ambiguous drivers may |
74 | return <errorcode>EINVAL</errorcode> or choose any of the requested | 74 | return <errorcode>EINVAL</errorcode> or choose any of the requested |
75 | standards.</para> | 75 | standards. If the current input or output does not support standard video timings (e.g. if |
76 | &VIDIOC-ENUMINPUT; does not set the <constant>V4L2_IN_CAP_STD</constant> flag), then | ||
77 | &ENODATA; is returned.</para> | ||
76 | </refsect1> | 78 | </refsect1> |
77 | 79 | ||
78 | <refsect1> | 80 | <refsect1> |
@@ -85,6 +87,12 @@ standards.</para> | |||
85 | <para>The <constant>VIDIOC_S_STD</constant> parameter was unsuitable.</para> | 87 | <para>The <constant>VIDIOC_S_STD</constant> parameter was unsuitable.</para> |
86 | </listitem> | 88 | </listitem> |
87 | </varlistentry> | 89 | </varlistentry> |
90 | <varlistentry> | ||
91 | <term><errorcode>ENODATA</errorcode></term> | ||
92 | <listitem> | ||
93 | <para>Standard video timings are not supported for this input or output.</para> | ||
94 | </listitem> | ||
95 | </varlistentry> | ||
88 | </variablelist> | 96 | </variablelist> |
89 | </refsect1> | 97 | </refsect1> |
90 | </refentry> | 98 | </refentry> |
diff --git a/Documentation/DocBook/media/v4l/vidioc-query-dv-preset.xml b/Documentation/DocBook/media/v4l/vidioc-query-dv-preset.xml index 1bc8aeb3ff1f..68b49d09e245 100644 --- a/Documentation/DocBook/media/v4l/vidioc-query-dv-preset.xml +++ b/Documentation/DocBook/media/v4l/vidioc-query-dv-preset.xml | |||
@@ -65,5 +65,14 @@ returned.</para> | |||
65 | 65 | ||
66 | <refsect1> | 66 | <refsect1> |
67 | &return-value; | 67 | &return-value; |
68 | |||
69 | <variablelist> | ||
70 | <varlistentry> | ||
71 | <term><errorcode>ENODATA</errorcode></term> | ||
72 | <listitem> | ||
73 | <para>Digital video presets are not supported for this input or output.</para> | ||
74 | </listitem> | ||
75 | </varlistentry> | ||
76 | </variablelist> | ||
68 | </refsect1> | 77 | </refsect1> |
69 | </refentry> | 78 | </refentry> |
diff --git a/Documentation/DocBook/media/v4l/vidioc-query-dv-timings.xml b/Documentation/DocBook/media/v4l/vidioc-query-dv-timings.xml index 44935a0ffcf0..e185f149e0a1 100644 --- a/Documentation/DocBook/media/v4l/vidioc-query-dv-timings.xml +++ b/Documentation/DocBook/media/v4l/vidioc-query-dv-timings.xml | |||
@@ -78,6 +78,12 @@ capabilities in order to give more precise feedback to the user. | |||
78 | 78 | ||
79 | <variablelist> | 79 | <variablelist> |
80 | <varlistentry> | 80 | <varlistentry> |
81 | <term><errorcode>ENODATA</errorcode></term> | ||
82 | <listitem> | ||
83 | <para>Digital video timings are not supported for this input or output.</para> | ||
84 | </listitem> | ||
85 | </varlistentry> | ||
86 | <varlistentry> | ||
81 | <term><errorcode>ENOLINK</errorcode></term> | 87 | <term><errorcode>ENOLINK</errorcode></term> |
82 | <listitem> | 88 | <listitem> |
83 | <para>No timings could be detected because no signal was found. | 89 | <para>No timings could be detected because no signal was found. |
diff --git a/Documentation/DocBook/media/v4l/vidioc-querystd.xml b/Documentation/DocBook/media/v4l/vidioc-querystd.xml index 4b79c7c04ed6..fe80a183d957 100644 --- a/Documentation/DocBook/media/v4l/vidioc-querystd.xml +++ b/Documentation/DocBook/media/v4l/vidioc-querystd.xml | |||
@@ -62,5 +62,13 @@ current video input or output.</para> | |||
62 | 62 | ||
63 | <refsect1> | 63 | <refsect1> |
64 | &return-value; | 64 | &return-value; |
65 | <variablelist> | ||
66 | <varlistentry> | ||
67 | <term><errorcode>ENODATA</errorcode></term> | ||
68 | <listitem> | ||
69 | <para>Standard video timings are not supported for this input or output.</para> | ||
70 | </listitem> | ||
71 | </varlistentry> | ||
72 | </variablelist> | ||
65 | </refsect1> | 73 | </refsect1> |
66 | </refentry> | 74 | </refentry> |