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
<constant>DTV_INNER_FEC</constant>
Used cable/satellite transmissions. The acceptable values are:
-
-typedef enum fe_code_rate {
- FEC_NONE = 0,
- FEC_1_2,
- FEC_2_3,
- FEC_3_4,
- FEC_4_5,
- FEC_5_6,
- FEC_6_7,
- FEC_7_8,
- FEC_8_9,
- FEC_AUTO,
- FEC_3_5,
- FEC_9_10,
- FEC_2_5,
-} fe_code_rate_t;
-
- which correspond to error correction rates of 1/2, 2/3, etc.,
- no error correction or auto detection.
+
+enum fe_code_rate: type of the Forward Error Correction.
+
+
+ enum fe_code_rate
+
+ &cs-def;
+
+
+ ID
+ Description
+
+
+
+
+ TRANSMISSION_MODE_AUTO
+ Autodetect transmission mode. The hardware will try to find
+ the correct FFT-size (if capable) to fill in the missing
+ parameters.
+
+ FEC_NONE
+ No Forward Error Correction Code
+
+ FEC_AUTO
+ Autodetect Error Correction Code
+
+ FEC_1_2
+ Forward Error Correction Code 1/2
+
+ FEC_2_3
+ Forward Error Correction Code 2/3
+
+ FEC_3_4
+ Forward Error Correction Code 3/4
+
+ FEC_4_5
+ Forward Error Correction Code 4/5
+
+ FEC_5_6
+ Forward Error Correction Code 5/6
+
+ FEC_6_7
+ Forward Error Correction Code 6/7
+
+ FEC_7_8
+ Forward Error Correction Code 7/8
+
+ FEC_8_9
+ Forward Error Correction Code 8/9
+
+ FEC_9_10
+ Forward Error Correction Code 9/10
+
+ FEC_2_5
+ Forward Error Correction Code 2/5
+
+ FEC_3_5
+ Forward Error Correction Code 3/5
+
+
+
+
+
+
<constant>DTV_VOLTAGE</constant>
@@ -757,46 +802,18 @@ typedef enum atscmh_sccc_code_mode {
<constant>DTV_CODE_RATE_HP</constant>
- Used on terrestrial transmissions. The acceptable values are:
+ Used on terrestrial transmissions. The acceptable values are
+ the ones described at &fe-transmit-mode-t;.
-
-typedef enum fe_code_rate {
- FEC_NONE = 0,
- FEC_1_2,
- FEC_2_3,
- FEC_3_4,
- FEC_4_5,
- FEC_5_6,
- FEC_6_7,
- FEC_7_8,
- FEC_8_9,
- FEC_AUTO,
- FEC_3_5,
- FEC_9_10,
-} fe_code_rate_t;
-
<constant>DTV_CODE_RATE_LP</constant>
- Used on terrestrial transmissions. The acceptable values are:
+ Used on terrestrial transmissions. The acceptable values are
+ the ones described at &fe-transmit-mode-t;.
-
-typedef enum fe_code_rate {
- FEC_NONE = 0,
- FEC_1_2,
- FEC_2_3,
- FEC_3_4,
- FEC_4_5,
- FEC_5_6,
- FEC_6_7,
- FEC_7_8,
- FEC_8_9,
- FEC_AUTO,
- FEC_3_5,
- FEC_9_10,
-} fe_code_rate_t;
-
+
+
<constant>DTV_GUARD_INTERVAL</constant>
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
&sub-dvbproperty;
-
-frontend code rate
-The possible values for the fec_inner field used on
-struct dvb_qpsk_parameters and
-struct dvb_qam_parameters are:
-
-
-typedef enum fe_code_rate {
- FEC_NONE = 0,
- FEC_1_2,
- FEC_2_3,
- FEC_3_4,
- FEC_4_5,
- FEC_5_6,
- FEC_6_7,
- FEC_7_8,
- FEC_8_9,
- FEC_AUTO,
- FEC_3_5,
- FEC_9_10,
-} fe_code_rate_t;
-
-which correspond to error correction rates of 1/2, 2/3, etc., no error correction or auto
-detection.
-
-
-
-
More OFDM parameters
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 frequency specifies the absolute frequen
struct dvb_qpsk_parameters {
uint32_t symbol_rate; /⋆ symbol rate in Symbols per second ⋆/
- fe_code_rate_t fec_inner; /⋆ forward error correction (see above) ⋆/
+ &fe-code-rate-t; fec_inner; /⋆ forward error correction (see above) ⋆/
};
@@ -156,7 +156,7 @@ OFDM frontends the frequency specifies the absolute frequen
struct dvb_qam_parameters {
uint32_t symbol_rate; /⋆ symbol rate in Symbols per second ⋆/
- fe_code_rate_t fec_inner; /⋆ forward error correction (see above) ⋆/
+ &fe-code-rate-t; fec_inner; /⋆ forward error correction (see above) ⋆/
&fe-modulation-t; modulation; /⋆ modulation type (see above) ⋆/
};
@@ -178,8 +178,8 @@ struct dvb_vsb_parameters {
struct dvb_ofdm_parameters {
&fe-bandwidth-t; bandwidth;
- fe_code_rate_t code_rate_HP; /⋆ high priority stream code rate ⋆/
- fe_code_rate_t code_rate_LP; /⋆ low priority stream code rate ⋆/
+ &fe-code-rate-t; code_rate_HP; /⋆ high priority stream code rate ⋆/
+ &fe-code-rate-t; code_rate_LP; /⋆ low priority stream code rate ⋆/
&fe-modulation-t; constellation; /⋆ modulation type (see above) ⋆/
&fe-transmit-mode-t; transmission_mode;
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 {
typedef enum fe_spectral_inversion fe_spectral_inversion_t;
-typedef enum fe_code_rate {
+enum fe_code_rate {
FEC_NONE = 0,
FEC_1_2,
FEC_2_3,
@@ -176,7 +176,9 @@ typedef enum fe_code_rate {
FEC_3_5,
FEC_9_10,
FEC_2_5,
-} fe_code_rate_t;
+};
+
+typedef enum fe_code_rate fe_code_rate_t;
enum fe_modulation {