diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-08-14 05:10:02 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-08-15 17:56:19 -0400 |
commit | 34affc6a5c75ce6523d7282d56c51bb36c183da7 (patch) | |
tree | b4c8ffa9ad2fe3ccbfdce5cff7424bcf3ea5200e /Documentation/DocBook | |
parent | 0590c7130dfb88ddc7bbecd343efae1d3623f209 (diff) |
[media] DocBook: update RDS references to the latest RDS standards
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'Documentation/DocBook')
-rw-r--r-- | Documentation/DocBook/media/v4l/biblio.xml | 12 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/controls.xml | 6 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/dev-rds.xml | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/Documentation/DocBook/media/v4l/biblio.xml b/Documentation/DocBook/media/v4l/biblio.xml index 1078e45f189f..18b6fc9ff58b 100644 --- a/Documentation/DocBook/media/v4l/biblio.xml +++ b/Documentation/DocBook/media/v4l/biblio.xml | |||
@@ -178,23 +178,23 @@ Signal - NTSC for Studio Applications"</title> | |||
178 | 1125-Line High-Definition Production"</title> | 178 | 1125-Line High-Definition Production"</title> |
179 | </biblioentry> | 179 | </biblioentry> |
180 | 180 | ||
181 | <biblioentry id="en50067"> | 181 | <biblioentry id="iec62106"> |
182 | <abbrev>EN 50067</abbrev> | 182 | <abbrev>IEC 62106</abbrev> |
183 | <authorgroup> | 183 | <authorgroup> |
184 | <corpauthor>European Committee for Electrotechnical Standardization | 184 | <corpauthor>International Electrotechnical Commission |
185 | (<ulink url="http://www.cenelec.eu">http://www.cenelec.eu</ulink>)</corpauthor> | 185 | (<ulink url="http://www.iec.ch">http://www.iec.ch</ulink>)</corpauthor> |
186 | </authorgroup> | 186 | </authorgroup> |
187 | <title>Specification of the radio data system (RDS) for VHF/FM sound broadcasting | 187 | <title>Specification of the radio data system (RDS) for VHF/FM sound broadcasting |
188 | in the frequency range from 87,5 to 108,0 MHz</title> | 188 | in the frequency range from 87,5 to 108,0 MHz</title> |
189 | </biblioentry> | 189 | </biblioentry> |
190 | 190 | ||
191 | <biblioentry id="nrsc4"> | 191 | <biblioentry id="nrsc4"> |
192 | <abbrev>NRSC-4</abbrev> | 192 | <abbrev>NRSC-4-B</abbrev> |
193 | <authorgroup> | 193 | <authorgroup> |
194 | <corpauthor>National Radio Systems Committee | 194 | <corpauthor>National Radio Systems Committee |
195 | (<ulink url="http://www.nrscstandards.org">http://www.nrscstandards.org</ulink>)</corpauthor> | 195 | (<ulink url="http://www.nrscstandards.org">http://www.nrscstandards.org</ulink>)</corpauthor> |
196 | </authorgroup> | 196 | </authorgroup> |
197 | <title>NRSC-4: United States RBDS Standard</title> | 197 | <title>NRSC-4-B: United States RBDS Standard</title> |
198 | </biblioentry> | 198 | </biblioentry> |
199 | 199 | ||
200 | <biblioentry id="iso12232"> | 200 | <biblioentry id="iso12232"> |
diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml index b0964fb4e834..41cd801f0f0b 100644 --- a/Documentation/DocBook/media/v4l/controls.xml +++ b/Documentation/DocBook/media/v4l/controls.xml | |||
@@ -3505,7 +3505,7 @@ This encodes up to 31 pre-defined programme types.</entry> | |||
3505 | </row> | 3505 | </row> |
3506 | <row><entry spanname="descr">Sets the Programme Service name (PS_NAME) for transmission. | 3506 | <row><entry spanname="descr">Sets the Programme Service name (PS_NAME) for transmission. |
3507 | It is intended for static display on a receiver. It is the primary aid to listeners in programme service | 3507 | It is intended for static display on a receiver. It is the primary aid to listeners in programme service |
3508 | identification and selection. In Annex E of <xref linkend="en50067" />, the RDS specification, | 3508 | identification and selection. In Annex E of <xref linkend="iec62106" />, the RDS specification, |
3509 | there is a full description of the correct character encoding for Programme Service name strings. | 3509 | there is a full description of the correct character encoding for Programme Service name strings. |
3510 | Also from RDS specification, PS is usually a single eight character text. However, it is also possible | 3510 | Also from RDS specification, PS is usually a single eight character text. However, it is also possible |
3511 | to find receivers which can scroll strings sized as 8 x N characters. So, this control must be configured | 3511 | to find receivers which can scroll strings sized as 8 x N characters. So, this control must be configured |
@@ -3519,7 +3519,7 @@ with steps of 8 characters. The result is it must always contain a string with s | |||
3519 | what is being broadcasted. RDS Radio Text can be applied when broadcaster wishes to transmit longer PS names, | 3519 | what is being broadcasted. RDS Radio Text can be applied when broadcaster wishes to transmit longer PS names, |
3520 | programme-related information or any other text. In these cases, RadioText should be used in addition to | 3520 | programme-related information or any other text. In these cases, RadioText should be used in addition to |
3521 | <constant>V4L2_CID_RDS_TX_PS_NAME</constant>. The encoding for Radio Text strings is also fully described | 3521 | <constant>V4L2_CID_RDS_TX_PS_NAME</constant>. The encoding for Radio Text strings is also fully described |
3522 | in Annex E of <xref linkend="en50067" />. The length of Radio Text strings depends on which RDS Block is being | 3522 | in Annex E of <xref linkend="iec62106" />. The length of Radio Text strings depends on which RDS Block is being |
3523 | used to transmit it, either 32 (2A block) or 64 (2B block). However, it is also possible | 3523 | used to transmit it, either 32 (2A block) or 64 (2B block). However, it is also possible |
3524 | to find receivers which can scroll strings sized as 32 x N or 64 x N characters. So, this control must be configured | 3524 | to find receivers which can scroll strings sized as 32 x N or 64 x N characters. So, this control must be configured |
3525 | with steps of 32 or 64 characters. The result is it must always contain a string with size multiple of 32 or 64. </entry> | 3525 | with steps of 32 or 64 characters. The result is it must always contain a string with size multiple of 32 or 64. </entry> |
@@ -3650,7 +3650,7 @@ manually or automatically if set to zero. Unit, range and step are driver-specif | |||
3650 | </table> | 3650 | </table> |
3651 | 3651 | ||
3652 | <para>For more details about RDS specification, refer to | 3652 | <para>For more details about RDS specification, refer to |
3653 | <xref linkend="en50067" /> document, from CENELEC.</para> | 3653 | <xref linkend="iec62106" /> document, from CENELEC.</para> |
3654 | </section> | 3654 | </section> |
3655 | 3655 | ||
3656 | <section id="flash-controls"> | 3656 | <section id="flash-controls"> |
diff --git a/Documentation/DocBook/media/v4l/dev-rds.xml b/Documentation/DocBook/media/v4l/dev-rds.xml index 38883a419e65..be2f33737323 100644 --- a/Documentation/DocBook/media/v4l/dev-rds.xml +++ b/Documentation/DocBook/media/v4l/dev-rds.xml | |||
@@ -6,7 +6,7 @@ information, on an inaudible audio subcarrier of a radio program. This | |||
6 | interface is aimed at devices capable of receiving and/or transmitting RDS | 6 | interface is aimed at devices capable of receiving and/or transmitting RDS |
7 | information.</para> | 7 | information.</para> |
8 | 8 | ||
9 | <para>For more information see the core RDS standard <xref linkend="en50067" /> | 9 | <para>For more information see the core RDS standard <xref linkend="iec62106" /> |
10 | and the RBDS standard <xref linkend="nrsc4" />.</para> | 10 | and the RBDS standard <xref linkend="nrsc4" />.</para> |
11 | 11 | ||
12 | <para>Note that the RBDS standard as is used in the USA is almost identical | 12 | <para>Note that the RBDS standard as is used in the USA is almost identical |