Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 320746
b: refs/heads/master
c: cba3345
h: refs/heads/master
v: v3
  • Loading branch information
Alex Williamson committed Jul 31, 2012
1 parent c80fec7 commit 4fa684e
Show file tree
Hide file tree
Showing 389 changed files with 12,771 additions and 14,575 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3e9a97082fa639394e905e1fc4a0a7f719ca7644
refs/heads/master: cba3345cc494ad286ca8823f44b2c16cae496679
10 changes: 2 additions & 8 deletions trunk/Documentation/ABI/testing/sysfs-bus-rbd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,8 @@ name

pool

The name of the storage pool where this rbd image resides.
An rbd image name is unique within its pool.

pool_id

The unique identifier for the rbd image's pool. This is
a permanent attribute of the pool. A pool's id will never
change.
The pool where this rbd image resides. The pool-name pair is unique
per rados system.

size

Expand Down
23 changes: 1 addition & 22 deletions trunk/Documentation/DocBook/media/v4l/compat.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2460,7 +2460,7 @@ that used it. It was originally scheduled for removal in 2.6.35.
</section>

<section>
<title>V4L2 in Linux 3.6</title>
<title>V4L2 in Linux 3.5</title>
<orderedlist>
<listitem>
<para>Replaced <structfield>input</structfield> in
Expand All @@ -2471,24 +2471,6 @@ that used it. It was originally scheduled for removal in 2.6.35.
</orderedlist>
</section>

<section>
<title>V4L2 in Linux 3.6</title>
<orderedlist>
<listitem>
<para>Added V4L2_CAP_VIDEO_M2M and V4L2_CAP_VIDEO_M2M_MPLANE capabilities.</para>
</listitem>
</orderedlist>
</section>

<section>
<title>V4L2 in Linux 3.6</title>
<orderedlist>
<listitem>
<para>Added support for frequency band enumerations: &VIDIOC-ENUM-FREQ-BANDS;.</para>
</listitem>
</orderedlist>
</section>

<section id="other">
<title>Relation of V4L2 to other Linux multimedia APIs</title>

Expand Down Expand Up @@ -2618,9 +2600,6 @@ ioctls.</para>
<para><link linkend="v4l2-auto-focus-area"><constant>
V4L2_CID_AUTO_FOCUS_AREA</constant></link> control.</para>
</listitem>
<listitem>
<para>Support for frequency band enumeration: &VIDIOC-ENUM-FREQ-BANDS; ioctl.</para>
</listitem>
</itemizedlist>
</section>

Expand Down
5 changes: 0 additions & 5 deletions trunk/Documentation/DocBook/media/v4l/controls.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,11 +372,6 @@ minimum value disables backlight compensation.</entry>
Cr component, bits [15:8] as Cb component and bits [31:16] must be zero.
</entry>
</row>
<row>
<entry><constant>V4L2_CID_AUTOBRIGHTNESS</constant></entry>
<entry>boolean</entry>
<entry>Enable Automatic Brightness.</entry>
</row>
<row>
<entry><constant>V4L2_CID_ROTATE</constant></entry>
<entry>integer</entry>
Expand Down
6 changes: 0 additions & 6 deletions trunk/Documentation/DocBook/media/v4l/v4l2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,6 @@ structs, ioctls) must be noted in more detail in the history chapter
applications. -->

<revision>
<revnumber>3.6</revnumber>
<date>2012-07-02</date>
<authorinitials>hv</authorinitials>
<revremark>Added VIDIOC_ENUM_FREQ_BANDS.
</revremark>
<revnumber>3.5</revnumber>
<date>2012-05-07</date>
<authorinitials>sa, sn</authorinitials>
Expand Down Expand Up @@ -539,7 +534,6 @@ and discussions on the V4L mailing list.</revremark>
&sub-enum-fmt;
&sub-enum-framesizes;
&sub-enum-frameintervals;
&sub-enum-freq-bands;
&sub-enuminput;
&sub-enumoutput;
&sub-enumstd;
Expand Down
4 changes: 2 additions & 2 deletions trunk/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ different sizes.</para>
<para>To allocate device buffers applications initialize relevant fields of
the <structname>v4l2_create_buffers</structname> structure. They set the
<structfield>type</structfield> field in the
&v4l2-format; structure, embedded in this
<structname>v4l2_format</structname> structure, embedded in this
structure, to the respective stream or buffer type.
<structfield>count</structfield> must be set to the number of required buffers.
<structfield>memory</structfield> specifies the required I/O method. The
Expand Down Expand Up @@ -114,7 +114,7 @@ information.</para>
/></entry>
</row>
<row>
<entry>&v4l2-format;</entry>
<entry>struct&nbsp;v4l2_format</entry>
<entry><structfield>format</structfield></entry>
<entry>Filled in by the application, preserved by the driver.</entry>
</row>
Expand Down
14 changes: 10 additions & 4 deletions trunk/Documentation/DocBook/media/v4l/vidioc-dv-timings-cap.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,15 @@
interface and may change in the future.</para>
</note>

