diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-03-24 05:09:29 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-24 12:49:39 -0400 |
commit | 098cbc38c27dee66e5bc7f088c30b96e5cc96510 (patch) | |
tree | a1d52d30644f358188a55235f8c6975d8ddb70c9 /Documentation/DocBook | |
parent | 02fa628217e995bd7b1fe8c1b7cc7a510f6b8349 (diff) |
[media] DocBook/media/v4l: remove the documentation of the obsolete dv_preset API
This API is no longer used by any driver and so can be removed from the
documentation.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'Documentation/DocBook')
-rw-r--r-- | Documentation/DocBook/media/v4l/common.xml | 14 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/compat.xml | 4 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/v4l2.xml | 3 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-enum-dv-presets.xml | 240 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-enuminput.xml | 5 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-enumoutput.xml | 5 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-g-dv-preset.xml | 113 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-query-dv-preset.xml | 78 |
8 files changed, 2 insertions, 460 deletions
diff --git a/Documentation/DocBook/media/v4l/common.xml b/Documentation/DocBook/media/v4l/common.xml index ae06afbbb3a9..1ddf354aa997 100644 --- a/Documentation/DocBook/media/v4l/common.xml +++ b/Documentation/DocBook/media/v4l/common.xml | |||
@@ -750,15 +750,6 @@ header can be used to get the timings of the formats in the <xref linkend="cea86 | |||
750 | <xref linkend="vesadmt" /> standards. | 750 | <xref linkend="vesadmt" /> standards. |
751 | </para> | 751 | </para> |
752 | </listitem> | 752 | </listitem> |
753 | <listitem> | ||
754 | <para>DV Presets: Digital Video (DV) presets (<emphasis role="bold">deprecated</emphasis>). | ||
755 | These are IDs representing a | ||
756 | video timing at the input/output. Presets are pre-defined timings implemented | ||
757 | by the hardware according to video standards. A __u32 data type is used to represent | ||
758 | a preset unlike the bit mask that is used in &v4l2-std-id; allowing future extensions | ||
759 | to support as many different presets as needed. This API is deprecated in favor of the DV Timings | ||
760 | API.</para> | ||
761 | </listitem> | ||
762 | </itemizedlist> | 753 | </itemizedlist> |
763 | <para>To enumerate and query the attributes of the DV timings supported by a device, | 754 | <para>To enumerate and query the attributes of the DV timings supported by a device, |
764 | applications use the &VIDIOC-ENUM-DV-TIMINGS; and &VIDIOC-DV-TIMINGS-CAP; ioctls. | 755 | applications use the &VIDIOC-ENUM-DV-TIMINGS; and &VIDIOC-DV-TIMINGS-CAP; ioctls. |
@@ -766,11 +757,6 @@ API.</para> | |||
766 | &VIDIOC-S-DV-TIMINGS; ioctl and to get current DV timings they use the | 757 | &VIDIOC-S-DV-TIMINGS; ioctl and to get current DV timings they use the |
767 | &VIDIOC-G-DV-TIMINGS; ioctl. To detect the DV timings as seen by the video receiver applications | 758 | &VIDIOC-G-DV-TIMINGS; ioctl. To detect the DV timings as seen by the video receiver applications |
768 | use the &VIDIOC-QUERY-DV-TIMINGS; ioctl.</para> | 759 | use the &VIDIOC-QUERY-DV-TIMINGS; ioctl.</para> |
769 | <para>To enumerate and query the attributes of DV presets supported by a device, | ||
770 | applications use the &VIDIOC-ENUM-DV-PRESETS; ioctl. To get the current DV preset, | ||
771 | applications use the &VIDIOC-G-DV-PRESET; ioctl and to set a preset they use the | ||
772 | &VIDIOC-S-DV-PRESET; ioctl. To detect the preset as seen by the video receiver applications | ||
773 | use the &VIDIOC-QUERY-DV-PRESET; ioctl.</para> | ||
774 | <para>Applications can make use of the <xref linkend="input-capabilities" /> and | 760 | <para>Applications can make use of the <xref linkend="input-capabilities" /> and |
775 | <xref linkend="output-capabilities"/> flags to decide what ioctls are available to set the | 761 | <xref linkend="output-capabilities"/> flags to decide what ioctls are available to set the |
776 | video timings for the device.</para> | 762 | video timings for the device.</para> |
diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml index 104a1a2b8849..effa5094a2f8 100644 --- a/Documentation/DocBook/media/v4l/compat.xml +++ b/Documentation/DocBook/media/v4l/compat.xml | |||
@@ -2625,8 +2625,8 @@ interfaces and should not be implemented in new drivers.</para> | |||
2625 | <xref linkend="extended-controls" />.</para> | 2625 | <xref linkend="extended-controls" />.</para> |
2626 | </listitem> | 2626 | </listitem> |
2627 | <listitem> | 2627 | <listitem> |
2628 | <para>&VIDIOC-G-DV-PRESET;, &VIDIOC-S-DV-PRESET;, &VIDIOC-ENUM-DV-PRESETS; and | 2628 | <para>VIDIOC_G_DV_PRESET, VIDIOC_S_DV_PRESET, VIDIOC_ENUM_DV_PRESETS and |
2629 | &VIDIOC-QUERY-DV-PRESET; ioctls. Use the DV Timings API (<xref linkend="dv-timings" />).</para> | 2629 | VIDIOC_QUERY_DV_PRESET ioctls. Use the DV Timings API (<xref linkend="dv-timings" />).</para> |
2630 | </listitem> | 2630 | </listitem> |
2631 | <listitem> | 2631 | <listitem> |
2632 | <para><constant>VIDIOC_SUBDEV_G_CROP</constant> and | 2632 | <para><constant>VIDIOC_SUBDEV_G_CROP</constant> and |
diff --git a/Documentation/DocBook/media/v4l/v4l2.xml b/Documentation/DocBook/media/v4l/v4l2.xml index a3cce18384e9..32a10eef3958 100644 --- a/Documentation/DocBook/media/v4l/v4l2.xml +++ b/Documentation/DocBook/media/v4l/v4l2.xml | |||
@@ -544,7 +544,6 @@ and discussions on the V4L mailing list.</revremark> | |||
544 | &sub-encoder-cmd; | 544 | &sub-encoder-cmd; |
545 | &sub-enumaudio; | 545 | &sub-enumaudio; |
546 | &sub-enumaudioout; | 546 | &sub-enumaudioout; |
547 | &sub-enum-dv-presets; | ||
548 | &sub-enum-dv-timings; | 547 | &sub-enum-dv-timings; |
549 | &sub-enum-fmt; | 548 | &sub-enum-fmt; |
550 | &sub-enum-framesizes; | 549 | &sub-enum-framesizes; |
@@ -558,7 +557,6 @@ and discussions on the V4L mailing list.</revremark> | |||
558 | &sub-g-audioout; | 557 | &sub-g-audioout; |
559 | &sub-g-crop; | 558 | &sub-g-crop; |
560 | &sub-g-ctrl; | 559 | &sub-g-ctrl; |
561 | &sub-g-dv-preset; | ||
562 | &sub-g-dv-timings; | 560 | &sub-g-dv-timings; |
563 | &sub-g-enc-index; | 561 | &sub-g-enc-index; |
564 | &sub-g-ext-ctrls; | 562 | &sub-g-ext-ctrls; |
@@ -582,7 +580,6 @@ and discussions on the V4L mailing list.</revremark> | |||
582 | &sub-querybuf; | 580 | &sub-querybuf; |
583 | &sub-querycap; | 581 | &sub-querycap; |
584 | &sub-queryctrl; | 582 | &sub-queryctrl; |
585 | &sub-query-dv-preset; | ||
586 | &sub-query-dv-timings; | 583 | &sub-query-dv-timings; |
587 | &sub-querystd; | 584 | &sub-querystd; |
588 | &sub-reqbufs; | 585 | &sub-reqbufs; |
diff --git a/Documentation/DocBook/media/v4l/vidioc-enum-dv-presets.xml b/Documentation/DocBook/media/v4l/vidioc-enum-dv-presets.xml deleted file mode 100644 index fced5fb0dbf0..000000000000 --- a/Documentation/DocBook/media/v4l/vidioc-enum-dv-presets.xml +++ /dev/null | |||
@@ -1,240 +0,0 @@ | |||
1 | <refentry id="vidioc-enum-dv-presets"> | ||
2 | <refmeta> | ||
3 | <refentrytitle>ioctl VIDIOC_ENUM_DV_PRESETS</refentrytitle> | ||
4 | &manvol; | ||
5 | </refmeta> | ||
6 | |||
7 | <refnamediv> | ||
8 | <refname>VIDIOC_ENUM_DV_PRESETS</refname> | ||
9 | <refpurpose>Enumerate supported Digital Video presets</refpurpose> | ||
10 | </refnamediv> | ||
11 | |||
12 | <refsynopsisdiv> | ||
13 | <funcsynopsis> | ||
14 | <funcprototype> | ||
15 | <funcdef>int <function>ioctl</function></funcdef> | ||
16 | <paramdef>int <parameter>fd</parameter></paramdef> | ||
17 | <paramdef>int <parameter>request</parameter></paramdef> | ||
18 | <paramdef>struct v4l2_dv_enum_preset *<parameter>argp</parameter></paramdef> | ||
19 | </funcprototype> | ||
20 | </funcsynopsis> | ||
21 | </refsynopsisdiv> | ||
22 | |||
23 | <refsect1> | ||
24 | <title>Arguments</title> | ||
25 | |||
26 | <variablelist> | ||
27 | <varlistentry> | ||
28 | <term><parameter>fd</parameter></term> | ||
29 | <listitem> | ||
30 | <para>&fd;</para> | ||
31 | </listitem> | ||
32 | </varlistentry> | ||
33 | <varlistentry> | ||
34 | <term><parameter>request</parameter></term> | ||
35 | <listitem> | ||
36 | <para>VIDIOC_ENUM_DV_PRESETS</para> | ||
37 | </listitem> | ||
38 | </varlistentry> | ||
39 | <varlistentry> | ||
40 | <term><parameter>argp</parameter></term> | ||
41 | <listitem> | ||
42 | <para></para> | ||
43 | </listitem> | ||
44 | </varlistentry> | ||
45 | </variablelist> | ||
46 | </refsect1> | ||
47 | |||
48 | <refsect1> | ||
49 | <title>Description</title> | ||
50 | |||
51 | <para>This ioctl is <emphasis role="bold">deprecated</emphasis>. | ||
52 | New drivers and applications should use &VIDIOC-ENUM-DV-TIMINGS; instead. | ||
53 | </para> | ||
54 | |||
55 | <para>To query the attributes of a DV preset, applications initialize the | ||
56 | <structfield>index</structfield> field and zero the reserved array of &v4l2-dv-enum-preset; | ||
57 | and call the <constant>VIDIOC_ENUM_DV_PRESETS</constant> ioctl with a pointer to this | ||
58 | structure. Drivers fill the rest of the structure or return an | ||
59 | &EINVAL; when the index is out of bounds. To enumerate all DV Presets supported, | ||
60 | applications shall begin at index zero, incrementing by one until the | ||
61 | driver returns <errorcode>EINVAL</errorcode>. Drivers may enumerate a | ||
62 | different set of DV presets after switching the video input or | ||
63 | output.</para> | ||
64 | |||
65 | <table pgwide="1" frame="none" id="v4l2-dv-enum-preset"> | ||
66 | <title>struct <structname>v4l2_dv_enum_presets</structname></title> | ||
67 | <tgroup cols="3"> | ||
68 | &cs-str; | ||
69 | <tbody valign="top"> | ||
70 | <row> | ||
71 | <entry>__u32</entry> | ||
72 | <entry><structfield>index</structfield></entry> | ||
73 | <entry>Number of the DV preset, set by the | ||
74 | application.</entry> | ||
75 | </row> | ||
76 | <row> | ||
77 | <entry>__u32</entry> | ||
78 | <entry><structfield>preset</structfield></entry> | ||
79 | <entry>This field identifies one of the DV preset values listed in <xref linkend="v4l2-dv-presets-vals"/>.</entry> | ||
80 | </row> | ||
81 | <row> | ||
82 | <entry>__u8</entry> | ||
83 | <entry><structfield>name</structfield>[24]</entry> | ||
84 | <entry>Name of the preset, a NUL-terminated ASCII string, for example: "720P-60", "1080I-60". This information is | ||
85 | intended for the user.</entry> | ||
86 | </row> | ||
87 | <row> | ||
88 | <entry>__u32</entry> | ||
89 | <entry><structfield>width</structfield></entry> | ||
90 | <entry>Width of the active video in pixels for the DV preset.</entry> | ||
91 | </row> | ||
92 | <row> | ||
93 | <entry>__u32</entry> | ||
94 | <entry><structfield>height</structfield></entry> | ||
95 | <entry>Height of the active video in lines for the DV preset.</entry> | ||
96 | </row> | ||
97 | <row> | ||
98 | <entry>__u32</entry> | ||
99 | <entry><structfield>reserved</structfield>[4]</entry> | ||
100 | <entry>Reserved for future extensions. Drivers must set the array to zero.</entry> | ||
101 | </row> | ||
102 | </tbody> | ||
103 | </tgroup> | ||
104 | </table> | ||
105 | |||
106 | <table pgwide="1" frame="none" id="v4l2-dv-presets-vals"> | ||
107 | <title>struct <structname>DV Presets</structname></title> | ||
108 | <tgroup cols="3"> | ||
109 | &cs-str; | ||
110 | <tbody valign="top"> | ||
111 | <row> | ||
112 | <entry>Preset</entry> | ||
113 | <entry>Preset value</entry> | ||
114 | <entry>Description</entry> | ||
115 | </row> | ||
116 | <row> | ||
117 | <entry></entry> | ||
118 | <entry></entry> | ||
119 | <entry></entry> | ||
120 | </row> | ||
121 | <row> | ||
122 | <entry>V4L2_DV_INVALID</entry> | ||
123 | <entry>0</entry> | ||
124 | <entry>Invalid preset value.</entry> | ||
125 | </row> | ||
126 | <row> | ||
127 | <entry>V4L2_DV_480P59_94</entry> | ||
128 | <entry>1</entry> | ||
129 | <entry>720x480 progressive video at 59.94 fps as per BT.1362.</entry> | ||
130 | </row> | ||
131 | <row> | ||
132 | <entry>V4L2_DV_576P50</entry> | ||
133 | <entry>2</entry> | ||
134 | <entry>720x576 progressive video at 50 fps as per BT.1362.</entry> | ||
135 | </row> | ||
136 | <row> | ||
137 | <entry>V4L2_DV_720P24</entry> | ||
138 | <entry>3</entry> | ||
139 | <entry>1280x720 progressive video at 24 fps as per SMPTE 296M.</entry> | ||
140 | </row> | ||
141 | <row> | ||
142 | <entry>V4L2_DV_720P25</entry> | ||
143 | <entry>4</entry> | ||
144 | <entry>1280x720 progressive video at 25 fps as per SMPTE 296M.</entry> | ||
145 | </row> | ||
146 | <row> | ||
147 | <entry>V4L2_DV_720P30</entry> | ||
148 | <entry>5</entry> | ||
149 | <entry>1280x720 progressive video at 30 fps as per SMPTE 296M.</entry> | ||
150 | </row> | ||
151 | <row> | ||
152 | <entry>V4L2_DV_720P50</entry> | ||
153 | <entry>6</entry> | ||
154 | <entry>1280x720 progressive video at 50 fps as per SMPTE 296M.</entry> | ||
155 | </row> | ||
156 | <row> | ||
157 | <entry>V4L2_DV_720P59_94</entry> | ||
158 | <entry>7</entry> | ||
159 | <entry>1280x720 progressive video at 59.94 fps as per SMPTE 274M.</entry> | ||
160 | </row> | ||
161 | <row> | ||
162 | <entry>V4L2_DV_720P60</entry> | ||
163 | <entry>8</entry> | ||
164 | <entry>1280x720 progressive video at 60 fps as per SMPTE 274M/296M.</entry> | ||
165 | </row> | ||
166 | <row> | ||
167 | <entry>V4L2_DV_1080I29_97</entry> | ||
168 | <entry>9</entry> | ||
169 | <entry>1920x1080 interlaced video at 29.97 fps as per BT.1120/SMPTE 274M.</entry> | ||
170 | </row> | ||
171 | <row> | ||
172 | <entry>V4L2_DV_1080I30</entry> | ||
173 | <entry>10</entry> | ||
174 | <entry>1920x1080 interlaced video at 30 fps as per BT.1120/SMPTE 274M.</entry> | ||
175 | </row> | ||
176 | <row> | ||
177 | <entry>V4L2_DV_1080I25</entry> | ||
178 | <entry>11</entry> | ||
179 | <entry>1920x1080 interlaced video at 25 fps as per BT.1120.</entry> | ||
180 | </row> | ||
181 | <row> | ||
182 | <entry>V4L2_DV_1080I50</entry> | ||
183 | <entry>12</entry> | ||
184 | <entry>1920x1080 interlaced video at 50 fps as per SMPTE 296M.</entry> | ||
185 | </row> | ||
186 | <row> | ||
187 | <entry>V4L2_DV_1080I60</entry> | ||
188 | <entry>13</entry> | ||
189 | <entry>1920x1080 interlaced video at 60 fps as per SMPTE 296M.</entry> | ||
190 | </row> | ||
191 | <row> | ||
192 | <entry>V4L2_DV_1080P24</entry> | ||
193 | <entry>14</entry> | ||
194 | <entry>1920x1080 progressive video at 24 fps as per SMPTE 296M.</entry> | ||
195 | </row> | ||
196 | <row> | ||
197 | <entry>V4L2_DV_1080P25</entry> | ||
198 | <entry>15</entry> | ||
199 | <entry>1920x1080 progressive video at 25 fps as per SMPTE 296M.</entry> | ||
200 | </row> | ||
201 | <row> | ||
202 | <entry>V4L2_DV_1080P30</entry> | ||
203 | <entry>16</entry> | ||
204 | <entry>1920x1080 progressive video at 30 fps as per SMPTE 296M.</entry> | ||
205 | </row> | ||
206 | <row> | ||
207 | <entry>V4L2_DV_1080P50</entry> | ||
208 | <entry>17</entry> | ||
209 | <entry>1920x1080 progressive video at 50 fps as per BT.1120.</entry> | ||
210 | </row> | ||
211 | <row> | ||
212 | <entry>V4L2_DV_1080P60</entry> | ||
213 | <entry>18</entry> | ||
214 | <entry>1920x1080 progressive video at 60 fps as per BT.1120.</entry> | ||
215 | </row> | ||
216 | </tbody> | ||
217 | </tgroup> | ||
218 | </table> | ||
219 | </refsect1> | ||
220 | |||
221 | <refsect1> | ||
222 | &return-value; | ||
223 | |||
224 | <variablelist> | ||
225 | <varlistentry> | ||
226 | <term><errorcode>EINVAL</errorcode></term> | ||
227 | <listitem> | ||
228 | <para>The &v4l2-dv-enum-preset; <structfield>index</structfield> | ||
229 | is out of bounds.</para> | ||
230 | </listitem> | ||
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> | ||
238 | </variablelist> | ||
239 | </refsect1> | ||
240 | </refentry> | ||
diff --git a/Documentation/DocBook/media/v4l/vidioc-enuminput.xml b/Documentation/DocBook/media/v4l/vidioc-enuminput.xml index 3c9a81305ad4..493a39a8ef21 100644 --- a/Documentation/DocBook/media/v4l/vidioc-enuminput.xml +++ b/Documentation/DocBook/media/v4l/vidioc-enuminput.xml | |||
@@ -278,11 +278,6 @@ input/output interface to linux-media@vger.kernel.org on 19 Oct 2009. | |||
278 | &cs-def; | 278 | &cs-def; |
279 | <tbody valign="top"> | 279 | <tbody valign="top"> |
280 | <row> | 280 | <row> |
281 | <entry><constant>V4L2_IN_CAP_PRESETS</constant></entry> | ||
282 | <entry>0x00000001</entry> | ||
283 | <entry>This input supports setting DV presets by using VIDIOC_S_DV_PRESET.</entry> | ||
284 | </row> | ||
285 | <row> | ||
286 | <entry><constant>V4L2_IN_CAP_DV_TIMINGS</constant></entry> | 281 | <entry><constant>V4L2_IN_CAP_DV_TIMINGS</constant></entry> |
287 | <entry>0x00000002</entry> | 282 | <entry>0x00000002</entry> |
288 | <entry>This input supports setting video timings by using VIDIOC_S_DV_TIMINGS.</entry> | 283 | <entry>This input supports setting video timings by using VIDIOC_S_DV_TIMINGS.</entry> |
diff --git a/Documentation/DocBook/media/v4l/vidioc-enumoutput.xml b/Documentation/DocBook/media/v4l/vidioc-enumoutput.xml index f4ab0798545d..2654e097df39 100644 --- a/Documentation/DocBook/media/v4l/vidioc-enumoutput.xml +++ b/Documentation/DocBook/media/v4l/vidioc-enumoutput.xml | |||
@@ -163,11 +163,6 @@ input/output interface to linux-media@vger.kernel.org on 19 Oct 2009. | |||
163 | &cs-def; | 163 | &cs-def; |
164 | <tbody valign="top"> | 164 | <tbody valign="top"> |
165 | <row> | 165 | <row> |
166 | <entry><constant>V4L2_OUT_CAP_PRESETS</constant></entry> | ||
167 | <entry>0x00000001</entry> | ||
168 | <entry>This output supports setting DV presets by using VIDIOC_S_DV_PRESET.</entry> | ||
169 | </row> | ||
170 | <row> | ||
171 | <entry><constant>V4L2_OUT_CAP_DV_TIMINGS</constant></entry> | 166 | <entry><constant>V4L2_OUT_CAP_DV_TIMINGS</constant></entry> |
172 | <entry>0x00000002</entry> | 167 | <entry>0x00000002</entry> |
173 | <entry>This output supports setting video timings by using VIDIOC_S_DV_TIMINGS.</entry> | 168 | <entry>This output supports setting video timings by using VIDIOC_S_DV_TIMINGS.</entry> |
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-dv-preset.xml b/Documentation/DocBook/media/v4l/vidioc-g-dv-preset.xml deleted file mode 100644 index b9ea37634f6c..000000000000 --- a/Documentation/DocBook/media/v4l/vidioc-g-dv-preset.xml +++ /dev/null | |||
@@ -1,113 +0,0 @@ | |||
1 | <refentry id="vidioc-g-dv-preset"> | ||
2 | <refmeta> | ||
3 | <refentrytitle>ioctl VIDIOC_G_DV_PRESET, VIDIOC_S_DV_PRESET</refentrytitle> | ||
4 | &manvol; | ||
5 | </refmeta> | ||
6 | |||
7 | <refnamediv> | ||
8 | <refname>VIDIOC_G_DV_PRESET</refname> | ||
9 | <refname>VIDIOC_S_DV_PRESET</refname> | ||
10 | <refpurpose>Query or select the DV preset of the current input or output</refpurpose> | ||
11 | </refnamediv> | ||
12 | |||
13 | <refsynopsisdiv> | ||
14 | <funcsynopsis> | ||
15 | <funcprototype> | ||
16 | <funcdef>int <function>ioctl</function></funcdef> | ||
17 | <paramdef>int <parameter>fd</parameter></paramdef> | ||
18 | <paramdef>int <parameter>request</parameter></paramdef> | ||
19 | <paramdef>struct v4l2_dv_preset *<parameter>argp</parameter></paramdef> | ||
20 | </funcprototype> | ||
21 | </funcsynopsis> | ||
22 | </refsynopsisdiv> | ||
23 | |||
24 | <refsect1> | ||
25 | <title>Arguments</title> | ||
26 | |||
27 | <variablelist> | ||
28 | <varlistentry> | ||
29 | <term><parameter>fd</parameter></term> | ||
30 | <listitem> | ||
31 | <para>&fd;</para> | ||
32 | </listitem> | ||
33 | </varlistentry> | ||
34 | <varlistentry> | ||
35 | <term><parameter>request</parameter></term> | ||
36 | <listitem> | ||
37 | <para>VIDIOC_G_DV_PRESET, VIDIOC_S_DV_PRESET</para> | ||
38 | </listitem> | ||
39 | </varlistentry> | ||
40 | <varlistentry> | ||
41 | <term><parameter>argp</parameter></term> | ||
42 | <listitem> | ||
43 | <para></para> | ||
44 | </listitem> | ||
45 | </varlistentry> | ||
46 | </variablelist> | ||
47 | </refsect1> | ||
48 | |||
49 | <refsect1> | ||
50 | <title>Description</title> | ||
51 | |||
52 | <para>These ioctls are <emphasis role="bold">deprecated</emphasis>. | ||
53 | New drivers and applications should use &VIDIOC-G-DV-TIMINGS; and &VIDIOC-S-DV-TIMINGS; | ||
54 | instead. | ||
55 | </para> | ||
56 | |||
57 | <para>To query and select the current DV preset, applications | ||
58 | use the <constant>VIDIOC_G_DV_PRESET</constant> and <constant>VIDIOC_S_DV_PRESET</constant> | ||
59 | ioctls which take a pointer to a &v4l2-dv-preset; type as argument. | ||
60 | Applications must zero the reserved array in &v4l2-dv-preset;. | ||
61 | <constant>VIDIOC_G_DV_PRESET</constant> returns a dv preset in the field | ||
62 | <structfield>preset</structfield> of &v4l2-dv-preset;.</para> | ||
63 | |||
64 | <para><constant>VIDIOC_S_DV_PRESET</constant> accepts a pointer to a &v4l2-dv-preset; | ||
65 | that has the preset value to be set. Applications must zero the reserved array in &v4l2-dv-preset;. | ||
66 | If the preset is not supported, it returns an &EINVAL; </para> | ||
67 | </refsect1> | ||
68 | |||
69 | <refsect1> | ||
70 | &return-value; | ||
71 | |||
72 | <variablelist> | ||
73 | <varlistentry> | ||
74 | <term><errorcode>EINVAL</errorcode></term> | ||
75 | <listitem> | ||
76 | <para>This ioctl is not supported, or the | ||
77 | <constant>VIDIOC_S_DV_PRESET</constant>,<constant>VIDIOC_S_DV_PRESET</constant> parameter was unsuitable.</para> | ||
78 | </listitem> | ||
79 | </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> | ||
87 | <term><errorcode>EBUSY</errorcode></term> | ||
88 | <listitem> | ||
89 | <para>The device is busy and therefore can not change the preset.</para> | ||
90 | </listitem> | ||
91 | </varlistentry> | ||
92 | </variablelist> | ||
93 | |||
94 | <table pgwide="1" frame="none" id="v4l2-dv-preset"> | ||
95 | <title>struct <structname>v4l2_dv_preset</structname></title> | ||
96 | <tgroup cols="3"> | ||
97 | &cs-str; | ||
98 | <tbody valign="top"> | ||
99 | <row> | ||
100 | <entry>__u32</entry> | ||
101 | <entry><structfield>preset</structfield></entry> | ||
102 | <entry>Preset value to represent the digital video timings</entry> | ||
103 | </row> | ||
104 | <row> | ||
105 | <entry>__u32</entry> | ||
106 | <entry><structfield>reserved[4]</structfield></entry> | ||
107 | <entry>Reserved fields for future use</entry> | ||
108 | </row> | ||
109 | </tbody> | ||
110 | </tgroup> | ||
111 | </table> | ||
112 | </refsect1> | ||
113 | </refentry> | ||
diff --git a/Documentation/DocBook/media/v4l/vidioc-query-dv-preset.xml b/Documentation/DocBook/media/v4l/vidioc-query-dv-preset.xml deleted file mode 100644 index 68b49d09e245..000000000000 --- a/Documentation/DocBook/media/v4l/vidioc-query-dv-preset.xml +++ /dev/null | |||
@@ -1,78 +0,0 @@ | |||
1 | <refentry id="vidioc-query-dv-preset"> | ||
2 | <refmeta> | ||
3 | <refentrytitle>ioctl VIDIOC_QUERY_DV_PRESET</refentrytitle> | ||
4 | &manvol; | ||
5 | </refmeta> | ||
6 | |||
7 | <refnamediv> | ||
8 | <refname>VIDIOC_QUERY_DV_PRESET</refname> | ||
9 | <refpurpose>Sense the DV preset received by the current | ||
10 | input</refpurpose> | ||
11 | </refnamediv> | ||
12 | |||
13 | <refsynopsisdiv> | ||
14 | <funcsynopsis> | ||
15 | <funcprototype> | ||
16 | <funcdef>int <function>ioctl</function></funcdef> | ||
17 | <paramdef>int <parameter>fd</parameter></paramdef> | ||
18 | <paramdef>int <parameter>request</parameter></paramdef> | ||
19 | <paramdef>struct v4l2_dv_preset *<parameter>argp</parameter></paramdef> | ||
20 | </funcprototype> | ||
21 | </funcsynopsis> | ||
22 | </refsynopsisdiv> | ||
23 | |||
24 | <refsect1> | ||
25 | <title>Arguments</title> | ||
26 | |||
27 | <variablelist> | ||
28 | <varlistentry> | ||
29 | <term><parameter>fd</parameter></term> | ||
30 | <listitem> | ||
31 | <para>&fd;</para> | ||
32 | </listitem> | ||
33 | </varlistentry> | ||
34 | <varlistentry> | ||
35 | <term><parameter>request</parameter></term> | ||
36 | <listitem> | ||
37 | <para>VIDIOC_QUERY_DV_PRESET</para> | ||
38 | </listitem> | ||
39 | </varlistentry> | ||
40 | <varlistentry> | ||
41 | <term><parameter>argp</parameter></term> | ||
42 | <listitem> | ||
43 | <para></para> | ||
44 | </listitem> | ||
45 | </varlistentry> | ||
46 | </variablelist> | ||
47 | </refsect1> | ||
48 | |||
49 | <refsect1> | ||
50 | <title>Description</title> | ||
51 | |||
52 | <para>This ioctl is <emphasis role="bold">deprecated</emphasis>. | ||
53 | New drivers and applications should use &VIDIOC-QUERY-DV-TIMINGS; instead. | ||
54 | </para> | ||
55 | |||
56 | <para>The hardware may be able to detect the current DV preset | ||
57 | automatically, similar to sensing the video standard. To do so, applications | ||
58 | call <constant> VIDIOC_QUERY_DV_PRESET</constant> with a pointer to a | ||
59 | &v4l2-dv-preset; type. Once the hardware detects a preset, that preset is | ||
60 | returned in the preset field of &v4l2-dv-preset;. If the preset could not be | ||
61 | detected because there was no signal, or the signal was unreliable, or the | ||
62 | signal did not map to a supported preset, then the value V4L2_DV_INVALID is | ||
63 | returned.</para> | ||
64 | </refsect1> | ||
65 | |||
66 | <refsect1> | ||
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> | ||
77 | </refsect1> | ||
78 | </refentry> | ||