Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

f17578de · Linus Torvalds <[email protected]> · 2006-01-09 13:03:58 -08:00

Commit: f17578decc40df8fceff82b106582e30bdfb3189
Parents: 682e852e · cec41834

Merge commit. Changes below are compared with the first parent: 682e852e.

Changes

203 files changed · +10709 −5147

File	Status	Add	Del	Content
Documentation/dvb/avermedia.txt	modified	+2	−1	View file
Documentation/dvb/get_dvb_firmware	modified	+20	−3	View file
Documentation/dvb/ttusb-dec.txt	modified	+2	−1	View file
Documentation/video4linux/CARDLIST.bttv	modified	+1	−0	View file
Documentation/video4linux/CARDLIST.cx88	modified	+9	−1	View file
Documentation/video4linux/CARDLIST.saa7134	modified	+3	−2	View file
Documentation/video4linux/CARDLIST.tuner	modified	+3	−3	View file
drivers/media/common/saa7146_fops.c	modified	+34	−4	View file
drivers/media/common/saa7146_hlp.c	modified	+10	−3	View file
drivers/media/common/saa7146_vbi.c	modified	+3	−3	View file
drivers/media/common/saa7146_video.c	modified	+2	−7	View file
drivers/media/dvb/b2c2/flexcop-fe-tuner.c	modified	+20	−13	View file
drivers/media/dvb/b2c2/flexcop-reg.h	modified	+3	−1	View file
drivers/media/dvb/bt8xx/dst.c	modified	+31	−21	View file
drivers/media/dvb/bt8xx/dst_ca.c	modified	+2	−1	View file
drivers/media/dvb/bt8xx/dvb-bt8xx.c	modified	+0	−16	View file
drivers/media/dvb/cinergyT2/Kconfig	modified	+10	−10	View file
drivers/media/dvb/cinergyT2/cinergyT2.c	modified	+55	−27	View file
drivers/media/dvb/dvb-core/Kconfig	modified	+1	−1	View file
drivers/media/dvb/dvb-core/Makefile	modified	+1	−1	View file
drivers/media/dvb/dvb-core/dvb_ca_en50221.c	modified	+1	−3	View file
drivers/media/dvb/dvb-core/dvb_filter.c	modified	+8	−8	View file
drivers/media/dvb/dvb-core/dvb_frontend.c	modified	+181	−134	View file
drivers/media/dvb/dvb-core/dvb_frontend.h	modified	+13	−3	View file
drivers/media/dvb/dvb-core/dvb_net.c	modified	+3	−3	View file
drivers/media/dvb/dvb-core/dvb_ringbuffer.c	modified	+16	−16	View file
drivers/media/dvb/dvb-core/dvb_ringbuffer.h	modified	+4	−4	View file
drivers/media/dvb/dvb-core/dvbdev.c	modified	+11	−11	View file
drivers/media/dvb/dvb-core/dvbdev.h	modified	+1	−1	View file
drivers/media/dvb/dvb-usb/Kconfig	modified	+15	−9	View file
drivers/media/dvb/dvb-usb/cxusb.c	modified	+284	−10	View file
drivers/media/dvb/dvb-usb/cxusb.h	modified	+2	−0	View file
drivers/media/dvb/dvb-usb/dibusb-mb.c	modified	+28	−18	View file
drivers/media/dvb/dvb-usb/digitv.c	modified	+1	−1	View file
drivers/media/dvb/dvb-usb/dtt200u.c	modified	+3	−3	View file
drivers/media/dvb/dvb-usb/dtt200u.h	modified	+16	−15	View file
drivers/media/dvb/dvb-usb/dvb-usb-common.h	modified	+1	−1	View file
drivers/media/dvb/dvb-usb/dvb-usb-firmware.c	modified	+100	−54	View file
drivers/media/dvb/dvb-usb/dvb-usb-i2c.c	modified	+5	−3	View file
drivers/media/dvb/dvb-usb/dvb-usb-ids.h	modified	+8	−4	View file
drivers/media/dvb/dvb-usb/dvb-usb-init.c	modified	+32	−27	View file
drivers/media/dvb/dvb-usb/dvb-usb.h	modified	+23	−6	View file
drivers/media/dvb/dvb-usb/nova-t-usb2.c	modified	+2	−5	View file
drivers/media/dvb/dvb-usb/vp702x-fe.c	modified	+1	−1	View file
drivers/media/dvb/dvb-usb/vp702x.h	modified	+21	−22	View file
drivers/media/dvb/dvb-usb/vp7045.c	modified	+1	−1	View file
drivers/media/dvb/frontends/Kconfig	modified	+33	−13	View file
drivers/media/dvb/frontends/Makefile	modified	+1	−0	View file
drivers/media/dvb/frontends/bcm3510.c	modified	+3	−3	View file
drivers/media/dvb/frontends/cx22702.c	modified	+16	−6	View file
drivers/media/dvb/frontends/cx24110.c	modified	+11	−12	View file
drivers/media/dvb/frontends/cx24123.c	added	+889	−0	View file
drivers/media/dvb/frontends/cx24123.h	added	+51	−0	View file
drivers/media/dvb/frontends/dvb-pll.c	modified	+8	−7	View file
drivers/media/dvb/frontends/dvb-pll.h	modified	+1	−1	View file
drivers/media/dvb/frontends/lgdt330x.c	modified	+3	−0	View file
drivers/media/dvb/frontends/nxt2002.c	modified	+2	−1	View file
drivers/media/dvb/frontends/nxt6000.c	modified	+5	−5	View file
drivers/media/dvb/frontends/or51211.c	modified	+3	−2	View file
drivers/media/dvb/frontends/s5h1420.c	modified	+2	−2	View file
drivers/media/dvb/frontends/sp8870.c	modified	+2	−1	View file
drivers/media/dvb/frontends/sp887x.c	modified	+3	−2	View file
drivers/media/dvb/frontends/stv0299.c	modified	+10	−2	View file
drivers/media/dvb/frontends/stv0299.h	modified	+1	−0	View file
drivers/media/dvb/frontends/tda10021.c	modified	+2	−2	View file
drivers/media/dvb/frontends/tda1004x.c	modified	+92	−49	View file
drivers/media/dvb/pluto2/Kconfig	modified	+1	−1	View file
drivers/media/dvb/ttpci/Kconfig	modified	+4	−3	View file
drivers/media/dvb/ttpci/Makefile	modified	+1	−1	View file
drivers/media/dvb/ttpci/av7110.c	modified	+92	−41	View file
drivers/media/dvb/ttpci/av7110.h	modified	+15	−2	View file
drivers/media/dvb/ttpci/av7110_av.c	modified	+9	−3	View file
drivers/media/dvb/ttpci/av7110_hw.c	modified	+5	−2	View file
drivers/media/dvb/ttpci/av7110_hw.h	modified	+2	−1	View file
drivers/media/dvb/ttpci/av7110_ir.c	modified	+10	−4	View file
drivers/media/dvb/ttpci/av7110_v4l.c	modified	+110	−8	View file
drivers/media/dvb/ttpci/budget-av.c	modified	+179	−5	View file
drivers/media/dvb/ttpci/budget-core.c	modified	+1	−3	View file
drivers/media/dvb/ttpci/budget.c	modified	+10	−3	View file
drivers/media/dvb/ttpci/ttpci-eeprom.c	modified	+1	−1	View file
drivers/media/dvb/ttusb-budget/Kconfig	modified	+1	−1	View file
drivers/media/dvb/ttusb-dec/Kconfig	modified	+7	−6	View file
drivers/media/dvb/ttusb-dec/ttusb_dec.c	modified	+10	−10	View file
drivers/media/dvb/ttusb-dec/ttusbdecfe.c	modified	+48	−5	View file
drivers/media/radio/miropcm20-radio.c	modified	+1	−0	View file
drivers/media/radio/radio-aimslab.c	modified	+1	−0	View file
drivers/media/radio/radio-aztech.c	modified	+1	−0	View file
drivers/media/radio/radio-cadet.c	modified	+1	−0	View file
drivers/media/radio/radio-gemtek-pci.c	modified	+1	−0	View file
drivers/media/radio/radio-gemtek.c	modified	+1	−0	View file
drivers/media/radio/radio-maestro.c	modified	+1	−0	View file
drivers/media/radio/radio-maxiradio.c	modified	+1	−0	View file
drivers/media/radio/radio-rtrack2.c	modified	+1	−0	View file
drivers/media/radio/radio-sf16fmi.c	modified	+1	−0	View file
drivers/media/radio/radio-sf16fmr2.c	modified	+1	−0	View file
drivers/media/radio/radio-terratec.c	modified	+1	−0	View file
drivers/media/radio/radio-trust.c	modified	+1	−0	View file
drivers/media/radio/radio-typhoon.c	modified	+1	−0	View file
drivers/media/radio/radio-zoltrix.c	modified	+1	−0	View file
drivers/media/video/Kconfig	modified	+10	−1	View file
drivers/media/video/Makefile	modified	+7	−3	View file
drivers/media/video/arv.c	modified	+1	−0	View file
drivers/media/video/bt832.c	modified	+35	−35	View file
drivers/media/video/bttv-cards.c	modified	+47	−9	View file
drivers/media/video/bttv-driver.c	modified	+30	−38	View file
drivers/media/video/bttv-gpio.c	modified	+0	−18	View file
drivers/media/video/bttv-i2c.c	modified	+5	−10	View file
drivers/media/video/ir-kbd-gpio.c → drivers/media/video/bttv-input.c	renamed	+88	−168	View file
drivers/media/video/bttv-vbi.c	modified	+22	−35	View file
drivers/media/video/bttv.h	modified	+35	−2	View file
drivers/media/video/bttvp.h	modified	+9	−4	View file
drivers/media/video/bw-qcam.c	modified	+1	−0	View file
drivers/media/video/c-qcam.c	modified	+1	−0	View file
drivers/media/video/compat_ioctl32.c	added	+732	−0	View file
drivers/media/video/cpia.c	modified	+1	−0	View file
drivers/media/video/cs53l32a.c	modified	+41	−51	View file
drivers/media/video/cx25840/cx25840-audio.c	modified	+36	−55	View file
drivers/media/video/cx25840/cx25840-core.c	modified	+239	−149	View file
drivers/media/video/cx25840/cx25840-firmware.c	modified	+22	−14	View file
drivers/media/video/cx25840/cx25840-vbi.c	modified	+2	−2	View file
drivers/media/video/cx25840/cx25840.h	modified	+47	−34	View file
drivers/media/video/cx88/Kconfig	modified	+25	−0	View file
drivers/media/video/cx88/Makefile	modified	+3	−1	View file
drivers/media/video/cx88/cx88-alsa.c	added	+848	−0	View file
drivers/media/video/cx88/cx88-blackbird.c	modified	+15	−3	View file
drivers/media/video/cx88/cx88-cards.c	modified	+220	−7	View file
drivers/media/video/cx88/cx88-core.c	modified	+6	−61	View file
drivers/media/video/cx88/cx88-dvb.c	modified	+213	−2	View file
drivers/media/video/cx88/cx88-i2c.c	modified	+12	−1	View file
drivers/media/video/cx88/cx88-input.c	modified	+136	−6	View file
drivers/media/video/cx88/cx88-mpeg.c	modified	+5	−0	View file
drivers/media/video/cx88/cx88-tvaudio.c	modified	+9	−1	View file
drivers/media/video/cx88/cx88-video.c	modified	+45	−49	View file
drivers/media/video/cx88/cx88-vp3054-i2c.c	added	+173	−0	View file
drivers/media/video/cx88/cx88-vp3054-i2c.h	added	+35	−0	View file
drivers/media/video/cx88/cx88.h	modified	+16	−1	View file
drivers/media/video/em28xx/em28xx-cards.c	modified	+2	−6	View file
drivers/media/video/em28xx/em28xx-core.c	modified	+4	−57	View file
drivers/media/video/em28xx/em28xx-i2c.c	modified	+1	−2	View file
drivers/media/video/em28xx/em28xx-video.c	modified	+127	−40	View file
drivers/media/video/em28xx/em28xx.h	modified	+3	−3	View file
drivers/media/video/ir-kbd-i2c.c	modified	+11	−7	View file
drivers/media/video/meye.c	modified	+1	−0	View file
drivers/media/video/msp3400-driver.c	added	+1274	−0	View file
drivers/media/video/msp3400-kthreads.c	added	+1010	−0	View file
drivers/media/video/msp3400.c	deleted	+0	−2229	View before deletion
drivers/media/video/msp3400.h	modified	+94	−8	View file
drivers/media/video/mt20xx.c	modified	+13	−3	View file
drivers/media/video/mxb.c	modified	+1	−0	View file
drivers/media/video/pms.c	modified	+1	−0	View file
drivers/media/video/saa5249.c	modified	+1	−0	View file
drivers/media/video/saa6588.c	modified	+1	−11	View file
drivers/media/video/saa7115.c	modified	+150	−169	View file
drivers/media/video/saa711x.c	modified	+0	−2	View file
drivers/media/video/saa7127.c	modified	+27	−55	View file
drivers/media/video/saa7134/saa6752hs.c	modified	+5	−3	View file
drivers/media/video/saa7134/saa7134-alsa.c	modified	+1	−1	View file
drivers/media/video/saa7134/saa7134-cards.c	modified	+83	−0	View file
drivers/media/video/saa7134/saa7134-core.c	modified	+50	−88	View file
drivers/media/video/saa7134/saa7134-dvb.c	modified	+1	−0	View file
drivers/media/video/saa7134/saa7134-empress.c	modified	+2	−1	View file
drivers/media/video/saa7134/saa7134-i2c.c	modified	+1	−2	View file
drivers/media/video/saa7134/saa7134-input.c	modified	+25	−14	View file
drivers/media/video/saa7134/saa7134-oss.c	modified	+38	−2	View file
drivers/media/video/saa7134/saa7134-video.c	modified	+5	−2	View file
drivers/media/video/saa7134/saa7134.h	modified	+5	−5	View file
drivers/media/video/stradis.c	modified	+1	−0	View file
drivers/media/video/tda7432.c	modified	+15	−28	View file
drivers/media/video/tda8290.c	modified	+0	−6	View file
drivers/media/video/tda9875.c	modified	+1	−6	View file
drivers/media/video/tda9887.c	modified	+143	−85	View file
drivers/media/video/tea5767.c	modified	+5	−2	View file
drivers/media/video/tuner-core.c	modified	+98	−40	View file
drivers/media/video/tuner-simple.c	modified	+728	−161	View file
drivers/media/video/tvaudio.c	modified	+110	−67	View file
drivers/media/video/tveeprom.c	modified	+21	−22	View file
drivers/media/video/tvmixer.c	modified	+1	−19	View file
drivers/media/video/tvp5150.c	modified	+434	−101	View file
drivers/media/video/v4l1-compat.c	modified	+10	−1	View file
drivers/media/video/v4l2-common.c	modified	+170	−49	View file
drivers/media/video/videodev.c	modified	+6	−4	View file
drivers/media/video/w9966.c	modified	+1	−0	View file
drivers/media/video/wm8775.c	modified	+44	−44	View file
drivers/media/video/zoran_driver.c	modified	+1	−0	View file
drivers/media/video/zr36120.c	modified	+1	−0	View file
drivers/usb/media/dsbr100.c	modified	+1	−0	View file
drivers/usb/media/ov511.c	modified	+1	−0	View file
drivers/usb/media/pwc/pwc-if.c	modified	+1	−0	View file
drivers/usb/media/se401.c	modified	+1	−0	View file
drivers/usb/media/stv680.c	modified	+1	−0	View file
drivers/usb/media/usbvideo.c	modified	+1	−0	View file
drivers/usb/media/vicam.c	modified	+1	−0	View file
drivers/usb/media/w9968cf.c	modified	+1	−0	View file
fs/compat_ioctl.c	modified	+0	−246	View file
include/linux/compat_ioctl.h	modified	+0	−26	View file
include/linux/dvb/frontend.h	modified	+10	−0	View file
include/linux/i2c-id.h	modified	+1	−0	View file
include/linux/video_decoder.h	modified	+2	−0	View file
include/linux/videodev2.h	modified	+13	−3	View file
include/media/audiochip.h	modified	+0	−16	View file
include/media/saa7146_vv.h	modified	+2	−0	View file
include/media/tuner.h	modified	+46	−52	View file
include/media/v4l2-common.h	modified	+76	−9	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/dvb/avermedia.txt

