Merge remote-tracking branch 'mac80211-next/master'

[deliverable/linux.git] / Documentation / media / uapi / v4l / vidioc-g-tuner.rst

diff --git a/Documentation/media/uapi/v4l/vidioc-g-tuner.rst b/Documentation/media/uapi/v4l/vidioc-g-tuner.rst
index 9798a1a86e975f1cf7c2cc7feaac0a29feb898b9..bfeeeb22c41f3171fbce37af84e2fa2c95c6233e 100644 (file)
--- a/Documentation/media/uapi/v4l/vidioc-g-tuner.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-tuner.rst
@@ -15,9 +15,11 @@ VIDIOC_G_TUNER - VIDIOC_S_TUNER - Get or set tuner attributes
 Synopsis
 ========
 
 Synopsis
 ========
 

-.. cpp:function:: int ioctl( int fd, int request, struct v4l2_tuner *argp )
+.. c:function:: int ioctl( int fd, VIDIOC_G_TUNER, struct v4l2_tuner *argp )
+    :name: VIDIOC_G_TUNER

 
 

-.. cpp:function:: int ioctl( int fd, int request, const struct v4l2_tuner *argp )
+.. c:function:: int ioctl( int fd, VIDIOC_S_TUNER, const struct v4l2_tuner *argp )
+    :name: VIDIOC_S_TUNER

 
 
 Arguments
 
 
 Arguments


@@ -26,9 +28,6 @@ Arguments
 ``fd``
     File descriptor returned by :ref:`open() <func-open>`.
 
 ``fd``
     File descriptor returned by :ref:`open() <func-open>`.
 

-``request``
-    VIDIOC_G_TUNER, VIDIOC_S_TUNER
-

 ``argp``
 
 
 ``argp``
 
 


@@ -37,7 +36,7 @@ Description
 
 To query the attributes of a tuner applications initialize the ``index``
 field and zero out the ``reserved`` array of a struct
 
 To query the attributes of a tuner applications initialize the ``index``
 field and zero out the ``reserved`` array of a struct

-:ref:`v4l2_tuner <v4l2-tuner>` and call the ``VIDIOC_G_TUNER`` ioctl
+:c:type:`v4l2_tuner` and call the ``VIDIOC_G_TUNER`` ioctl

 with a pointer to this structure. Drivers fill the rest of the structure
 or return an ``EINVAL`` error code when the index is out of bounds. To
 enumerate all tuners applications shall begin at index zero,
 with a pointer to this structure. Drivers fill the rest of the structure
 or return an ``EINVAL`` error code when the index is out of bounds. To
 enumerate all tuners applications shall begin at index zero,


@@ -62,7 +61,7 @@ To change the radio frequency the
 
  .. tabularcolumns:: |p{1.3cm}|p{3.0cm}|p{6.6cm}|p{6.6cm}|
 
 
  .. tabularcolumns:: |p{1.3cm}|p{3.0cm}|p{6.6cm}|p{6.6cm}|
 

-.. _v4l2-tuner:
+.. c:type:: v4l2_tuner

 
 .. cssclass:: longtable
 
 
 .. cssclass:: longtable
 


@@ -97,7 +96,7 @@ To change the radio frequency the
 
        -  ``type``
 
 
        -  ``type``
 

-       -  :cspan:`1` Type of the tuner, see :ref:`v4l2-tuner-type`.
+       -  :cspan:`1` Type of the tuner, see :c:type:`v4l2_tuner_type`.

 
     -  .. row 4
 
 
     -  .. row 4
 


@@ -117,7 +116,7 @@ To change the radio frequency the
 
          If multiple frequency bands are supported, then ``capability`` is
          the union of all ``capability`` fields of each struct
 
          If multiple frequency bands are supported, then ``capability`` is
          the union of all ``capability`` fields of each struct

-         :ref:`v4l2_frequency_band <v4l2-frequency-band>`.
+         :c:type:`v4l2_frequency_band`.

 
     -  .. row 5
 
 
     -  .. row 5
 


@@ -227,7 +226,7 @@ To change the radio frequency the
          received audio programs do not match.
 
          Currently this is the only field of struct
          received audio programs do not match.
 
          Currently this is the only field of struct

-         :ref:`struct v4l2_tuner <v4l2-tuner>` applications can change.
+         struct :c:type:`v4l2_tuner` applications can change.

 
     -  .. row 15
 
 
     -  .. row 15
 


@@ -258,13 +257,13 @@ To change the radio frequency the
 
        -  :cspan:`1` Reserved for future extensions.
 
 
        -  :cspan:`1` Reserved for future extensions.
 

-          Drivers and applications must set the array to zero.
+         Drivers and applications must set the array to zero.

 
 
 
 .. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}|
 
 
 
 
 .. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}|
 

-.. _v4l2-tuner-type:
+.. c:type:: v4l2_tuner_type

 
 .. flat-table:: enum v4l2_tuner_type
     :header-rows:  0
 
 .. flat-table:: enum v4l2_tuner_type
     :header-rows:  0


@@ -338,7 +337,7 @@ To change the radio frequency the
          multi-standard because the video standard is automatically
          determined from the frequency band.) The set of supported video
          standards is available from the struct
          multi-standard because the video standard is automatically
          determined from the frequency band.) The set of supported video
          standards is available from the struct

-         :ref:`v4l2_input <v4l2-input>` pointing to this tuner, see the
+         :c:type:`v4l2_input` pointing to this tuner, see the

          description of ioctl :ref:`VIDIOC_ENUMINPUT`
          for details. Only ``V4L2_TUNER_ANALOG_TV`` tuners can have this
          capability.
          description of ioctl :ref:`VIDIOC_ENUMINPUT`
          for details. Only ``V4L2_TUNER_ANALOG_TV`` tuners can have this
          capability.


@@ -621,7 +620,7 @@ To change the radio frequency the
 
 .. raw:: latex
 
 
 .. raw:: latex
 

-    \newline\newline\begin{adjustbox}{width=\columnwidth}
+    \begin{adjustbox}{width=\columnwidth}

 
 .. _tuner-matrix:
 
 
 .. _tuner-matrix:
 


@@ -731,7 +730,7 @@ appropriately. The generic error codes are described at the
 :ref:`Generic Error Codes <gen-errors>` chapter.
 
 EINVAL
 :ref:`Generic Error Codes <gen-errors>` chapter.
 
 EINVAL

-    The struct :ref:`v4l2_tuner <v4l2-tuner>` ``index`` is out of
+    The struct :c:type:`v4l2_tuner` ``index`` is out of

     bounds.
 
 .. [#f1]
     bounds.
 
 .. [#f1]