aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/DocBook/media/dvb/dvbproperty.xml52
-rw-r--r--Documentation/DocBook/media/dvb/frontend.xml17
-rw-r--r--Documentation/DocBook/media/dvb/frontend_legacy_api.xml2
-rw-r--r--include/uapi/linux/dvb/frontend.h5
4 files changed, 43 insertions, 33 deletions
diff --git a/Documentation/DocBook/media/dvb/dvbproperty.xml b/Documentation/DocBook/media/dvb/dvbproperty.xml
index d9861b54f8c8..41085537acfc 100644
--- a/Documentation/DocBook/media/dvb/dvbproperty.xml
+++ b/Documentation/DocBook/media/dvb/dvbproperty.xml
@@ -238,19 +238,45 @@ get/set up to 64 properties. The actual meaning of each property is described on
238 </section> 238 </section>
239 <section id="DTV-INVERSION"> 239 <section id="DTV-INVERSION">
240 <title><constant>DTV_INVERSION</constant></title> 240 <title><constant>DTV_INVERSION</constant></title>
241 <para>The Inversion field can take one of these values: 241
242 </para> 242 <para>Specifies if the frontend should do spectral inversion or not.</para>
243 <programlisting> 243
244 typedef enum fe_spectral_inversion { 244<section id="fe-spectral-inversion-t">
245 INVERSION_OFF, 245<title>enum fe_modulation: Frontend spectral inversion</title>
246 INVERSION_ON, 246
247 INVERSION_AUTO 247<para>This parameter indicates if spectral inversion should be presumed or not.
248 } fe_spectral_inversion_t; 248 In the automatic setting (<constant>INVERSION_AUTO</constant>) the hardware
249 </programlisting> 249 will try to figure out the correct setting by itself. If the hardware
250 <para>It indicates if spectral inversion should be presumed or not. In the automatic setting 250 doesn't support, the DVB core will try to lock at the carrier first with
251 (<constant>INVERSION_AUTO</constant>) the hardware will try to figure out the correct setting by 251 inversion off. If it fails, it will try to enable inversion.
252 itself. 252</para>
253 </para> 253
254<table pgwide="1" frame="none" id="fe-spectral-inversion">
255 <title>enum fe_modulation</title>
256 <tgroup cols="2">
257 &cs-def;
258 <thead>
259 <row>
260 <entry>ID</entry>
261 <entry>Description</entry>
262 </row>
263 </thead>
264 <tbody valign="top">
265 <row>
266 <entry>INVERSION_OFF</entry>
267 <entry>Don't do spectral band inversion.</entry>
268 </row><row>
269 <entry>INVERSION_ON</entry>
270 <entry>Do spectral band inversion.</entry>
271 </row><row>
272 <entry>INVERSION_AUTO</entry>
273 <entry>Autodetect spectral band inversion.</entry>
274 </row>
275 </tbody>
276 </tgroup>
277</table>
278</section>
279
254 </section> 280 </section>
255 <section id="DTV-DISEQC-MASTER"> 281 <section id="DTV-DISEQC-MASTER">
256 <title><constant>DTV_DISEQC_MASTER</constant></title> 282 <title><constant>DTV_DISEQC_MASTER</constant></title>
diff --git a/Documentation/DocBook/media/dvb/frontend.xml b/Documentation/DocBook/media/dvb/frontend.xml
index 07c1284e88c8..77dd88ceeedd 100644
--- a/Documentation/DocBook/media/dvb/frontend.xml
+++ b/Documentation/DocBook/media/dvb/frontend.xml
@@ -56,23 +56,6 @@ specification is available at
56 56
57&sub-dvbproperty; 57&sub-dvbproperty;
58 58
59<section id="fe-spectral-inversion-t">
60<title>frontend spectral inversion</title>
61<para>The Inversion field can take one of these values:
62</para>
63<programlisting>
64typedef enum fe_spectral_inversion {
65 INVERSION_OFF,
66 INVERSION_ON,
67 INVERSION_AUTO
68} fe_spectral_inversion_t;
69</programlisting>
70<para>It indicates if spectral inversion should be presumed or not. In the automatic setting
71(<constant>INVERSION_AUTO</constant>) the hardware will try to figure out the correct setting by
72itself.
73</para>
74</section>
75
76<section id="fe-code-rate-t"> 59<section id="fe-code-rate-t">
77<title>frontend code rate</title> 60<title>frontend code rate</title>
78<para>The possible values for the <constant>fec_inner</constant> field used on 61<para>The possible values for the <constant>fec_inner</constant> field used on
diff --git a/Documentation/DocBook/media/dvb/frontend_legacy_api.xml b/Documentation/DocBook/media/dvb/frontend_legacy_api.xml
index 7d5823858df0..fe1117e91f51 100644
--- a/Documentation/DocBook/media/dvb/frontend_legacy_api.xml
+++ b/Documentation/DocBook/media/dvb/frontend_legacy_api.xml
@@ -82,7 +82,7 @@ DVB-C2, ISDB, etc.</para>
82struct dvb_frontend_parameters { 82struct dvb_frontend_parameters {
83 uint32_t frequency; /&#x22C6; (absolute) frequency in Hz for QAM/OFDM &#x22C6;/ 83 uint32_t frequency; /&#x22C6; (absolute) frequency in Hz for QAM/OFDM &#x22C6;/
84 /&#x22C6; intermediate frequency in kHz for QPSK &#x22C6;/ 84 /&#x22C6; intermediate frequency in kHz for QPSK &#x22C6;/
85 fe_spectral_inversion_t inversion; 85 &fe-spectral-inversion-t; inversion;
86 union { 86 union {
87 struct dvb_qpsk_parameters qpsk; 87 struct dvb_qpsk_parameters qpsk;
88 struct dvb_qam_parameters qam; 88 struct dvb_qam_parameters qam;
diff --git a/include/uapi/linux/dvb/frontend.h b/include/uapi/linux/dvb/frontend.h
index d4b1718046ae..223905563676 100644
--- a/include/uapi/linux/dvb/frontend.h
+++ b/include/uapi/linux/dvb/frontend.h
@@ -154,12 +154,13 @@ enum fe_status {
154 154
155typedef enum fe_status fe_status_t; 155typedef enum fe_status fe_status_t;
156 156
157typedef enum fe_spectral_inversion { 157enum fe_spectral_inversion {
158 INVERSION_OFF, 158 INVERSION_OFF,
159 INVERSION_ON, 159 INVERSION_ON,
160 INVERSION_AUTO 160 INVERSION_AUTO
161} fe_spectral_inversion_t; 161};
162 162
163typedef enum fe_spectral_inversion fe_spectral_inversion_t;
163 164
164typedef enum fe_code_rate { 165typedef enum fe_code_rate {
165 FEC_NONE = 0, 166 FEC_NONE = 0,