View file

diff --git a/Documentation/dvb/avermedia.txt b/Documentation/dvb/avermedia.txt
index 2dc260b..068070f 100644
--- a/Documentation/dvb/avermedia.txt
+++ b/Documentation/dvb/avermedia.txt
@@ -150,7 +150,8 @@ Getting the card going
 
    The frontend module sp887x.o, requires an external   firmware.
    Please use  the  command "get_dvb_firmware sp887x" to download
-   it. Then copy it to /usr/lib/hotplug/firmware.
+   it. Then copy it to /usr/lib/hotplug/firmware or /lib/firmware/
+   (depending on configuration of firmware hotplug).
 
 Receiving DVB-T in Australia
 

Documentation/dvb/get_dvb_firmware

View file

diff --git a/Documentation/dvb/get_dvb_firmware b/Documentation/dvb/get_dvb_firmware
index be6eb4c..75c28a1 100644
--- a/Documentation/dvb/get_dvb_firmware
+++ b/Documentation/dvb/get_dvb_firmware
@@ -23,7 +23,7 @@ use IO::Handle;
 
 @components = ( "sp8870", "sp887x", "tda10045", "tda10046", "av7110", "dec2000t",
 		"dec2540t", "dec3000s", "vp7041", "dibusb", "nxt2002", "nxt2004",
-		"or51211", "or51132_qam", "or51132_vsb");
+		"or51211", "or51132_qam", "or51132_vsb", "bluebird");
 
 # Check args
 syntax() if (scalar(@ARGV) != 1);
