From 595d041a18ec80702b6d4e01ebb2e47f1a0d3781 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sun, 31 May 2015 09:59:11 -0300 Subject: [PATCH] [media] DocBook media: xmllint fixes Fixes a large number of xmllint errors. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- Documentation/DocBook/media/dvb/dvbproperty.xml | 20 ++++++++--------- .../media/dvb/fe-diseqc-recv-slave-reply.xml | 2 +- .../DocBook/media/dvb/fe-diseqc-send-burst.xml | 8 +++---- .../media/dvb/fe-diseqc-send-master-cmd.xml | 2 +- .../media/dvb/fe-enable-high-lnb-voltage.xml | 6 ++--- Documentation/DocBook/media/dvb/fe-get-info.xml | 8 +++---- .../DocBook/media/dvb/fe-get-property.xml | 26 +++++++++++----------- Documentation/DocBook/media/dvb/fe-read-status.xml | 4 ++-- .../media/dvb/fe-set-frontend-tune-mode.xml | 6 ++--- Documentation/DocBook/media/dvb/fe-set-tone.xml | 8 +++---- Documentation/DocBook/media/dvb/fe-set-voltage.xml | 6 ++--- Documentation/DocBook/media/dvb/frontend.xml | 16 ++++++------- .../DocBook/media/dvb/frontend_legacy_api.xml | 3 +-- 13 files changed, 56 insertions(+), 59 deletions(-) diff --git a/Documentation/DocBook/media/dvb/dvbproperty.xml b/Documentation/DocBook/media/dvb/dvbproperty.xml index 00bf3ed..5dfde52 100644 --- a/Documentation/DocBook/media/dvb/dvbproperty.xml +++ b/Documentation/DocBook/media/dvb/dvbproperty.xml @@ -27,13 +27,13 @@ rate of 5.217 Mbauds, those properties should be sent to FE_SET_PROPERTY ioctl: - &DTV-DELIVERY-SYSTEM; = SYS_DVBC_ANNEX_A - &DTV-FREQUENCY; = 651000000 - &DTV-MODULATION; = QAM_256 - &DTV-INVERSION; = INVERSION_AUTO - &DTV-SYMBOL-RATE; = 5217000 - &DTV-INNER-FEC; = FEC_3_4 - &DTV-TUNE; + &DTV-DELIVERY-SYSTEM; = SYS_DVBC_ANNEX_A + &DTV-FREQUENCY; = 651000000 + &DTV-MODULATION; = QAM_256 + &DTV-INVERSION; = INVERSION_AUTO + &DTV-SYMBOL-RATE; = 5217000 + &DTV-INNER-FEC; = FEC_3_4 + &DTV-TUNE; The code that would do the above is: @@ -394,7 +394,6 @@ get/set up to 64 properties. The actual meaning of each property is described on FEC_3_5 Forward Error Correction Code 3/5 - @@ -916,7 +915,6 @@ typedef enum atscmh_sccc_code_mode { - Notes: 1) If DTV_GUARD_INTERVAL is set the GUARD_INTERVAL_AUTO the hardware will @@ -924,6 +922,7 @@ typedef enum atscmh_sccc_code_mode { in the missing parameters. 2) Intervals 1/128, 19/128 and 19/256 are used only for DVB-T2 at present 3) DTMB specifies PN420, PN595 and PN945. +
<constant>DTV_TRANSMISSION_MODE</constant> @@ -975,12 +974,10 @@ typedef enum atscmh_sccc_code_mode { TRANSMISSION_MODE_C3780 Multi Carrier (C=3780) transmission mode (DTMB) - -
Notes: @@ -993,6 +990,7 @@ typedef enum atscmh_sccc_code_mode { 3) DVB-T specifies 2K and 8K as valid sizes. 4) DVB-T2 specifies 1K, 2K, 4K, 8K, 16K and 32K. 5) DTMB specifies C1 and C3780. +
<constant>DTV_HIERARCHY</constant> diff --git a/Documentation/DocBook/media/dvb/fe-diseqc-recv-slave-reply.xml b/Documentation/DocBook/media/dvb/fe-diseqc-recv-slave-reply.xml index de68b5b5..4595dbf 100644 --- a/Documentation/DocBook/media/dvb/fe-diseqc-recv-slave-reply.xml +++ b/Documentation/DocBook/media/dvb/fe-diseqc-recv-slave-reply.xml @@ -15,7 +15,7 @@ int ioctl int fd int request - &dvb-diseqc-slave-reply; *argp + struct dvb_diseqc_slave_reply *argp diff --git a/Documentation/DocBook/media/dvb/fe-diseqc-send-burst.xml b/Documentation/DocBook/media/dvb/fe-diseqc-send-burst.xml index f79c3f2..91dd207 100644 --- a/Documentation/DocBook/media/dvb/fe-diseqc-send-burst.xml +++ b/Documentation/DocBook/media/dvb/fe-diseqc-send-burst.xml @@ -15,7 +15,7 @@ int ioctl int fd int request - &fe-sec-mini-cmd; *tone + enum fe_sec_mini_cmd *tone @@ -58,11 +58,11 @@ &return-value-dvb; -
+ enum fe_sec_mini_cmd - enum fe_sec_tone_mode + enum fe_sec_mini_cmd &cs-def; @@ -84,6 +84,6 @@
-
+ diff --git a/Documentation/DocBook/media/dvb/fe-diseqc-send-master-cmd.xml b/Documentation/DocBook/media/dvb/fe-diseqc-send-master-cmd.xml index d4d6cd8..38cf313 100644 --- a/Documentation/DocBook/media/dvb/fe-diseqc-send-master-cmd.xml +++ b/Documentation/DocBook/media/dvb/fe-diseqc-send-master-cmd.xml @@ -15,7 +15,7 @@ int ioctl int fd int request - &dvb-diseqc-master-cmd; *argp + struct dvb_diseqc_master_cmd *argp diff --git a/Documentation/DocBook/media/dvb/fe-enable-high-lnb-voltage.xml b/Documentation/DocBook/media/dvb/fe-enable-high-lnb-voltage.xml index 3ee08a8..c11890b 100644 --- a/Documentation/DocBook/media/dvb/fe-enable-high-lnb-voltage.xml +++ b/Documentation/DocBook/media/dvb/fe-enable-high-lnb-voltage.xml @@ -41,9 +41,9 @@ Valid flags: - 0 - normal 13V and 18V. - >0 - enables slightly higher voltages instead of - 13/18V, in order to compensate for long antena cables. + 0 - normal 13V and 18V. + >0 - enables slightly higher voltages instead of + 13/18V, in order to compensate for long antenna cables. diff --git a/Documentation/DocBook/media/dvb/fe-get-info.xml b/Documentation/DocBook/media/dvb/fe-get-info.xml index 4400790..0e0245e 100644 --- a/Documentation/DocBook/media/dvb/fe-get-info.xml +++ b/Documentation/DocBook/media/dvb/fe-get-info.xml @@ -16,7 +16,7 @@ int ioctl int fd int request - &dvb-frontend-info; *argp + struct dvb_frontend_info *argp @@ -112,12 +112,12 @@ driver is not compatible with this specification the ioctl returns an error. - NOTE: The frequencies are specified in Hz for Terrestrial and Cable systems. They're specified in kHz for Satellite systems + -
+ frontend capabilities Capabilities describe what a frontend can do. Some capabilities are @@ -262,5 +262,5 @@ driver is not compatible with this specification the ioctl returns an error. -
+ diff --git a/Documentation/DocBook/media/dvb/fe-get-property.xml b/Documentation/DocBook/media/dvb/fe-get-property.xml index 456ed92..7d0bd78 100644 --- a/Documentation/DocBook/media/dvb/fe-get-property.xml +++ b/Documentation/DocBook/media/dvb/fe-get-property.xml @@ -17,7 +17,7 @@ int ioctl int fd int request - &dtv-properties; *argp + struct dtv_property *argp @@ -57,25 +57,25 @@ and on the device: FE_SET_PROPERTY: -This ioctl is used to set one or more - frontend properties. -This is the basic command to request the frontend to tune into some - frequency and to start decoding the digital TV signal. -This call requires read/write access to the device. -At return, the values are updated to reflect the - actual parameters used. +This ioctl is used to set one or more + frontend properties. +This is the basic command to request the frontend to tune into some + frequency and to start decoding the digital TV signal. +This call requires read/write access to the device. +At return, the values are updated to reflect the + actual parameters used. FE_GET_PROPERTY: -This ioctl is used to get properties and -statistics from the frontend. -No properties are changed, and statistics aren't reset. -This call only requires read-only access to the device. +This ioctl is used to get properties and +statistics from the frontend. +No properties are changed, and statistics aren't reset. +This call only requires read-only access to the device. -&return-value-dvb;. +&return-value-dvb; diff --git a/Documentation/DocBook/media/dvb/fe-read-status.xml b/Documentation/DocBook/media/dvb/fe-read-status.xml index bbd0b5b..3e4c794 100644 --- a/Documentation/DocBook/media/dvb/fe-read-status.xml +++ b/Documentation/DocBook/media/dvb/fe-read-status.xml @@ -59,7 +59,7 @@ pointer to an integer where the status will be written. &return-value-dvb; -
+ int fe_status The fe_status parameter is used to indicate the current state @@ -103,5 +103,5 @@ pointer to an integer where the status will be written. -
+ diff --git a/Documentation/DocBook/media/dvb/fe-set-frontend-tune-mode.xml b/Documentation/DocBook/media/dvb/fe-set-frontend-tune-mode.xml index 30bc99d..99fa8a0 100644 --- a/Documentation/DocBook/media/dvb/fe-set-frontend-tune-mode.xml +++ b/Documentation/DocBook/media/dvb/fe-set-frontend-tune-mode.xml @@ -40,14 +40,14 @@ Valid flags: - 0 - normal tune mode - FE_TUNE_MODE_ONESHOT - When set, this flag will + 0 - normal tune mode + FE_TUNE_MODE_ONESHOT - When set, this flag will disable any zigzagging or other "normal" tuning behaviour. Additionally, there will be no automatic monitoring of the lock status, and hence no frontend events will be generated. If a frontend device is closed, this flag will be automatically turned off when the device is reopened - read-write. + read-write. diff --git a/Documentation/DocBook/media/dvb/fe-set-tone.xml b/Documentation/DocBook/media/dvb/fe-set-tone.xml index 4ef6c74..12cd4dd 100644 --- a/Documentation/DocBook/media/dvb/fe-set-tone.xml +++ b/Documentation/DocBook/media/dvb/fe-set-tone.xml @@ -15,7 +15,7 @@ int ioctl int fd int request - &fe-sec-tone-mode; *tone + enum fe_sec_tone_mode *tone @@ -61,8 +61,8 @@ &return-value-dvb; -
-enum fe_sec_voltage + +enum fe_sec_tone_mode enum fe_sec_tone_mode @@ -86,6 +86,6 @@
-
+ diff --git a/Documentation/DocBook/media/dvb/fe-set-voltage.xml b/Documentation/DocBook/media/dvb/fe-set-voltage.xml index 688fbc2..73710f8 100644 --- a/Documentation/DocBook/media/dvb/fe-set-voltage.xml +++ b/Documentation/DocBook/media/dvb/fe-set-voltage.xml @@ -15,7 +15,7 @@ int ioctl int fd int request - &fe-sec-voltage; *voltage + enum fe_sec_voltage *voltage @@ -65,7 +65,7 @@ &return-value-dvb; -
+ enum fe_sec_voltage @@ -92,6 +92,6 @@
-
+ diff --git a/Documentation/DocBook/media/dvb/frontend.xml b/Documentation/DocBook/media/dvb/frontend.xml index 9eda6c0..ab42d8c 100644 --- a/Documentation/DocBook/media/dvb/frontend.xml +++ b/Documentation/DocBook/media/dvb/frontend.xml @@ -2,16 +2,16 @@ The DVB frontend API was designed to support three types of delivery systems: - Terrestrial systems: DVB-T, DVB-T2, ATSC, ATSC M/H, ISDB-T, DVB-H, DTMB, CMMB - Cable systems: DVB-C Annex A/C, ClearQAM (DVB-C Annex B), ISDB-C - Satellite systems: DVB-S, DVB-S2, DVB Turbo, ISDB-S, DSS + Terrestrial systems: DVB-T, DVB-T2, ATSC, ATSC M/H, ISDB-T, DVB-H, DTMB, CMMB + Cable systems: DVB-C Annex A/C, ClearQAM (DVB-C Annex B), ISDB-C + Satellite systems: DVB-S, DVB-S2, DVB Turbo, ISDB-S, DSS The DVB frontend controls several sub-devices including: - Tuner, - Digital TV demodulator - Low noise amplifier (LNA) - Satellite Equipment Control (SEC) hardware (only for Satellite). + Tuner + Digital TV demodulator + Low noise amplifier (LNA) + Satellite Equipment Control (SEC) hardware (only for Satellite). The frontend can be accessed through /dev/dvb/adapter?/frontend?. Data types and @@ -50,7 +50,7 @@ specification is available at Signal statistics are provided via FE_GET_PROPERTY. Please notice that several statistics require the demodulator to be fully locked (e. g. with FE_HAS_LOCK bit set). See - Frontend statistics indicators + Frontend statistics indicators for more details.
diff --git a/Documentation/DocBook/media/dvb/frontend_legacy_api.xml b/Documentation/DocBook/media/dvb/frontend_legacy_api.xml index cb2e183..3005cec 100644 --- a/Documentation/DocBook/media/dvb/frontend_legacy_api.xml +++ b/Documentation/DocBook/media/dvb/frontend_legacy_api.xml @@ -95,7 +95,6 @@ supported via the new FE_GET_PROPERTY/FE_GET_SET BANDWIDTH_10_MHZ 10 MHz - @@ -200,7 +199,7 @@ struct dvb_vsb_parameters { -
+
Frontend Legacy Function Calls Those functions are defined at DVB version 3. The support is kept in -- 2.7.4