<para>To query the capabilities of the DV receiver/transmitter applications can call
this ioctl and the driver will fill in the structure. Note that drivers may return
different values after switching the video input or output.</para>
<para>To query the available timings, applications initialize the
<structfield>index</structfield> field and zero the reserved array of &v4l2-dv-timings-cap;
and call the <constant>VIDIOC_DV_TIMINGS_CAP</constant> ioctl with a pointer to this
structure. Drivers fill the rest of the structure or return an
&EINVAL; when the index is out of bounds. To enumerate all supported DV timings,
applications shall begin at index zero, incrementing by one until the
driver returns <errorcode>EINVAL</errorcode>. Note that drivers may enumerate a
different set of DV timings after switching the video input or
output.</para>

<table pgwide="1" frame="none" id="v4l2-bt-timings-cap">
<title>struct <structname>v4l2_bt_timings_cap</structname></title>
Expand Down Expand Up @@ -109,7 +115,7 @@ different values after switching the video input or output.</para>
<row>
<entry>__u32</entry>
<entry><structfield>reserved</structfield>[16]</entry>
<entry>Reserved for future extensions. Drivers must set the array to zero.</entry>
<entry></entry>
</row>
</tbody>
</tgroup>
Expand Down
179 changes: 0 additions & 179 deletions trunk/Documentation/DocBook/media/v4l/vidioc-enum-freq-bands.xml
View file

This file was deleted.

7 changes: 3 additions & 4 deletions trunk/Documentation/DocBook/media/v4l/vidioc-g-frequency.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,11 @@ the &v4l2-output; <structfield>modulator</structfield> field and the
<entry>__u32</entry>
<entry><structfield>type</structfield></entry>
<entry>The tuner type. This is the same value as in the
&v4l2-tuner; <structfield>type</structfield> field. The type must be set
&v4l2-tuner; <structfield>type</structfield> field. See The type must be set
to <constant>V4L2_TUNER_RADIO</constant> for <filename>/dev/radioX</filename>
device nodes, and to <constant>V4L2_TUNER_ANALOG_TV</constant>
for all others. Set this field to <constant>V4L2_TUNER_RADIO</constant> for
modulators (currently only radio modulators are supported).
See <xref linkend="v4l2-tuner-type" /></entry>
for all others. The field is not applicable to modulators, &ie; ignored
by drivers. See <xref linkend="v4l2-tuner-type" /></entry>
</row>
<row>
<entry>__u32</entry>
Expand Down
26 changes: 6 additions & 20 deletions trunk/Documentation/DocBook/media/v4l/vidioc-g-tuner.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,34 +119,26 @@ field is not quite clear.--></para></entry>
<xref linkend="tuner-capability" />. Audio flags indicate the ability
to decode audio subprograms. They will <emphasis>not</emphasis>
change, for example with the current video standard.</para><para>When
the structure refers to a radio tuner the
<constant>V4L2_TUNER_CAP_LANG1</constant>,
<constant>V4L2_TUNER_CAP_LANG2</constant> and
<constant>V4L2_TUNER_CAP_NORM</constant> flags can't be used.</para>
<para>If multiple frequency bands are supported, then
<structfield>capability</structfield> is the union of all
<structfield>capability></structfield> fields of each &v4l2-frequency-band;.
</para></entry>
the structure refers to a radio tuner only the
<constant>V4L2_TUNER_CAP_LOW</constant>,
<constant>V4L2_TUNER_CAP_STEREO</constant> and
<constant>V4L2_TUNER_CAP_RDS</constant> flags can be set.</para></entry>
</row>
<row>
<entry>__u32</entry>
<entry><structfield>rangelow</structfield></entry>
<entry spanname="hspan">The lowest tunable frequency in
units of 62.5 kHz, or if the <structfield>capability</structfield>
flag <constant>V4L2_TUNER_CAP_LOW</constant> is set, in units of 62.5
Hz. If multiple frequency bands are supported, then
<structfield>rangelow</structfield> is the lowest frequency
of all the frequency bands.</entry>
Hz.</entry>
</row>
<row>
<entry>__u32</entry>
<entry><structfield>rangehigh</structfield></entry>
<entry spanname="hspan">The highest tunable frequency in
units of 62.5 kHz, or if the <structfield>capability</structfield>
flag <constant>V4L2_TUNER_CAP_LOW</constant> is set, in units of 62.5
Hz. If multiple frequency bands are supported, then
<structfield>rangehigh</structfield> is the highest frequency
of all the frequency bands.</entry>
Hz.</entry>
</row>
<row>
<entry>__u32</entry>
Expand Down Expand Up @@ -348,12 +340,6 @@ radio tuners.</entry>
<entry>0x0200</entry>
<entry>The RDS data is parsed by the hardware and set via controls.</entry>
</row>
<row>
<entry><constant>V4L2_TUNER_CAP_FREQ_BANDS</constant></entry>
<entry>0x0400</entry>
<entry>The &VIDIOC-ENUM-FREQ-BANDS; ioctl can be used to enumerate
the available frequency bands.</entry>
</row>
</tbody>
</tgroup>
</table>
Expand Down
Loading

0 comments on commit 4fa684e

Please sign in to comment.