@@ -34,7 +34,11 @@ for ($i=0; $i < scalar(@components); $i++) {
     if ($cid eq $components[$i]) {
 	$outfile = eval($cid);
 	die $@ if $@;
-	print STDERR "Firmware $outfile extracted successfully. Now copy it to either /lib/firmware or /usr/lib/hotplug/firmware/ (depending on your hotplug version).\n";
+	print STDERR <<EOF;
+Firmware $outfile extracted successfully.
+Now copy it to either /usr/lib/hotplug/firmware or /lib/firmware
+(depending on configuration of firmware hotplug).
+EOF
 	exit(0);
     }
 }
@@ -243,7 +247,7 @@ sub nxt2002 {
     my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);
 
     checkstandard();
-    
+
     wgetfile($sourcefile, $url);
     unzip($sourcefile, $tmpdir);
     verify("$tmpdir/SkyNETU.sys", $hash);
@@ -308,6 +312,19 @@ sub or51132_vsb {
     $fwfile;
 }
 
+sub bluebird {
+	my $url = "http://www.linuxtv.org/download/dvb/firmware/dvb-usb-bluebird-01.fw";
+	my $outfile = "dvb-usb-bluebird-01.fw";
+	my $hash = "658397cb9eba9101af9031302671f49d";
+
+	checkstandard();
+
+	wgetfile($outfile, $url);
+	verify($outfile,$hash);
+
+	$outfile;
+}
+
 # ---------------------------------------------------------------
 # Utilities
 

