summaryrefslogtreecommitdiff
path: root/Documentation/DocBook/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-05-29 01:06:56 (GMT)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-05-30 14:11:35 (GMT)
commit9df4fc5b8f34383d116a160809e782b4ca50a808 (patch)
tree00e2d22de7199a13cc4f5be1ce54d4ed03d2c022 /Documentation/DocBook/media
parent903142e53c648ee61c00f5c3b420b16bc6336ad7 (diff)
downloadlinux-9df4fc5b8f34383d116a160809e782b4ca50a808.tar.xz
[media] DocBook: improve documentation for hierarchy
Format it as a table and links it with the legacy API xml. Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'Documentation/DocBook/media')
-rw-r--r--Documentation/DocBook/media/dvb/dvbproperty.xml46
-rw-r--r--Documentation/DocBook/media/dvb/frontend.xml18
-rw-r--r--Documentation/DocBook/media/dvb/frontend_legacy_api.xml2
3 files changed, 38 insertions, 28 deletions
diff --git a/Documentation/DocBook/media/dvb/dvbproperty.xml b/Documentation/DocBook/media/dvb/dvbproperty.xml
index 5f30a28..ae9bc1e 100644
--- a/Documentation/DocBook/media/dvb/dvbproperty.xml
+++ b/Documentation/DocBook/media/dvb/dvbproperty.xml
@@ -951,15 +951,43 @@ typedef enum atscmh_sccc_code_mode {
<section id="DTV-HIERARCHY">
<title><constant>DTV_HIERARCHY</constant></title>
<para>Frontend hierarchy</para>
- <programlisting>
-typedef enum fe_hierarchy {
- HIERARCHY_NONE,
- HIERARCHY_1,
- HIERARCHY_2,
- HIERARCHY_4,
- HIERARCHY_AUTO
- } fe_hierarchy_t;
- </programlisting>
+
+
+<section id="fe-hierarchy-t">
+<title>Frontend hierarchy</title>
+
+<table pgwide="1" frame="none" id="fe-hierarchy">
+ <title>enum fe_hierarchy</title>
+ <tgroup cols="2">
+ &cs-def;
+ <thead>
+ <row>
+ <entry>ID</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody valign="top">
+ <row>
+ <entry>HIERARCHY_NONE</entry>
+ <entry>No hierarchy</entry>
+ </row><row>
+ <entry>HIERARCHY_AUTO</entry>
+ <entry>Autodetect hierarchy (if supported)</entry>
+ </row><row>
+ <entry>HIERARCHY_1</entry>
+ <entry>Hierarchy 1</entry>
+ </row><row>
+ <entry>HIERARCHY_2</entry>
+ <entry>Hierarchy 2</entry>
+ </row><row>
+ <entry>HIERARCHY_4</entry>
+ <entry>Hierarchy 4</entry>
+ </row>
+ </tbody>
+ </tgroup>
+</table>
+</section>
+
</section>
<section id="DTV-STREAM-ID">
<title><constant>DTV_STREAM_ID</constant></title>
diff --git a/Documentation/DocBook/media/dvb/frontend.xml b/Documentation/DocBook/media/dvb/frontend.xml
index a005c4b..d81b3ff 100644
--- a/Documentation/DocBook/media/dvb/frontend.xml
+++ b/Documentation/DocBook/media/dvb/frontend.xml
@@ -56,24 +56,6 @@ specification is available at
&sub-dvbproperty;
-<section>
-<title>More OFDM parameters</title>
-
-<section id="fe-hierarchy-t">
-<title>frontend hierarchy</title>
-<programlisting>
-typedef enum fe_hierarchy {
- HIERARCHY_NONE,
- HIERARCHY_1,
- HIERARCHY_2,
- HIERARCHY_4,
- HIERARCHY_AUTO
- } fe_hierarchy_t;
-</programlisting>
-</section>
-
-</section>
-
<section id="frontend_fcalls">
<title>Frontend Function Calls</title>
diff --git a/Documentation/DocBook/media/dvb/frontend_legacy_api.xml b/Documentation/DocBook/media/dvb/frontend_legacy_api.xml
index d20f1fd..cb2e183 100644
--- a/Documentation/DocBook/media/dvb/frontend_legacy_api.xml
+++ b/Documentation/DocBook/media/dvb/frontend_legacy_api.xml
@@ -183,7 +183,7 @@ struct dvb_vsb_parameters {
&fe-modulation-t; constellation; /&#x22C6; modulation type (see above) &#x22C6;/
&fe-transmit-mode-t; transmission_mode;
&fe-guard-interval-t; guard_interval;
- fe_hierarchy_t hierarchy_information;
+ &fe-hierarchy-t; hierarchy_information;
};
</programlisting>
</section>