These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / Documentation / DocBook / media / dvb / demux.xml

diff --git a/kernel/Documentation/DocBook/media/dvb/demux.xml b/kernel/Documentation/DocBook/media/dvb/demux.xml
index c8683d6..34f2fb1 100644 (file)
--- a/kernel/Documentation/DocBook/media/dvb/demux.xml
+++ b/kernel/Documentation/DocBook/media/dvb/demux.xml
@@ -1,33 +1,50 @@
 <title>DVB Demux Device</title>
 
 <para>The DVB demux device controls the filters of the DVB hardware/software. It can be
-accessed through <emphasis role="tt">/dev/adapter0/demux0</emphasis>. Data types and and ioctl definitions can be
-accessed by including <emphasis role="tt">linux/dvb/dmx.h</emphasis> in your application.
+accessed through <constant>/dev/adapter?/demux?</constant>. Data types and and ioctl definitions can be
+accessed by including <constant>linux/dvb/dmx.h</constant> in your application.
 </para>
 <section id="dmx_types">
 <title>Demux Data Types</title>
 
 <section id="dmx-output-t">
-<title>dmx_output_t</title>
-<programlisting>
-typedef enum
-{
-       DMX_OUT_DECODER, /&#x22C6; Streaming directly to decoder. &#x22C6;/
-       DMX_OUT_TAP,     /&#x22C6; Output going to a memory buffer &#x22C6;/
-                        /&#x22C6; (to be retrieved via the read command).&#x22C6;/
-       DMX_OUT_TS_TAP,  /&#x22C6; Output multiplexed into a new TS  &#x22C6;/
-                        /&#x22C6; (to be retrieved by reading from the &#x22C6;/
-                        /&#x22C6; logical DVR device).                 &#x22C6;/
-       DMX_OUT_TSDEMUX_TAP /&#x22C6; Like TS_TAP but retrieved from the DMX device &#x22C6;/
-} dmx_output_t;
-</programlisting>
-<para><emphasis role="tt">DMX_OUT_TAP</emphasis> delivers the stream output to the demux device on which the ioctl is
-called.
-</para>
-<para><emphasis role="tt">DMX_OUT_TS_TAP</emphasis> routes output to the logical DVR device <emphasis role="tt">/dev/dvb/adapter0/dvr0</emphasis>,
-which delivers a TS multiplexed from all filters for which <emphasis role="tt">DMX_OUT_TS_TAP</emphasis> was
-specified.
-</para>
+<title>Output for the demux</title>
+
+<table pgwide="1" frame="none" id="dmx-output">
+    <title>enum dmx_output</title>
+    <tgroup cols="2">
+       &cs-def;
+       <thead>
+       <row>
+           <entry>ID</entry>
+           <entry>Description</entry>
+       </row>
+       </thead>
+       <tbody valign="top">
+       <row>
+               <entry align="char" id="DMX-OUT-DECODER">DMX_OUT_DECODER</entry>
+               <entry>Streaming directly to decoder.</entry>
+       </row><row>
+               <entry align="char" id="DMX-OUT-TAP">DMX_OUT_TAP</entry>
+               <entry>Output going to a memory buffer (to be retrieved via the
+                   read command). Delivers the stream output to the demux
+                   device on which the ioctl is called.</entry>
+       </row><row>
+               <entry align="char" id="DMX-OUT-TS-TAP">DMX_OUT_TS_TAP</entry>
+               <entry>Output multiplexed into a new TS (to be retrieved by
+                   reading from the logical DVR device). Routes output to the
+                   logical DVR device <constant>/dev/dvb/adapter?/dvr?</constant>,
+                   which delivers a TS multiplexed from all filters for which
+                   <constant>DMX_OUT_TS_TAP</constant> was specified.</entry>
+       </row><row>
+               <entry align="char" id="DMX-OUT-TSDEMUX-TAP">DMX_OUT_TSDEMUX_TAP</entry>
+               <entry>Like &DMX-OUT-TS-TAP; but retrieved from the DMX
+                   device.</entry>
+       </row>
+        </tbody>
+    </tgroup>
+</table>
+
 </section>
 
 <section id="dmx-input-t">