Documentation/dvb/ttusb-dec.txt

View file

diff --git a/Documentation/dvb/ttusb-dec.txt b/Documentation/dvb/ttusb-dec.txt
index 5c1e984..b2f271c 100644
--- a/Documentation/dvb/ttusb-dec.txt
+++ b/Documentation/dvb/ttusb-dec.txt
@@ -41,4 +41,5 @@ Hotplug Firmware Loading for 2.6 kernels
 For 2.6 kernels the firmware is loaded at the point that the driver module is
 loaded.  See linux/Documentation/dvb/firmware.txt for more information.
 
-Copy the three files downloaded above into the /usr/lib/hotplug/firmware directory.
+Copy the three files downloaded above into the /usr/lib/hotplug/firmware or
+/lib/firmware directory (depending on configuration of firmware hotplug).

Documentation/video4linux/CARDLIST.bttv

View file

diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv
index 330246a..74fb085 100644
--- a/Documentation/video4linux/CARDLIST.bttv
+++ b/Documentation/video4linux/CARDLIST.bttv
@@ -141,3 +141,4 @@
 140 -> Osprey 440                                          [0070:ff07]
 141 -> Asound Skyeye PCTV
 142 -> Sabrent TV-FM (bttv version)
+143 -> Hauppauge ImpactVCB (bt878)                         [0070:13eb]

Documentation/video4linux/CARDLIST.cx88

View file

diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88
index a1017d1..34b6e59 100644
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/Documentation/video4linux/CARDLIST.cx88
@@ -16,7 +16,7 @@
  15 -> DViCO FusionHDTV DVB-T1                             [18ac:db00]
  16 -> KWorld LTV883RF
  17 -> DViCO FusionHDTV 3 Gold-Q                           [18ac:d810]
- 18 -> Hauppauge Nova-T DVB-T                              [0070:9002]
+ 18 -> Hauppauge Nova-T DVB-T                              [0070:9002,0070:9001]
  19 -> Conexant DVB-T reference design                     [14f1:0187]
  20 -> Provideo PV259                                      [1540:2580]
  21 -> DViCO FusionHDTV DVB-T Plus                         [18ac:db10]
@@ -35,3 +35,11 @@
  34 -> ATI HDTV Wonder                                     [1002:a101]
  35 -> WinFast DTV1000-T                                   [107d:665f]
  36 -> AVerTV 303 (M126)                                   [1461:000a]
+ 37 -> Hauppauge Nova-S-Plus DVB-S                         [0070:9201,0070:9202]
+ 38 -> Hauppauge Nova-SE2 DVB-S                            [0070:9200]
+ 39 -> KWorld DVB-S 100                                    [17de:08b2]
+ 40 -> Hauppauge WinTV-HVR1100 DVB-T/Hybrid                [0070:9400,0070:9402]
+ 41 -> Hauppauge WinTV-HVR1100 DVB-T/Hybrid (Low Profile)  [0070:9800,0070:9802]
+ 42 -> digitalnow DNTV Live! DVB-T Pro                     [1822:0025]
+ 43 -> KWorld/VStream XPert DVB-T with cx22702             [17de:08a1]
+ 44 -> DViCO FusionHDTV DVB-T Dual Digital                 [18ac:db50]

Documentation/video4linux/CARDLIST.saa7134

View file

diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index efb708e..cb3a59b 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -56,7 +56,7 @@
  55 -> LifeView FlyDVB-T DUO                    [5168:0502,5168:0306]
  56 -> Avermedia AVerTV 307                     [1461:a70a]
  57 -> Avermedia AVerTV GO 007 FM               [1461:f31f]
