summaryrefslogtreecommitdiffstats
path: root/Documentation/video4linux
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-07-21 22:00:56 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-07-21 22:00:56 +0000
commit168660f24dfc46c2702acbe4701a446f42a59578 (patch)
treef431368afbf6b1b71809cf3fd904d800ea126f4d /Documentation/video4linux
parent6420f767924fa73b0ea267864d96820815f4ba5a (diff)
Merge with Linux 2.4.0-test5-pre3.
Diffstat (limited to 'Documentation/video4linux')
-rw-r--r--Documentation/video4linux/bttv/CARDLIST4
-rw-r--r--Documentation/video4linux/bttv/CONTRIBUTORS2
-rw-r--r--Documentation/video4linux/bttv/Insmod-options17
3 files changed, 14 insertions, 9 deletions
diff --git a/Documentation/video4linux/bttv/CARDLIST b/Documentation/video4linux/bttv/CARDLIST
index 28f11aeac..0d36761d1 100644
--- a/Documentation/video4linux/bttv/CARDLIST
+++ b/Documentation/video4linux/bttv/CARDLIST
@@ -44,6 +44,10 @@ bttv.o
card=42 - ProVideo PV951
card=43 - Little OnAir TV
card=44 - Sigma TVII-FM
+ card=45 - MATRIX-Vision MV-Delta 2
+ card=46 - Zoltrix Genie TV
+ card=47 - Terratec TV/Radio+
+ card=48 - Dynalink Magic TView
tuner.o
type=0 - Temic PAL
diff --git a/Documentation/video4linux/bttv/CONTRIBUTORS b/Documentation/video4linux/bttv/CONTRIBUTORS
index 1ee99f6f5..aef49db88 100644
--- a/Documentation/video4linux/bttv/CONTRIBUTORS
+++ b/Documentation/video4linux/bttv/CONTRIBUTORS
@@ -13,7 +13,7 @@ Gerd Knorr <kraxel@cs.tu-berlin.de>
Radio card (ITT sound processor)
bigfoot <bigfoot@net-way.net>
-Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>
+Ragnar Hojland Espinosa <ragnar@macula.net>
ConferenceTV card
diff --git a/Documentation/video4linux/bttv/Insmod-options b/Documentation/video4linux/bttv/Insmod-options
index b6d4c5a6c..68818a532 100644
--- a/Documentation/video4linux/bttv/Insmod-options
+++ b/Documentation/video4linux/bttv/Insmod-options
@@ -10,8 +10,8 @@ bttv.o
1: 28 MHz crystal installed
2: 35 MHz crystal installed
triton1=0/1 for Triton1 compatibility
- Triton1 is automatically recognized
- but this might also help with other chipsets
+ Triton1 is automatically recognized
+ but this might also help with other chipsets
bigendian=n Set the endianness of the gfx framebuffer.
Default is native endian.
fieldnr=0/1 Count fields. Some TV descrambling software
@@ -19,14 +19,14 @@ bttv.o
50 useless IRQs/sec. default is 0 (off).
autoload=0/1 autoload helper modules (tuner, audio).
default is 1 (on).
- verbose=0/1/2 verbose level (at insmod time, while looking at
- the hardware). default is 1.
- debug=0/1 debug messages (for capture).
+ bttv_verbose=0/1/2 verbose level (at insmod time, while looking
+ at the hardware). default is 1.
+ bttv_debug=0/1 debug messages (for capture).
default is 0 (off).
gbuffers=2-64 number of capture buffers for mmap'ed capture.
default is 2.
- gbufsize=n size of capture buffers. default and
- maximum value is 0x208000 (~2MB)
+ gbufsize= size of capture buffers. default and
+ maximum value is 0x208000 (~2MB)
remap, card, radio and pll accept up to four comma-separated arguments
(for multiple boards).
@@ -63,7 +63,8 @@ msp3400.o
2 is more verbose.
simple=1 Use the "short programming" method. Newer
msp34xx versions support this. You need this
- for dbx stereo.
+ for dbx stereo. Default is on if supported by
+ the chip.
once=1 Don't check the TV-stations Audio mode
every few seconds, but only once after
channel switches.