summaryrefslogtreecommitdiffstats
path: root/Documentation/media/media_uapi.rst
diff options
context:
space:
mode:
authorMarkus Heiser <markus.heiser@darmarIT.de>2016-07-08 20:55:42 +0200
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-07-08 17:38:55 -0300
commite2460b1d579a6ea4f90cf2915da87b16b59e0082 (patch)
tree383cd21dd61326dfef365523fef358e3e3300604 /Documentation/media/media_uapi.rst
parent4606ce43929a0a13443d691f53928ac58b002742 (diff)
downloadlinux-stable-e2460b1d579a6ea4f90cf2915da87b16b59e0082.tar.gz
linux-stable-e2460b1d579a6ea4f90cf2915da87b16b59e0082.tar.bz2
linux-stable-e2460b1d579a6ea4f90cf2915da87b16b59e0082.zip
[media] doc-rst: linux_tv CEC part, DocBook to reST migration
This is the reST migration of media's CEC part. The migration is based on media_tree's cec branch: https://git.linuxtv.org/media_tree.git c7169ad * cec media_tree/cec [media] DocBook/media: add CEC documentation Signed-off-by: Markus Heiser <markus.heiser@darmarIT.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'Documentation/media/media_uapi.rst')
-rw-r--r--Documentation/media/media_uapi.rst13
1 files changed, 8 insertions, 5 deletions
diff --git a/Documentation/media/media_uapi.rst b/Documentation/media/media_uapi.rst
index 8211cc963b56..49f5cb5ed825 100644
--- a/Documentation/media/media_uapi.rst
+++ b/Documentation/media/media_uapi.rst
@@ -37,21 +37,23 @@ A typical media device hardware is shown at
Typical Media Device
The media infrastructure API was designed to control such devices. It is
-divided into four parts.
+divided into five parts.
-The :Ref:`first part <v4l2spec>` covers radio, video capture and output,
+The :ref:`first part <v4l2spec>` covers radio, video capture and output,
cameras, analog TV devices and codecs.
-The :Ref:`second part <dvbapi>` covers the API used for digital TV and
+The :ref:`second part <dvbapi>` covers the API used for digital TV and
Internet reception via one of the several digital tv standards. While it
is called as DVB API, in fact it covers several different video
standards including DVB-T/T2, DVB-S/S2, DVB-C, ATSC, ISDB-T, ISDB-S,
DTMB, etc. The complete list of supported standards can be found at
:ref:`fe-delivery-system-t`.
-The :Ref:`third part <remote_controllers>` covers the Remote Controller API.
+The :ref:`third part <remote_controllers>` covers the Remote Controller API.
-The :Ref:`fourth part <media_controller>` covers the Media Controller API.
+The :ref:`fourth part <media_controller>` covers the Media Controller API.
+
+The :ref:`fifth part <cec>` covers the CEC (Consumer Electronics Control) API.
It should also be noted that a media device may also have audio
components, like mixers, PCM capture, PCM playback, etc, which are
@@ -72,6 +74,7 @@ etc, please mail to:
uapi/dvb/dvbapi
uapi/rc/remote_controllers
uapi/mediactl/media-controller
+ uapi/cec/cec-api
uapi/gen-errors
uapi/fdl-appendix