- 58 -> ADS Tech Instant TV (saa7135)            [1421:0350,1421:0370,1421:1370]
+ 58 -> ADS Tech Instant TV (saa7135)            [1421:0350,1421:0351,1421:0370,1421:1370]
  59 -> Kworld/Tevion V-Stream Xpert TV PVR7134
  60 -> Typhoon DVB-T Duo Digital/Analog Cardbus [4e42:0502]
  61 -> Philips TOUGH DVB-T reference design     [1131:2004]
@@ -81,4 +81,5 @@
  80 -> ASUS Digimatrix TV                       [1043:0210]
  81 -> Philips Tiger reference design           [1131:2018]
  82 -> MSI TV@Anywhere plus                     [1462:6231]
-
+ 83 -> Terratec Cinergy 250 PCI TV              [153b:1160]
+ 84 -> LifeView FlyDVB Trio                     [5168:0319]

Documentation/video4linux/CARDLIST.tuner

View file

diff --git a/Documentation/video4linux/CARDLIST.tuner b/Documentation/video4linux/CARDLIST.tuner
index 9d6544e..0bf3d5b 100644
--- a/Documentation/video4linux/CARDLIST.tuner
+++ b/Documentation/video4linux/CARDLIST.tuner
@@ -40,7 +40,7 @@ tuner=38 - Philips PAL/SECAM multi (FM1216ME MK3)
 tuner=39 - LG NTSC (newer TAPC series)
 tuner=40 - HITACHI V7-J180AT
 tuner=41 - Philips PAL_MK (FI1216 MK)
-tuner=42 - Philips 1236D ATSC/NTSC daul in
+tuner=42 - Philips 1236D ATSC/NTSC dual in
 tuner=43 - Philips NTSC MK3 (FM1236MK3 or FM1236/F)
 tuner=44 - Philips 4 in 1 (ATI TV Wonder Pro/Conexant)
 tuner=45 - Microtune 4049 FM5
@@ -50,7 +50,7 @@ tuner=48 - Tenna TNF 8831 BGFF)
 tuner=49 - Microtune 4042 FI5 ATSC/NTSC dual in
 tuner=50 - TCL 2002N
 tuner=51 - Philips PAL/SECAM_D (FM 1256 I-H3)
-tuner=52 - Thomson DDT 7610 (ATSC/NTSC)
+tuner=52 - Thomson DTT 7610 (ATSC/NTSC)
 tuner=53 - Philips FQ1286
 tuner=54 - tda8290+75
 tuner=55 - TCL 2002MB
@@ -58,7 +58,7 @@ tuner=56 - Philips PAL/SECAM multi (FQ1216AME MK4)
 tuner=57 - Philips FQ1236A MK4
 tuner=58 - Ymec TVision TVF-8531MF/8831MF/8731MF
 tuner=59 - Ymec TVision TVF-5533MF
-tuner=60 - Thomson DDT 7611 (ATSC/NTSC)
+tuner=60 - Thomson DTT 761X (ATSC/NTSC)
 tuner=61 - Tena TNF9533-D/IF/TNF9533-B/DF
 tuner=62 - Philips TEA5767HN FM Radio
 tuner=63 - Philips FMD1216ME MK3 Hybrid Tuner

drivers/media/common/saa7146_fops.c

View file

diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index 09ec964..b614612 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -253,7 +253,10 @@ static int fops_open(struct inode *inode, struct file *file)
 
 	if( fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
 		DEB_S(("initializing vbi...\n"));
-		result = saa7146_vbi_uops.open(dev,file);
+		if (dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE)
+			result = saa7146_vbi_uops.open(dev,file);
+		if (dev->ext_vv_data->vbi_fops.open)
+			dev->ext_vv_data->vbi_fops.open(inode, file);
 	} else {
 		DEB_S(("initializing video...\n"));
 		result = saa7146_video_uops.open(dev,file);
@@ -289,7 +292,10 @@ static int fops_release(struct inode *inode, struct file *file)
 		return -ERESTARTSYS;
 
 	if( fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
-		saa7146_vbi_uops.release(dev,file);
+		if (dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE)
+			saa7146_vbi_uops.release(dev,file);
+		if (dev->ext_vv_data->vbi_fops.release)
+			dev->ext_vv_data->vbi_fops.release(inode, file);
 	} else {
 		saa7146_video_uops.release(dev,file);
 	}
@@ -332,6 +338,7 @@ static int fops_mmap(struct file *file, struct vm_area_struct * vma)
 		BUG();
 		return 0;
 	}
+
 	return videobuf_mmap_mapper(q,vma);
 }
 
@@ -381,7 +388,10 @@ static ssize_t fops_read(struct file *file, char __user *data, size_t count, lof
 		}
 	case V4L2_BUF_TYPE_VBI_CAPTURE: {
 //		DEB_EE(("V4L2_BUF_TYPE_VBI_CAPTURE: file:%p, data:%p, count:%lu\n", file, data, (unsigned long)count));
-		return saa7146_vbi_uops.read(file,data,count,ppos);
+		if (fh->dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE)
+			return saa7146_vbi_uops.read(file,data,count,ppos);
+		else
+			return -EINVAL;
 		}
 		break;
 	default:
@@ -390,12 +400,31 @@ static ssize_t fops_read(struct file *file, char __user *data, size_t count, lof
 	}
 }
 
