diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-05-28 20:38:44 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-05-30 10:08:12 -0400 |
| commit | 2d457b8a9054b9c5b1fcfbc5702b7d0e9f6cda2b (patch) | |
| tree | b32802e8d7af8d9e314bd2599e17503a97a557d3 | |
| parent | b174fb71e82eef2355aabece4b50fe1540e67544 (diff) | |
[media] DocBook: improve documentation for FEC fields
Format it as a table and add more details. Also, remove the
duplicated occurrences.
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
| -rw-r--r-- | Documentation/DocBook/media/dvb/dvbproperty.xml | 123 | ||||
| -rw-r--r-- | Documentation/DocBook/media/dvb/frontend.xml | 28 | ||||
| -rw-r--r-- | Documentation/DocBook/media/dvb/frontend_legacy_api.xml | 8 | ||||
| -rw-r--r-- | include/uapi/linux/dvb/frontend.h | 6 |
4 files changed, 78 insertions, 87 deletions
diff --git a/Documentation/DocBook/media/dvb/dvbproperty.xml b/Documentation/DocBook/media/dvb/dvbproperty.xml index 06a12f1c57c5..b96a91a1494d 100644 --- a/Documentation/DocBook/media/dvb/dvbproperty.xml +++ b/Documentation/DocBook/media/dvb/dvbproperty.xml | |||
| @@ -290,25 +290,70 @@ get/set up to 64 properties. The actual meaning of each property is described on | |||
| 290 | <title><constant>DTV_INNER_FEC</constant></title> | 290 | <title><constant>DTV_INNER_FEC</constant></title> |
| 291 | <para>Used cable/satellite transmissions. The acceptable values are: | 291 | <para>Used cable/satellite transmissions. The acceptable values are: |
| 292 | </para> | 292 | </para> |
| 293 | <programlisting> | 293 | <section id="fe-code-rate-t"> |
| 294 | typedef enum fe_code_rate { | 294 | <title>enum fe_code_rate: type of the Forward Error Correction.</title> |
| 295 | FEC_NONE = 0, | 295 | |
| 296 | FEC_1_2, | 296 | <table pgwide="1" frame="none" id="fe-code-rate"> |
| 297 | FEC_2_3, | 297 | <title>enum fe_code_rate</title> |
| 298 | FEC_3_4, | 298 | <tgroup cols="2"> |
| 299 | FEC_4_5, | 299 | &cs-def; |
| 300 | FEC_5_6, | 300 | <thead> |
| 301 | FEC_6_7, | 301 | <row> |
| 302 | FEC_7_8, | 302 | <entry>ID</entry> |
| 303 | FEC_8_9, | 303 | <entry>Description</entry> |
| 304 | FEC_AUTO, | 304 | </row> |
| 305 | FEC_3_5, | 305 | </thead> |
| 306 | FEC_9_10, | 306 | <tbody valign="top"> |
| 307 | FEC_2_5, | 307 | <row> |
| 308 | } fe_code_rate_t; | 308 | <entry>TRANSMISSION_MODE_AUTO</entry> |
| 309 | </programlisting> | 309 | <entry>Autodetect transmission mode. The hardware will try to find |
| 310 | <para>which correspond to error correction rates of 1/2, 2/3, etc., | 310 | the correct FFT-size (if capable) to fill in the missing |
| 311 | no error correction or auto detection.</para> | 311 | parameters.</entry> |
| 312 | </row><row> | ||
| 313 | <entry>FEC_NONE</entry> | ||
| 314 | <entry>No Forward Error Correction Code</entry> | ||
| 315 | </row><row> | ||
| 316 | <entry>FEC_AUTO</entry> | ||
| 317 | <entry>Autodetect Error Correction Code</entry> | ||
| 318 | </row><row> | ||
| 319 | <entry>FEC_1_2</entry> | ||
| 320 | <entry>Forward Error Correction Code 1/2</entry> | ||
| 321 | </row><row> | ||
| 322 | <entry>FEC_2_3</entry> | ||
| 323 | <entry>Forward Error Correction Code 2/3</entry> | ||
| 324 | </row><row> | ||
| 325 | <entry>FEC_3_4</entry> | ||
| 326 | <entry>Forward Error Correction Code 3/4</entry> | ||
| 327 | </row><row> | ||
| 328 | <entry>FEC_4_5</entry> | ||
| 329 | <entry>Forward Error Correction Code 4/5</entry> | ||
| 330 | </row><row> | ||
| 331 | <entry>FEC_5_6</entry> | ||
| 332 | <entry>Forward Error Correction Code 5/6</entry> | ||
| 333 | </row><row> | ||
| 334 | <entry>FEC_6_7</entry> | ||
| 335 | <entry>Forward Error Correction Code 6/7</entry> | ||
| 336 | </row><row> | ||
| 337 | <entry>FEC_7_8</entry> | ||
| 338 | <entry>Forward Error Correction Code 7/8</entry> | ||
| 339 | </row><row> | ||
| 340 | <entry>FEC_8_9</entry> | ||
| 341 | <entry>Forward Error Correction Code 8/9</entry> | ||
| 342 | </row><row> | ||
| 343 | <entry>FEC_9_10</entry> | ||
| 344 | <entry>Forward Error Correction Code 9/10</entry> | ||
| 345 | </row><row> | ||
| 346 | <entry>FEC_2_5</entry> | ||
| 347 | <entry>Forward Error Correction Code 2/5</entry> | ||
| 348 | </row><row> | ||
| 349 | <entry>FEC_3_5</entry> | ||
| 350 | <entry>Forward Error Correction Code 3/5</entry> | ||
| 351 | </row><row> | ||
| 352 | </row> | ||
| 353 | </tbody> | ||
| 354 | </tgroup> | ||
| 355 | </table> | ||
| 356 | </section> | ||
| 312 | </section> | 357 | </section> |
| 313 | <section id="DTV-VOLTAGE"> | 358 | <section id="DTV-VOLTAGE"> |
| 314 | <title><constant>DTV_VOLTAGE</constant></title> | 359 | <title><constant>DTV_VOLTAGE</constant></title> |
| @@ -757,46 +802,18 @@ typedef enum atscmh_sccc_code_mode { | |||
| 757 | </section> | 802 | </section> |
| 758 | <section id="DTV-CODE-RATE-HP"> | 803 | <section id="DTV-CODE-RATE-HP"> |
| 759 | <title><constant>DTV_CODE_RATE_HP</constant></title> | 804 | <title><constant>DTV_CODE_RATE_HP</constant></title> |
| 760 | <para>Used on terrestrial transmissions. The acceptable values are: | 805 | <para>Used on terrestrial transmissions. The acceptable values are |
| 806 | the ones described at &fe-transmit-mode-t;. | ||
| 761 | </para> | 807 | </para> |
| 762 | <programlisting> | ||
| 763 | typedef enum fe_code_rate { | ||
| 764 | FEC_NONE = 0, | ||
| 765 | FEC_1_2, | ||
| 766 | FEC_2_3, | ||
| 767 | FEC_3_4, | ||
| 768 | FEC_4_5, | ||
| 769 | FEC_5_6, | ||
| 770 | FEC_6_7, | ||
| 771 | FEC_7_8, | ||
| 772 | FEC_8_9, | ||
| 773 | FEC_AUTO, | ||
| 774 | FEC_3_5, | ||
| 775 | FEC_9_10, | ||
| 776 | } fe_code_rate_t; | ||
| 777 | </programlisting> | ||
| 778 | </section> | 808 | </section> |
| 779 | <section id="DTV-CODE-RATE-LP"> | 809 | <section id="DTV-CODE-RATE-LP"> |
| 780 | <title><constant>DTV_CODE_RATE_LP</constant></title> | 810 | <title><constant>DTV_CODE_RATE_LP</constant></title> |
| 781 | <para>Used on terrestrial transmissions. The acceptable values are: | 811 | <para>Used on terrestrial transmissions. The acceptable values are |
| 812 | the ones described at &fe-transmit-mode-t;. | ||
| 782 | </para> | 813 | </para> |
| 783 | <programlisting> | 814 | |
| 784 | typedef enum fe_code_rate { | ||
| 785 | FEC_NONE = 0, | ||
| 786 | FEC_1_2, | ||
| 787 | FEC_2_3, | ||
| 788 | FEC_3_4, | ||
| 789 | FEC_4_5, | ||
| 790 | FEC_5_6, | ||
| 791 | FEC_6_7, | ||
| 792 | FEC_7_8, | ||
| 793 | FEC_8_9, | ||
| 794 | FEC_AUTO, | ||
| 795 | FEC_3_5, | ||
| 796 | FEC_9_10, | ||
| 797 | } fe_code_rate_t; | ||
| 798 | </programlisting> | ||
| 799 | </section> | 815 | </section> |
| 816 | |||
| 800 | <section id="DTV-GUARD-INTERVAL"> | 817 | <section id="DTV-GUARD-INTERVAL"> |
| 801 | <title><constant>DTV_GUARD_INTERVAL</constant></title> | 818 | <title><constant>DTV_GUARD_INTERVAL</constant></title> |
| 802 | 819 | ||
diff --git a/Documentation/DocBook/media/dvb/frontend.xml b/Documentation/DocBook/media/dvb/frontend.xml index 93d22486f20c..563800eb1216 100644 --- a/Documentation/DocBook/media/dvb/frontend.xml +++ b/Documentation/DocBook/media/dvb/frontend.xml | |||
| @@ -56,34 +56,6 @@ specification is available at | |||
| 56 | 56 | ||
| 57 | &sub-dvbproperty; | 57 | &sub-dvbproperty; |
| 58 | 58 | ||
| 59 | <section id="fe-code-rate-t"> | ||
| 60 | <title>frontend code rate</title> | ||
| 61 | <para>The possible values for the <constant>fec_inner</constant> field used on | ||
| 62 | <link linkend="dvb-qpsk-parameters"><constant>struct dvb_qpsk_parameters</constant></link> and | ||
| 63 | <link linkend="dvb-qam-parameters"><constant>struct dvb_qam_parameters</constant></link> are: | ||
| 64 | </para> | ||
| 65 | <programlisting> | ||
| 66 | typedef enum fe_code_rate { | ||
| 67 | FEC_NONE = 0, | ||
| 68 | FEC_1_2, | ||
| 69 | FEC_2_3, | ||
| 70 | FEC_3_4, | ||
| 71 | FEC_4_5, | ||
| 72 | FEC_5_6, | ||
| 73 | FEC_6_7, | ||
| 74 | FEC_7_8, | ||
| 75 | FEC_8_9, | ||
| 76 | FEC_AUTO, | ||
| 77 | FEC_3_5, | ||
| 78 | FEC_9_10, | ||
| 79 | } fe_code_rate_t; | ||
| 80 | </programlisting> | ||
| 81 | <para>which correspond to error correction rates of 1/2, 2/3, etc., no error correction or auto | ||
| 82 | detection. | ||
| 83 | </para> | ||
| 84 | </section> | ||
| 85 | |||
| 86 | |||
| 87 | <section> | 59 | <section> |
| 88 | <title>More OFDM parameters</title> | 60 | <title>More OFDM parameters</title> |
| 89 | 61 | ||
diff --git a/Documentation/DocBook/media/dvb/frontend_legacy_api.xml b/Documentation/DocBook/media/dvb/frontend_legacy_api.xml index ed393f22f7a7..c1dfbd8096bd 100644 --- a/Documentation/DocBook/media/dvb/frontend_legacy_api.xml +++ b/Documentation/DocBook/media/dvb/frontend_legacy_api.xml | |||
| @@ -145,7 +145,7 @@ OFDM frontends the <constant>frequency</constant> specifies the absolute frequen | |||
| 145 | <programlisting> | 145 | <programlisting> |
| 146 | struct dvb_qpsk_parameters { | 146 | struct dvb_qpsk_parameters { |
| 147 | uint32_t symbol_rate; /⋆ symbol rate in Symbols per second ⋆/ | 147 | uint32_t symbol_rate; /⋆ symbol rate in Symbols per second ⋆/ |
| 148 | fe_code_rate_t fec_inner; /⋆ forward error correction (see above) ⋆/ | 148 | &fe-code-rate-t; fec_inner; /⋆ forward error correction (see above) ⋆/ |
| 149 | }; | 149 | }; |
| 150 | </programlisting> | 150 | </programlisting> |
| 151 | </section> | 151 | </section> |
| @@ -156,7 +156,7 @@ OFDM frontends the <constant>frequency</constant> specifies the absolute frequen | |||
| 156 | <programlisting> | 156 | <programlisting> |
| 157 | struct dvb_qam_parameters { | 157 | struct dvb_qam_parameters { |
| 158 | uint32_t symbol_rate; /⋆ symbol rate in Symbols per second ⋆/ | 158 | uint32_t symbol_rate; /⋆ symbol rate in Symbols per second ⋆/ |
| 159 | fe_code_rate_t fec_inner; /⋆ forward error correction (see above) ⋆/ | 159 | &fe-code-rate-t; fec_inner; /⋆ forward error correction (see above) ⋆/ |
| 160 | &fe-modulation-t; modulation; /⋆ modulation type (see above) ⋆/ | 160 | &fe-modulation-t; modulation; /⋆ modulation type (see above) ⋆/ |
| 161 | }; | 161 | }; |
| 162 | </programlisting> | 162 | </programlisting> |
| @@ -178,8 +178,8 @@ struct dvb_vsb_parameters { | |||
| 178 | <programlisting> | 178 | <programlisting> |
| 179 | struct dvb_ofdm_parameters { | 179 | struct dvb_ofdm_parameters { |
| 180 | &fe-bandwidth-t; bandwidth; | 180 | &fe-bandwidth-t; bandwidth; |
| 181 | fe_code_rate_t code_rate_HP; /⋆ high priority stream code rate ⋆/ | 181 | &fe-code-rate-t; code_rate_HP; /⋆ high priority stream code rate ⋆/ |
| 182 | fe_code_rate_t code_rate_LP; /⋆ low priority stream code rate ⋆/ | 182 | &fe-code-rate-t; code_rate_LP; /⋆ low priority stream code rate ⋆/ |
| 183 | &fe-modulation-t; constellation; /⋆ modulation type (see above) ⋆/ | 183 | &fe-modulation-t; constellation; /⋆ modulation type (see above) ⋆/ |
| 184 | &fe-transmit-mode-t; transmission_mode; | 184 | &fe-transmit-mode-t; transmission_mode; |
| 185 | fe_guard_interval_t guard_interval; | 185 | fe_guard_interval_t guard_interval; |
diff --git a/include/uapi/linux/dvb/frontend.h b/include/uapi/linux/dvb/frontend.h index 43e6faf91849..49f6e980125b 100644 --- a/include/uapi/linux/dvb/frontend.h +++ b/include/uapi/linux/dvb/frontend.h | |||
| @@ -162,7 +162,7 @@ enum fe_spectral_inversion { | |||
| 162 | 162 | ||
| 163 | typedef enum fe_spectral_inversion fe_spectral_inversion_t; | 163 | typedef enum fe_spectral_inversion fe_spectral_inversion_t; |
| 164 | 164 | ||
| 165 | typedef enum fe_code_rate { | 165 | enum fe_code_rate { |
| 166 | FEC_NONE = 0, | 166 | FEC_NONE = 0, |
| 167 | FEC_1_2, | 167 | FEC_1_2, |
| 168 | FEC_2_3, | 168 | FEC_2_3, |
| @@ -176,7 +176,9 @@ typedef enum fe_code_rate { | |||
| 176 | FEC_3_5, | 176 | FEC_3_5, |
| 177 | FEC_9_10, | 177 | FEC_9_10, |
| 178 | FEC_2_5, | 178 | FEC_2_5, |
| 179 | } fe_code_rate_t; | 179 | }; |
| 180 | |||
| 181 | typedef enum fe_code_rate fe_code_rate_t; | ||
| 180 | 182 | ||
| 181 | 183 | ||
| 182 | enum fe_modulation { | 184 | enum fe_modulation { |
