Module Name: src
Committed By: jruoho
Date: Tue Aug 30 05:40:40 UTC 2011
Modified Files:
src/distrib/sets/lists/man: mi
src/share/man/man4: Makefile
Added Files:
src/share/man/man4: dtviic.4
Removed Files:
src/share/man/man4: dtvi2c.4
Log Message:
As discussed with wiz@ and jmcneill@, move the dtvi2c(4) page to dtviic(4)
(to match iic(4)) and install it by default. Also, and in particular, build
and install MLINKS for all supported demodulators and tuners.
To generate a diff of this commit:
cvs rdiff -u -r1.1334 -r1.1335 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.566 -r1.567 src/share/man/man4/Makefile
cvs rdiff -u -r1.3 -r0 src/share/man/man4/dtvi2c.4
cvs rdiff -u -r0 -r1.1 src/share/man/man4/dtviic.4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1334 src/distrib/sets/lists/man/mi:1.1335
--- src/distrib/sets/lists/man/mi:1.1334 Mon Aug 29 10:48:57 2011
+++ src/distrib/sets/lists/man/mi Tue Aug 30 05:40:38 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1334 2011/08/29 10:48:57 jruoho Exp $
+# $NetBSD: mi,v 1.1335 2011/08/30 05:40:38 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -811,6 +811,7 @@
./usr/share/man/cat4/attimer.0 man-sys-catman .cat
./usr/share/man/cat4/atu.0 man-sys-catman .cat
./usr/share/man/cat4/atw.0 man-sys-catman .cat
+./usr/share/man/cat4/au8522.0 man-sys-catman .cat
./usr/share/man/cat4/auacer.0 man-sys-catman .cat
./usr/share/man/cat4/audio.0 man-sys-catman .cat
./usr/share/man/cat4/audiocs.0 man-sys-catman .cat
@@ -891,6 +892,7 @@
./usr/share/man/cat4/cs80bus.0 man-sys-catman .cat
./usr/share/man/cat4/cuda.0 man-sys-catman .cat
./usr/share/man/cat4/cue.0 man-sys-catman .cat
+./usr/share/man/cat4/cx24227.0 man-sys-catman .cat
./usr/share/man/cat4/cy.0 man-sys-catman .cat
./usr/share/man/cat4/cypide.0 man-sys-catman .cat
./usr/share/man/cat4/cz.0 man-sys-catman .cat
@@ -1229,6 +1231,7 @@
./usr/share/man/cat4/lc.0 man-sys-catman .cat
./usr/share/man/cat4/ld.0 man-sys-catman .cat
./usr/share/man/cat4/le.0 man-sys-catman .cat
+./usr/share/man/cat4/lg3303.0 man-sys-catman .cat
./usr/share/man/cat4/lii.0 man-sys-catman .cat
./usr/share/man/cat4/lkm.0 man-obsolete obsolete
./usr/share/man/cat4/lm.0 man-sys-catman .cat
@@ -1288,6 +1291,7 @@
./usr/share/man/cat4/mr.0 man-obsolete obsolete
./usr/share/man/cat4/msk.0 man-sys-catman .cat
./usr/share/man/cat4/mskc.0 man-sys-catman .cat
+./usr/share/man/cat4/mt2131.0 man-sys-catman .cat
./usr/share/man/cat4/mtd.0 man-sys-catman .cat
./usr/share/man/cat4/mtio.0 man-sys-catman .cat
./usr/share/man/cat4/multicast.0 man-sys-catman .cat
@@ -1335,6 +1339,7 @@
./usr/share/man/cat4/ntwo.0 man-sys-catman .cat
./usr/share/man/cat4/ntwoc.0 man-sys-catman .cat
./usr/share/man/cat4/null.0 man-sys-catman .cat
+./usr/share/man/cat4/nxt2k.0 man-sys-catman .cat
./usr/share/man/cat4/oak.0 man-sys-catman .cat
./usr/share/man/cat4/oboe.0 man-sys-catman .cat
./usr/share/man/cat4/ofisa.0 man-sys-catman .cat
@@ -1638,6 +1643,7 @@
./usr/share/man/cat4/tty.0 man-sys-catman .cat
./usr/share/man/cat4/tun.0 man-sys-catman .cat
./usr/share/man/cat4/tuner.0 man-sys-catman .cat
+./usr/share/man/cat4/tvpll.0 man-sys-catman .cat
./usr/share/man/cat4/twa.0 man-sys-catman .cat
./usr/share/man/cat4/twe.0 man-sys-catman .cat
./usr/share/man/cat4/txp.0 man-sys-catman .cat
@@ -1822,6 +1828,8 @@
./usr/share/man/cat4/xbd.0 man-sys-catman .cat
./usr/share/man/cat4/xbdback.0 man-sys-catman .cat
./usr/share/man/cat4/xbox.0 man-sys-catman .cat
+./usr/share/man/cat4/xc3028.0 man-sys-catman .cat
+./usr/share/man/cat4/xc5k.0 man-sys-catman .cat
./usr/share/man/cat4/xenbus.0 man-sys-catman .cat
./usr/share/man/cat4/xennet.0 man-sys-catman .cat
./usr/share/man/cat4/xge.0 man-sys-catman .cat
@@ -1832,6 +1840,7 @@
./usr/share/man/cat4/yds.0 man-sys-catman .cat
./usr/share/man/cat4/ym.0 man-sys-catman .cat
./usr/share/man/cat4/zero.0 man-sys-catman .cat
+./usr/share/man/cat4/zl10353.0 man-sys-catman .cat
./usr/share/man/cat4/zs.0 man-sys-catman .cat
./usr/share/man/cat4/zsc.0 man-sys-catman .cat
./usr/share/man/cat4/zstty.0 man-sys-catman .cat
@@ -3623,6 +3632,7 @@
./usr/share/man/html4/attimer.html man-sys-htmlman html
./usr/share/man/html4/atu.html man-sys-htmlman html
./usr/share/man/html4/atw.html man-sys-htmlman html
+./usr/share/man/html4/au8522.html man-sys-htmlman html
./usr/share/man/html4/auacer.html man-sys-htmlman html
./usr/share/man/html4/audio.html man-sys-htmlman html
./usr/share/man/html4/audiocs.html man-sys-htmlman html
@@ -3700,6 +3710,7 @@
./usr/share/man/html4/cs80bus.html man-sys-htmlman html
./usr/share/man/html4/cuda.html man-sys-htmlman html
./usr/share/man/html4/cue.html man-sys-htmlman html
+./usr/share/man/html4/cx24227.html man-sys-htmlman html
./usr/share/man/html4/cy.html man-sys-htmlman html
./usr/share/man/html4/cypide.html man-sys-htmlman html
./usr/share/man/html4/cz.html man-sys-htmlman html
@@ -4005,6 +4016,7 @@
./usr/share/man/html4/ld.html man-sys-htmlman html
./usr/share/man/html4/le.html man-sys-htmlman html
./usr/share/man/html4/lii.html man-sys-htmlman html
+./usr/share/man/html4/lg3303.html man-sys-htmlman html
./usr/share/man/html4/lkm.html man-obsolete obsolete
./usr/share/man/html4/lm.html man-sys-htmlman html
./usr/share/man/html4/lmc.html man-sys-htmlman html
@@ -4058,6 +4070,7 @@
./usr/share/man/html4/mr.html man-obsolete obsolete
./usr/share/man/html4/msk.html man-sys-htmlman html
./usr/share/man/html4/mskc.html man-sys-htmlman html
+./usr/share/man/html4/mt2131.html man-sys-htmlman html
./usr/share/man/html4/mtd.html man-sys-htmlman html
./usr/share/man/html4/mtio.html man-sys-htmlman html
./usr/share/man/html4/multicast.html man-sys-htmlman html
@@ -4101,6 +4114,7 @@
./usr/share/man/html4/ntwo.html man-sys-htmlman html
./usr/share/man/html4/ntwoc.html man-sys-htmlman html
./usr/share/man/html4/null.html man-sys-htmlman html
+./usr/share/man/html4/nxt2k.html man-sys-htmlman html
./usr/share/man/html4/oak.html man-sys-htmlman html
./usr/share/man/html4/oboe.html man-sys-htmlman html
./usr/share/man/html4/ofisa.html man-sys-htmlman html
@@ -4373,6 +4387,7 @@
./usr/share/man/html4/tty.html man-sys-htmlman html
./usr/share/man/html4/tun.html man-sys-htmlman html
./usr/share/man/html4/tuner.html man-sys-htmlman html
+./usr/share/man/html4/tvpll.html man-sys-htmlman html
./usr/share/man/html4/twa.html man-sys-htmlman html
./usr/share/man/html4/twe.html man-sys-htmlman html
./usr/share/man/html4/txp.html man-sys-htmlman html
@@ -4551,6 +4566,8 @@
./usr/share/man/html4/xbd.html man-sys-htmlman html
./usr/share/man/html4/xbdback.html man-sys-htmlman html
./usr/share/man/html4/xbox.html man-sys-htmlman html
+./usr/share/man/html4/xc3028.html man-sys-htmlman html
+./usr/share/man/html4/xc5k.html man-sys-htmlman html
./usr/share/man/html4/xenbus.html man-sys-htmlman html
./usr/share/man/html4/xennet.html man-sys-htmlman html
./usr/share/man/html4/xge.html man-sys-htmlman html
@@ -4561,6 +4578,7 @@
./usr/share/man/html4/yds.html man-sys-htmlman html
./usr/share/man/html4/ym.html man-sys-htmlman html
./usr/share/man/html4/zero.html man-sys-htmlman html
+./usr/share/man/html4/zl10353.html man-sys-htmlman html
./usr/share/man/html4/zs.html man-sys-htmlman html
./usr/share/man/html4/zsc.html man-sys-htmlman html
./usr/share/man/html4/zstty.html man-sys-htmlman html
@@ -6204,6 +6222,7 @@
./usr/share/man/man4/attimer.4 man-sys-man .man
./usr/share/man/man4/atu.4 man-sys-man .man
./usr/share/man/man4/atw.4 man-sys-man .man
+./usr/share/man/man4/au8522.4 man-sys-man .man
./usr/share/man/man4/auacer.4 man-sys-man .man
./usr/share/man/man4/audio.4 man-sys-man .man
./usr/share/man/man4/audiocs.4 man-sys-man .man
@@ -6284,6 +6303,7 @@
./usr/share/man/man4/cs80bus.4 man-sys-man .man
./usr/share/man/man4/cuda.4 man-sys-man .man
./usr/share/man/man4/cue.4 man-sys-man .man
+./usr/share/man/man4/cx24227.4 man-sys-man .man
./usr/share/man/man4/cy.4 man-sys-man .man
./usr/share/man/man4/cypide.4 man-sys-man .man
./usr/share/man/man4/cz.4 man-sys-man .man
@@ -6623,6 +6643,7 @@
./usr/share/man/man4/ld.4 man-sys-man .man
./usr/share/man/man4/le.4 man-sys-man .man
./usr/share/man/man4/lii.4 man-sys-man .man
+./usr/share/man/man4/lg3303.4 man-sys-man .man
./usr/share/man/man4/lkm.4 man-obsolete obsolete
./usr/share/man/man4/lm.4 man-sys-man .man
./usr/share/man/man4/lmc.4 man-sys-man .man
@@ -6681,6 +6702,7 @@
./usr/share/man/man4/mr.4 man-obsolete obsolete
./usr/share/man/man4/msk.4 man-sys-man .man
./usr/share/man/man4/mskc.4 man-sys-man .man
+./usr/share/man/man4/mt2131.4 man-sys-man .man
./usr/share/man/man4/mtd.4 man-sys-man .man
./usr/share/man/man4/mtio.4 man-sys-man .man
./usr/share/man/man4/multicast.4 man-sys-man .man
@@ -6728,6 +6750,7 @@
./usr/share/man/man4/ntwo.4 man-sys-man .man
./usr/share/man/man4/ntwoc.4 man-sys-man .man
./usr/share/man/man4/null.4 man-sys-man .man
+./usr/share/man/man4/nxt2k.4 man-sys-man .man
./usr/share/man/man4/oak.4 man-sys-man .man
./usr/share/man/man4/oboe.4 man-sys-man .man
./usr/share/man/man4/ofisa.4 man-sys-man .man
@@ -7031,6 +7054,7 @@
./usr/share/man/man4/tty.4 man-sys-man .man
./usr/share/man/man4/tun.4 man-sys-man .man
./usr/share/man/man4/tuner.4 man-sys-man .man
+./usr/share/man/man4/tvpll.4 man-sys-man .man
./usr/share/man/man4/twa.4 man-sys-man .man
./usr/share/man/man4/twe.4 man-sys-man .man
./usr/share/man/man4/txp.4 man-sys-man .man
@@ -7215,6 +7239,8 @@
./usr/share/man/man4/xbd.4 man-sys-man .man
./usr/share/man/man4/xbdback.4 man-sys-man .man
./usr/share/man/man4/xbox.4 man-sys-man .man
+./usr/share/man/man4/xc3028.4 man-sys-man .man
+./usr/share/man/man4/xc5k.4 man-sys-man .man
./usr/share/man/man4/xenbus.4 man-sys-man .man
./usr/share/man/man4/xennet.4 man-sys-man .man
./usr/share/man/man4/xge.4 man-sys-man .man
@@ -7225,6 +7251,7 @@
./usr/share/man/man4/yds.4 man-sys-man .man
./usr/share/man/man4/ym.4 man-sys-man .man
./usr/share/man/man4/zero.4 man-sys-man .man
+./usr/share/man/man4/zl10353.4 man-sys-man .man
./usr/share/man/man4/zs.4 man-sys-man .man
./usr/share/man/man4/zsc.4 man-sys-man .man
./usr/share/man/man4/zstty.4 man-sys-man .man
Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.566 src/share/man/man4/Makefile:1.567
--- src/share/man/man4/Makefile:1.566 Mon Aug 29 10:48:57 2011
+++ src/share/man/man4/Makefile Tue Aug 30 05:40:38 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.566 2011/08/29 10:48:57 jruoho Exp $
+# $NetBSD: Makefile,v 1.567 2011/08/30 05:40:38 jruoho Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -21,7 +21,7 @@
clockctl.4 cltp.4 cmdide.4 cmpci.4 cms.4 cnw.4 \
com.4 crypto.4 cs80bus.4 cuda.4 cypide.4 \
ddb.4 ddc.4 de.4 dge.4 dk.4 dm.4 dmoverio.4 \
- dmphy.4 dpt.4 dpti.4 drm.4 drum.4 dtv.4 \
+ dmphy.4 dpt.4 dpti.4 drm.4 drum.4 dtv.4 dtviic.4 \
eap.4 ebus.4 edc.4 elmc.4 emuxki.4 en.4 envsys.4 ep.4 esh.4 esis.4 \
esa.4 esiop.4 esm.4 eso.4 et.4 etherip.4 etphy.4 exphy.4 \
fast_ipsec.4 fd.4 finsio.4 flash.4 fpa.4 fms.4 fss.4 fujbp.4 fxp.4 \
@@ -143,6 +143,17 @@
# machine-independent Xen devices
MAN+= pciback.4 xbd.4 xbdback.4 xenbus.4 xennet.4 xpci.4 xvif.4
+# DTV I2C modules
+MLINKS+=dtviic.4 au8522.4 \
+ dtviic.4 cx24227.4 \
+ dtviic.4 lg3303.4 \
+ dtviic.4 mt2131.4 \
+ dtviic.4 nxt2k.4 \
+ dtviic.4 zl10353.4 \
+ dtviic.4 tvpll.4 \
+ dtviic.4 xc3028.4 \
+ dtviic.4 xc5k.4
+
# DRM devices
MLINKS+=drm.4 i915drm.4
MLINKS+=drm.4 mach64drm.4
Added files:
Index: src/share/man/man4/dtviic.4
diff -u /dev/null src/share/man/man4/dtviic.4:1.1
--- /dev/null Tue Aug 30 05:40:40 2011
+++ src/share/man/man4/dtviic.4 Tue Aug 30 05:40:38 2011
@@ -0,0 +1,154 @@
+.\" $NetBSD: dtviic.4,v 1.1 2011/08/30 05:40:38 jruoho Exp $
+.\"
+.\" Copyright (c) 2011 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by Thomas Klausner.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd August 30, 2011
+.Dt DTVIIC 4
+.Os
+.Sh NAME
+.Nm dtvi2c ,
+.Nm au8522 ,
+.Nm cx24227 ,
+.Nm lg3303 ,
+.Nm mt2131 ,
+.Nm nxt2k ,
+.Nm zl10353 ,
+.Nm tvpll ,
+.Nm xc3028 ,
+.Nm xc5k
+.Nd Inter IC (I2C) modules for DTV
+.Sh DESCRIPTION
+The
+.Nm
+modules provide support for
+.Xr dtv 4
+devices.
+The
+.Nm
+group includes digital tuners, demodulators, and analog video decoders.
+.Pp
+The usual hardware structure consists of a host controller
+(connected for instance via
+.Xr usb 4
+or
+.Xr pci 4 )
+that provides the data moving facilities (for the analog or
+digital video streams) and an
+.Xr iic 4
+bus over which the other chips can be configured.
+.Pp
+For example, a typical
+.Xr dtv 4
+setup would look like this:
+.Bl -enum -offset indent
+.It
+Initialize transport stream
+.Pq Dv TS
+port on the host controller.
+.It
+Configure the demodulator that
+.Dq demodulates
+the information from an intermediate frequency
+.Pq Dv IF
+that is provided to it by the associated tuner.
+This step typically includes setting the desired
+quadrature amplitude modulation
+.Pq Dv QAM
+and bandwidth, among other things.
+.It
+Configure the tuner.
+Typically this step includes at least setting the frequency.
+.It
+Start TS transfer (using
+.Dv DMA
+transfers or
+.Dv USB
+high speed transfers).
+.El
+.Pp
+The supported demodulators include:
+.Bl -tag -width 10n -offset indent
+.It Nm au8522
+Auvitek AU8522 ATSC/QAM64/QAM256 demodulator
+.It Nm cx24227
+Conexant CX24227 ATSC/QAM64/QAM256 demodulator
+.It Nm lg3303
+LG LGDT3303 ATSC/QAM64/QAM256 demodulator
+.It Nm mt2131
+MicroTune MT2131 ATSC demodulator
+.It Nm nxt2k
+NxtWave Communications NXT2004 ATSC demodulator
+.It Nm zl10353
+Zarlink ZL10353 (Intel CE623x) COFDM/DVB demodulator
+.El
+.Pp
+The supported tuners are:
+.Bl -tag -width 10n -offset indent
+.It Ic tvpll
+Generic PLL-based tuners
+.It Nm xc3028
+XCeive XC3028 analog and digital tuner
+.It Nm xc5k
+Xceive XC5000 analog and digital tuner
+.El
+.Sh FILES
+.Bl -bullet
+.It
+.Pa dvb-fe-nxt2004.fw
+needed by nxt2k
+.It
+.Pa xc3028L-v36.fw
+(provided by
+.Pa pkgsrc/sysutils/xc3028l-firmware )
+or
+.Pa xc3028-v27.fw
+needed by xc3028
+.It
+.Pa dvb-fe-xc5000-1.6.114.fw
+needed by xc5k, provided by
+.Pa pkgsrc/sysutils/xc5k-firmware
+.El
+.Sh SEE ALSO
+.Xr dtv 4 ,
+.Xr iic 4 ,
+.Xr module 7
+.Sh HISTORY
+The
+.Nm
+modules first appeared in
+.Nx 6.0 .
+.Sh AUTHORS
+.An -nosplit
+Authors include
+.An Jared D. McNeill
+.Aq jmcne...@netbsd.org ,
+.An Jonathan A. Kollasch
+.Aq jakll...@netbsd.org ,
+and
+.An Jukka Ruohonen
+.Aq jruoho...@iki.fi .