+static ssize_t fops_write(struct file *file, const char __user *data, size_t count, loff_t *ppos)
+{
+	struct saa7146_fh *fh = file->private_data;
+
+	switch (fh->type) {
+	case V4L2_BUF_TYPE_VIDEO_CAPTURE:
+		return -EINVAL;
+	case V4L2_BUF_TYPE_VBI_CAPTURE:
+		if (fh->dev->ext_vv_data->vbi_fops.write)
+			return fh->dev->ext_vv_data->vbi_fops.write(file, data, count, ppos);
+		else
+			return -EINVAL;
+	default:
+		BUG();
+		return -EINVAL;
+	}
+}
+
 static struct file_operations video_fops =
 {
 	.owner		= THIS_MODULE,
 	.open		= fops_open,
 	.release	= fops_release,
 	.read		= fops_read,
+	.write		= fops_write,
 	.poll		= fops_poll,
 	.mmap		= fops_mmap,
 	.ioctl		= fops_ioctl,
@@ -467,7 +496,8 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv)
 	memset(vv->d_clipping.cpu_addr, 0x0, SAA7146_CLIPPING_MEM);
 
 	saa7146_video_uops.init(dev,vv);
-	saa7146_vbi_uops.init(dev,vv);
+	if (dev->ext_vv_data->capabilities & V4L2_CAP_VBI_CAPTURE)
+		saa7146_vbi_uops.init(dev,vv);
 
 	dev->vv_data = vv;
 	dev->vv_callback = &vv_callback;

drivers/media/common/saa7146_hlp.c

View file

diff --git a/drivers/media/common/saa7146_hlp.c b/drivers/media/common/saa7146_hlp.c
index ec52dff..33bec8a 100644
--- a/drivers/media/common/saa7146_hlp.c
+++ b/drivers/media/common/saa7146_hlp.c
@@ -562,19 +562,26 @@ static void saa7146_set_position(struct saa7146_dev *dev, int w_x, int w_y, int 
 
 	int b_depth = vv->ov_fmt->depth;
 	int b_bpl = vv->ov_fb.fmt.bytesperline;
-	u32 base = (u32)vv->ov_fb.base;
+	/* The unsigned long cast is to remove a 64-bit compile warning since
+	   it looks like a 64-bit address is cast to a 32-bit value, even
+	   though the base pointer is really a 32-bit physical address that
+	   goes into a 32-bit DMA register.
+	   FIXME: might not work on some 64-bit platforms, but see the FIXME
+	   in struct v4l2_framebuffer (videodev2.h) for that.
+	 */
+	u32 base = (u32)(unsigned long)vv->ov_fb.base;
 
 	struct	saa7146_video_dma vdma1;
 
 	/* calculate memory offsets for picture, look if we shall top-down-flip */
 	vdma1.pitch	= 2*b_bpl;
 	if ( 0 == vv->vflip ) {
-		vdma1.base_even = (u32)base + (w_y * (vdma1.pitch/2)) + (w_x * (b_depth / 8));
+		vdma1.base_even = base + (w_y * (vdma1.pitch/2)) + (w_x * (b_depth / 8));
 		vdma1.base_odd  = vdma1.base_even + (vdma1.pitch / 2);
 		vdma1.prot_addr = vdma1.base_even + (w_height * (vdma1.pitch / 2));
 	}
 	else {
-		vdma1.base_even = (u32)base + ((w_y+w_height) * (vdma1.pitch/2)) + (w_x * (b_depth / 8));
+		vdma1.base_even = base + ((w_y+w_height) * (vdma1.pitch/2)) + (w_x * (b_depth / 8));
 		vdma1.base_odd  = vdma1.base_even - (vdma1.pitch / 2);
 		vdma1.prot_addr = vdma1.base_odd - (w_height * (vdma1.pitch / 2));
 	}

drivers/media/common/saa7146_vbi.c

View file

diff --git a/drivers/media/common/saa7146_vbi.c b/drivers/media/common/saa7146_vbi.c
index 063986e..468d3c9 100644
--- a/drivers/media/common/saa7146_vbi.c
+++ b/drivers/media/common/saa7146_vbi.c
@@ -500,9 +500,9 @@ static ssize_t vbi_read(struct file *file, char __user *data, size_t count, loff
 }
 
 struct saa7146_use_ops saa7146_vbi_uops = {
-	.init 		= vbi_init,
-	.open 		= vbi_open,
+	.init		= vbi_init,
+	.open		= vbi_open,
 	.release	= vbi_close,
 	.irq_done	= vbi_irq_done,
-	.read 		= vbi_read,
+	.read		= vbi_read,
 };

drivers/media/common/saa7146_video.c

View file

diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index 1d96102..7ebac79 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -151,8 +151,8 @@ static int try_win(struct saa7146_dev *dev, struct v4l2_window *win)
 
 	if (V4L2_FIELD_ANY == field) {
 		field = (win->w.height > maxh/2)
-		        ? V4L2_FIELD_INTERLACED
-		        : V4L2_FIELD_TOP;
+			? V4L2_FIELD_INTERLACED
+			: V4L2_FIELD_TOP;
 		}
 	switch (field) {
 	case V4L2_FIELD_TOP:
@@ -1114,10 +1114,6 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int 
 		return 0;
 	}
 	case VIDIOC_OVERLAY:
-
-
-
-
 	{
 		int on = *(int *)arg;
 		int err = 0;
@@ -1359,7 +1355,6 @@ static void buffer_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
 	saa7146_buffer_queue(fh->dev,&vv->video_q,buf);
 }
 
-
 static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
 {
 	struct file *file = q->priv_data;

drivers/media/dvb/b2c2/flexcop-fe-tuner.c

View file

diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index 21a9045..0b940e1 100644
--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -298,7 +298,7 @@ static int flexcop_fe_request_firmware(struct dvb_frontend* fe, const struct fir
 }
 
 static int lgdt3303_pll_set(struct dvb_frontend* fe,
-		            struct dvb_frontend_parameters* params)
+			    struct dvb_frontend_parameters* params)
 {
 	struct flexcop_device *fc = fe->dvb->priv;
 	u8 buf[4];
@@ -485,12 +485,16 @@ static struct stv0297_config alps_tdee4_stv0297_config = {
 /* try to figure out the frontend, each card/box can have on of the following list */
 int flexcop_frontend_init(struct flexcop_device *fc)
 {
+	struct dvb_frontend_ops *ops;
+
 	/* try the sky v2.6 (stv0299/Samsung tbmu24112(sl1935)) */
 	if ((fc->fe = stv0299_attach(&samsung_tbmu24112_config, &fc->i2c_adap)) != NULL) {
-		fc->fe->ops->set_voltage = flexcop_set_voltage;
+		ops = fc->fe->ops;
+
+		ops->set_voltage = flexcop_set_voltage;
 
-		fc->fe_sleep             = fc->fe->ops->sleep;
-		fc->fe->ops->sleep       = flexcop_sleep;
+		fc->fe_sleep             = ops->sleep;
+		ops->sleep               = flexcop_sleep;
 
 		fc->dev_type          = FC_SKY;
 		info("found the stv0299 at i2c address: 0x%02x",samsung_tbmu24112_config.demod_address);
@@ -522,15 +526,17 @@ int flexcop_frontend_init(struct flexcop_device *fc)
 	} else
 	/* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */
 	if ((fc->fe = vp310_attach(&skystar23_samsung_tbdu18132_config, &fc->i2c_adap)) != NULL) {
-		fc->fe->ops->diseqc_send_master_cmd = flexcop_diseqc_send_master_cmd;
-		fc->fe->ops->diseqc_send_burst      = flexcop_diseqc_send_burst;
-		fc->fe->ops->set_tone               = flexcop_set_tone;
-		fc->fe->ops->set_voltage            = flexcop_set_voltage;
+		ops = fc->fe->ops;
+
+		ops->diseqc_send_master_cmd = flexcop_diseqc_send_master_cmd;
+		ops->diseqc_send_burst      = flexcop_diseqc_send_burst;
+		ops->set_tone               = flexcop_set_tone;
+		ops->set_voltage            = flexcop_set_voltage;
 
-		fc->fe_sleep                        = fc->fe->ops->sleep;
-		fc->fe->ops->sleep                  = flexcop_sleep;
+		fc->fe_sleep                = ops->sleep;
+		ops->sleep                  = flexcop_sleep;
 
-		fc->dev_type                        = FC_SKY_OLD;
+		fc->dev_type                = FC_SKY_OLD;
 		info("found the vp310 (aka mt312) at i2c address: 0x%02x",skystar23_samsung_tbdu18132_config.demod_address);
 	}
 
@@ -540,8 +546,9 @@ int flexcop_frontend_init(struct flexcop_device *fc)
 	} else {
 		if (dvb_register_frontend(&fc->dvb_adapter, fc->fe)) {
 			err("frontend registration failed!");
-			if (fc->fe->ops->release != NULL)
-				fc->fe->ops->release(fc->fe);
+			ops = fc->fe->ops;
+			if (ops->release != NULL)
+				ops->release(fc->fe);
 			fc->fe = NULL;
 			return -EINVAL;
 		}

drivers/media/dvb/b2c2/flexcop-reg.h

View file

diff --git a/drivers/media/dvb/b2c2/flexcop-reg.h b/drivers/media/dvb/b2c2/flexcop-reg.h
index 23cc643..3153f95 100644
--- a/drivers/media/dvb/b2c2/flexcop-reg.h
+++ b/drivers/media/dvb/b2c2/flexcop-reg.h
@@ -39,11 +39,13 @@ extern const char *flexcop_device_names[];
 /* FlexCop IBI Registers */
 #if defined(__LITTLE_ENDIAN)
 	#include "flexcop_ibi_value_le.h"
-#elif defined(__BIG_ENDIAN)
+#else
+#if defined(__BIG_ENDIAN)
 	#include "flexcop_ibi_value_be.h"
 #else
 	#error no endian defined
 #endif
+#endif
 
 #define fc_data_Tag_ID_DVB  0x3e
 #define fc_data_Tag_ID_ATSC 0x3f

drivers/media/dvb/bt8xx/dst.c

View file

diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index 8977c7a..3a2ff1c 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -1341,30 +1341,40 @@ static int dst_read_snr(struct dvb_frontend *fe, u16 *snr)
 	return 0;
 }
 
-static int dst_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)
+static int dst_set_frontend(struct dvb_frontend* fe,
+			    struct dvb_frontend_parameters* p,
+			    unsigned int mode_flags,
+			    int *delay,
+			    fe_status_t *status)
 {
 	struct dst_state *state = fe->demodulator_priv;
 
-	dst_set_freq(state, p->frequency);
-	dprintk(verbose, DST_DEBUG, 1, "Set Frequency=[%d]", p->frequency);
+	if (p != NULL) {
+		dst_set_freq(state, p->frequency);
+		dprintk(verbose, DST_DEBUG, 1, "Set Frequency=[%d]", p->frequency);
 
-	if (state->dst_type == DST_TYPE_IS_SAT) {
-		if (state->type_flags & DST_TYPE_HAS_OBS_REGS)
-			dst_set_inversion(state, p->inversion);
-		dst_set_fec(state, p->u.qpsk.fec_inner);
-		dst_set_symbolrate(state, p->u.qpsk.symbol_rate);
-		dst_set_polarization(state);
-		dprintk(verbose, DST_DEBUG, 1, "Set Symbolrate=[%d]", p->u.qpsk.symbol_rate);
-
-	} else if (state->dst_type == DST_TYPE_IS_TERR)
-		dst_set_bandwidth(state, p->u.ofdm.bandwidth);
-	else if (state->dst_type == DST_TYPE_IS_CABLE) {
-		dst_set_fec(state, p->u.qam.fec_inner);
-		dst_set_symbolrate(state, p->u.qam.symbol_rate);
-		dst_set_modulation(state, p->u.qam.modulation);
+		if (state->dst_type == DST_TYPE_IS_SAT) {
+			if (state->type_flags & DST_TYPE_HAS_OBS_REGS)
+				dst_set_inversion(state, p->inversion);
+			dst_set_fec(state, p->u.qpsk.fec_inner);
+			dst_set_symbolrate(state, p->u.qpsk.symbol_rate);
+			dst_set_polarization(state);
+			dprintk(verbose, DST_DEBUG, 1, "Set Symbolrate=[%d]", p->u.qpsk.symbol_rate);
+
+		} else if (state->dst_type == DST_TYPE_IS_TERR)
+			dst_set_bandwidth(state, p->u.ofdm.bandwidth);
+		else if (state->dst_type == DST_TYPE_IS_CABLE) {
+			dst_set_fec(state, p->u.qam.fec_inner);
+			dst_set_symbolrate(state, p->u.qam.symbol_rate);
+			dst_set_modulation(state, p->u.qam.modulation);
+		}
+		dst_write_tuna(fe);
 	}
-	dst_write_tuna(fe);
 
+	if (!(mode_flags & FE_TUNE_MODE_ONESHOT))
+		dst_read_status(fe, status);
+
+	*delay = HZ/10;
 	return 0;
 }
 
@@ -1445,7 +1455,7 @@ static struct dvb_frontend_ops dst_dvbt_ops = {
 
 	.release = dst_release,
 	.init = dst_init,
-	.set_frontend = dst_set_frontend,
+	.tune = dst_set_frontend,
 	.get_frontend = dst_get_frontend,
 	.read_status = dst_read_status,
 	.read_signal_strength = dst_read_signal_strength,
@@ -1469,7 +1479,7 @@ static struct dvb_frontend_ops dst_dvbs_ops = {
 
 	.release = dst_release,
 	.init = dst_init,
-	.set_frontend = dst_set_frontend,
+	.tune = dst_set_frontend,
 	.get_frontend = dst_get_frontend,
 	.read_status = dst_read_status,
 	.read_signal_strength = dst_read_signal_strength,
@@ -1496,7 +1506,7 @@ static struct dvb_frontend_ops dst_dvbc_ops = {
 
 	.release = dst_release,
 	.init = dst_init,
-	.set_frontend = dst_set_frontend,
+	.tune = dst_set_frontend,
 	.get_frontend = dst_get_frontend,
 	.read_status = dst_read_status,
 	.read_signal_strength = dst_read_signal_strength,

drivers/media/dvb/bt8xx/dst_ca.c

View file

diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c
index 2239651..c650b4b 100644
--- a/drivers/media/dvb/bt8xx/dst_ca.c
+++ b/drivers/media/dvb/bt8xx/dst_ca.c
@@ -283,16 +283,17 @@ static int handle_dst_tag(struct dst_state *state, struct ca_msg *p_ca_message, 
 		hw_buffer->msg[4] = 0x03;
 		hw_buffer->msg[5] = length & 0xff;
 		hw_buffer->msg[6] = 0x00;
+
 		/*
 		 *	Need to compute length for EN50221 section 8.3.2, for the time being
 		 *	assuming 8.3.2 is not applicable
 		 */
 		memcpy(&hw_buffer->msg[7], &p_ca_message->msg[4], length);
 	}
+
 	return 0;
 }
 
-
 static int write_to_8820(struct dst_state *state, struct ca_msg *hw_buffer, u8 length, u8 reply)
 {
 	if ((dst_put_ci(state, hw_buffer->msg, length, hw_buffer->msg, reply)) < 0) {

drivers/media/dvb/bt8xx/dvb-bt8xx.c

View file

diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index 77977e9..01b4e0a 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -600,7 +600,6 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
 	struct dst_state* state = NULL;
 
 	switch(type) {
-#ifdef BTTV_BOARD_DVICO_DVBT_LITE
 	case BTTV_BOARD_DVICO_DVBT_LITE:
 		card->fe = mt352_attach(&thomson_dtt7579_config, card->i2c_adapter);
 		if (card->fe != NULL) {
@@ -608,22 +607,15 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
 			card->fe->ops->info.frequency_max = 862000000;
 		}
 		break;
-#endif
 
-#ifdef BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE
 	case BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE:
 		lgdt330x_reset(card);
 		card->fe = lgdt330x_attach(&tdvs_tua6034_config, card->i2c_adapter);
 		if (card->fe != NULL)
 			dprintk ("dvb_bt8xx: lgdt330x detected\n");
 		break;
-#endif
 
-#ifdef BTTV_BOARD_TWINHAN_VP3021
-	case BTTV_BOARD_TWINHAN_VP3021:
-#else
 	case BTTV_BOARD_NEBULA_DIGITV:
-#endif
 		/*
 		 * It is possible to determine the correct frontend using the I2C bus (see the Nebula SDK);
 		 * this would be a cleaner solution than trying each frontend in turn.
@@ -812,9 +804,7 @@ static int dvb_bt8xx_probe(struct device *dev)
 		card->irq_err_ignore = 0;
 		break;
 
-#ifdef BTTV_BOARD_DVICO_DVBT_LITE
 	case BTTV_BOARD_DVICO_DVBT_LITE:
-#endif
 		card->gpio_mode = 0x0400C060;
 		card->op_sync_orin = 0;
 		card->irq_err_ignore = 0;
@@ -823,19 +813,13 @@ static int dvb_bt8xx_probe(struct device *dev)
 		 * DA_APP(parallel) */
 		break;
 
-#ifdef BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE
 	case BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE:
-#endif
 		card->gpio_mode = 0x0400c060;
 		card->op_sync_orin = BT878_RISC_SYNC_MASK;
 		card->irq_err_ignore = BT878_AFBUS | BT878_AFDSR;
 		break;
 
-#ifdef BTTV_BOARD_TWINHAN_VP3021