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

5ffd1a6a · Linus Torvalds <[email protected]> · 2006-09-30 09:39:15 -07:00

* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (180 commits)
  V4L/DVB (4641): Trivial: use lowercase letters in hex subsystem ids
  V4L/DVB (4639): Cx88: add autodetection for alternate revision of Leadtek PVR
  V4L/DVB (4638): Basic DVB-T and analog TV support for the HVR1300.
  V4L/DVB (4637): Add a default method for VIDIOC_G_PARM
  V4L/DVB (4635): Extend bttv and saa7134 to check for both AGP and PCI PCI failure case
  V4L/DVB (4634): Zr36120: implement pcipci checks
  V4L/DVB (4632): Zoran: Implement pcipci failure check
  V4L/DVB (4631): Av7110: remove V4L2_CAP_VBI_CAPTURE flag
  V4L/DVB (4630): Av7110: FW_LOADER depemdency fixed
  V4L/DVB (4629): Saa7134: add card support for Proteus Pro 2309
  V4L/DVB (4628): Fix VIDIOC_ENUMSTD ioctl in videodev.c
  V4L/DVB (4627): Vivi crashes with mplayer
  V4L/DVB (4626): On saa7111/7113, LUMA_CTRL need a different value
  V4L/DVB (4624): Tvaudio: Replaced kernel_thread() with kthread_run()
  V4L/DVB (4622): Copy-paste bug in videodev.c
  V4L/DVB (4620): Fix AGC configuration for MOD3000P-based boards
  V4L/DVB (4619): Fixes some I2C dependencies on V4L devices
  V4L/DVB (4617): Problem with dibusb-mb.c USB IDs
  V4L/DVB (4616): [PATCH] Nebula DigiTV USB RC support
  V4L/DVB (4614): Export symbol saa7134_tvaudio_setmute from saa7134 for saa7134-alsa
  ...

Commit: 5ffd1a6aaacc25be8cd0770a51ec6d46add3a276
Parents: 0cd43f83 · 8dd86eeb

Merge commit. Changes below are compared with the first parent: 0cd43f83.

Changes

197 files changed · +9023 −4211

File	Status	Add	Del	Content
Documentation/feature-removal-schedule.txt	modified	+1	−1	View file
Documentation/video4linux/CARDLIST.cx88	modified	+6	−2	View file
Documentation/video4linux/CARDLIST.saa7134	modified	+5	−2	View file
Documentation/video4linux/bttv/Insmod-options	modified	+6	−0	View file
Documentation/video4linux/cx2341x/README.hm12	added	+116	−0	View file
Documentation/video4linux/cx2341x/README.vbi	added	+45	−0	View file
drivers/media/common/Kconfig	modified	+0	−1	View file
drivers/media/common/ir-keymaps.c	modified	+79	−0	View file
drivers/media/common/saa7146_fops.c	modified	+0	−1	View file
drivers/media/dvb/b2c2/Kconfig	modified	+7	−7	View file
drivers/media/dvb/b2c2/flexcop-fe-tuner.c	modified	+12	−12	View file
drivers/media/dvb/bt8xx/Kconfig	modified	+7	−7	View file
drivers/media/dvb/bt8xx/dst.c	modified	+9	−0	View file
drivers/media/dvb/bt8xx/dst_ca.c	modified	+8	−3	View file
drivers/media/dvb/bt8xx/dst_common.h	modified	+2	−1	View file
drivers/media/dvb/bt8xx/dvb-bt8xx.c	modified	+18	−19	View file
drivers/media/dvb/dvb-core/Kconfig	modified	+13	−0	View file
drivers/media/dvb/dvb-core/dvb_frontend.c	modified	+33	−9	View file
drivers/media/dvb/dvb-core/dvb_frontend.h	modified	+6	−1	View file
drivers/media/dvb/dvb-core/dvbdev.h	modified	+22	−0	View file
drivers/media/dvb/dvb-usb/Kconfig	modified	+11	−6	View file
drivers/media/dvb/dvb-usb/a800.c	modified	+8	−0	View file
drivers/media/dvb/dvb-usb/cxusb.c	modified	+6	−5	View file
drivers/media/dvb/dvb-usb/dibusb-common.c	modified	+182	−18	View file
drivers/media/dvb/dvb-usb/dibusb-mb.c	modified	+9	−9	View file
drivers/media/dvb/dvb-usb/dibusb-mc.c	modified	+37	−4	View file
drivers/media/dvb/dvb-usb/dibusb.h	modified	+3	−0	View file
drivers/media/dvb/dvb-usb/digitv.c	modified	+78	−8	View file
drivers/media/dvb/dvb-usb/dtt200u.c	modified	+48	−2	View file
drivers/media/dvb/dvb-usb/dvb-usb-dvb.c	modified	+10	−10	View file
drivers/media/dvb/dvb-usb/dvb-usb-ids.h	modified	+70	−54	View file
drivers/media/dvb/dvb-usb/dvb-usb-remote.c	modified	+4	−1	View file
drivers/media/dvb/dvb-usb/nova-t-usb2.c	modified	+1	−1	View file
drivers/media/dvb/dvb-usb/umt-010.c	modified	+1	−1	View file
drivers/media/dvb/frontends/Kconfig	modified	+69	−2	View file
drivers/media/dvb/frontends/Makefile	modified	+6	−2	View file
drivers/media/dvb/frontends/bcm3510.h	modified	+9	−0	View file
drivers/media/dvb/frontends/cx22700.h	modified	+9	−0	View file
drivers/media/dvb/frontends/cx22702.c	modified	+3	−1	View file
drivers/media/dvb/frontends/cx22702.h	modified	+9	−0	View file
drivers/media/dvb/frontends/cx24110.c	modified	+9	−8	View file
drivers/media/dvb/frontends/cx24110.h	modified	+17	−2	View file
drivers/media/dvb/frontends/cx24123.c	modified	+56	−42	View file
drivers/media/dvb/frontends/cx24123.h	modified	+12	−0	View file
drivers/media/dvb/frontends/dib3000-common.c	deleted	+0	−83	View before deletion
drivers/media/dvb/frontends/dib3000-common.h	deleted	+0	−135	View before deletion
drivers/media/dvb/frontends/dib3000.h	modified	+9	−2	View file
drivers/media/dvb/frontends/dib3000mb.c	modified	+74	−2	View file
drivers/media/dvb/frontends/dib3000mb_priv.h	modified	+93	−0	View file
drivers/media/dvb/frontends/dib3000mc.c	modified	+720	−712	View file
drivers/media/dvb/frontends/dib3000mc.h	added	+58	−0	View file
drivers/media/dvb/frontends/dib3000mc_priv.h	deleted	+0	−428	View before deletion
drivers/media/dvb/frontends/dibx000_common.c	added	+152	−0	View file
drivers/media/dvb/frontends/dibx000_common.h	added	+166	−0	View file
drivers/media/dvb/frontends/dvb-pll.c	modified	+7	−4	View file
drivers/media/dvb/frontends/dvb-pll.h	modified	+2	−2	View file
drivers/media/dvb/frontends/isl6421.c	modified	+11	−19	View file
drivers/media/dvb/frontends/isl6421.h	modified	+10	−1	View file
drivers/media/dvb/frontends/l64781.h	modified	+9	−1	View file
drivers/media/dvb/frontends/lgdt330x.h	modified	+9	−0	View file
drivers/media/dvb/frontends/lnbp21.c	modified	+11	−19	View file
drivers/media/dvb/frontends/lnbp21.h	modified	+10	−2	View file
drivers/media/dvb/frontends/mt2060.c	added	+367	−0	View file
drivers/media/dvb/frontends/mt2060.h	added	+35	−0	View file
drivers/media/dvb/frontends/mt2060_priv.h	added	+105	−0	View file
drivers/media/dvb/frontends/mt312.h	modified	+9	−1	View file
drivers/media/dvb/frontends/mt352.c	modified	+8	−8	View file
drivers/media/dvb/frontends/mt352.h	modified	+15	−1	View file
drivers/media/dvb/frontends/nxt200x.h	modified	+9	−0	View file
drivers/media/dvb/frontends/nxt6000.h	modified	+9	−0	View file
drivers/media/dvb/frontends/or51132.h	modified	+9	−0	View file
drivers/media/dvb/frontends/or51211.h	modified	+9	−0	View file
drivers/media/dvb/frontends/s5h1420.h	modified	+9	−0	View file
drivers/media/dvb/frontends/sp8870.h	modified	+9	−0	View file
drivers/media/dvb/frontends/sp887x.h	modified	+9	−0	View file
drivers/media/dvb/frontends/stv0297.h	modified	+9	−0	View file
drivers/media/dvb/frontends/stv0299.c	modified	+6	−3	View file
drivers/media/dvb/frontends/stv0299.h	modified	+17	−2	View file
drivers/media/dvb/frontends/tda10021.c	modified	+33	−30	View file
drivers/media/dvb/frontends/tda10021.h	modified	+17	−2	View file
drivers/media/dvb/frontends/tda1004x.c	modified	+7	−3	View file
drivers/media/dvb/frontends/tda1004x.h	modified	+23	−2	View file
drivers/media/dvb/frontends/tda10086.c	added	+740	−0	View file
drivers/media/dvb/frontends/tda10086.h	added	+41	−0	View file
drivers/media/dvb/frontends/tda8083.h	modified	+9	−0	View file
drivers/media/dvb/frontends/tda826x.c	added	+173	−0	View file
drivers/media/dvb/frontends/tda826x.h	added	+40	−0	View file
drivers/media/dvb/frontends/tua6100.c	added	+205	−0	View file
drivers/media/dvb/frontends/tua6100.h	added	+47	−0	View file
drivers/media/dvb/frontends/ves1820.h	modified	+9	−0	View file
drivers/media/dvb/frontends/ves1x93.h	modified	+9	−0	View file
drivers/media/dvb/frontends/zl10353.c	modified	+8	−3	View file
drivers/media/dvb/frontends/zl10353.h	modified	+12	−2	View file
drivers/media/dvb/ttpci/Kconfig	modified	+30	−27	View file
drivers/media/dvb/ttpci/av7110.c	modified	+31	−27	View file
drivers/media/dvb/ttpci/av7110_av.c	modified	+0	−1	View file
drivers/media/dvb/ttpci/av7110_ca.c	modified	+0	−1	View file
drivers/media/dvb/ttpci/av7110_hw.c	modified	+0	−1	View file
drivers/media/dvb/ttpci/av7110_v4l.c	modified	+1	−2	View file
drivers/media/dvb/ttpci/budget-av.c	modified	+20	−164	View file
drivers/media/dvb/ttpci/budget-ci.c	modified	+16	−16	View file
drivers/media/dvb/ttpci/budget-patch.c	modified	+9	−8	View file
drivers/media/dvb/ttpci/budget.c	modified	+41	−12	View file
drivers/media/dvb/ttusb-budget/Kconfig	modified	+7	−7	View file
drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c	modified	+15	−13	View file
drivers/media/dvb/ttusb-dec/ttusb_dec.c	modified	+5	−1	View file
drivers/media/radio/Kconfig	modified	+15	−15	View file
drivers/media/radio/dsbr100.c	modified	+127	−71	View file
drivers/media/radio/radio-aimslab.c	modified	+107	−44	View file
drivers/media/radio/radio-aztech.c	modified	+114	−52	View file
drivers/media/radio/radio-cadet.c	modified	+136	−114	View file
drivers/media/radio/radio-gemtek-pci.c	modified	+110	−60	View file
drivers/media/radio/radio-gemtek.c	modified	+116	−49	View file
drivers/media/radio/radio-maestro.c	modified	+130	−67	View file
drivers/media/radio/radio-maxiradio.c	modified	+103	−63	View file
drivers/media/radio/radio-rtrack2.c	modified	+115	−48	View file
drivers/media/radio/radio-sf16fmi.c	modified	+101	−57	View file
drivers/media/radio/radio-sf16fmr2.c	modified	+140	−83	View file
drivers/media/radio/radio-terratec.c	modified	+110	−44	View file
drivers/media/radio/radio-trust.c	modified	+131	−57	View file
drivers/media/radio/radio-typhoon.c	modified	+116	−55	View file
drivers/media/radio/radio-zoltrix.c	modified	+124	−59	View file
drivers/media/video/Kconfig	modified	+352	−124	View file
drivers/media/video/Makefile	modified	+30	−15	View file
drivers/media/video/bt866.c	modified	+1	−1	View file
drivers/media/video/bt8xx/Kconfig	modified	+4	−1	View file
drivers/media/video/bt8xx/bttv-cards.c	modified	+1	−1	View file
drivers/media/video/bt8xx/bttv-driver.c	modified	+12	−0	View file
drivers/media/video/bt8xx/bttv-i2c.c	modified	+16	−0	View file
drivers/media/video/compat_ioctl32.c	modified	+33	−26	View file
drivers/media/video/cx2341x.c	modified	+22	−3	View file
drivers/media/video/cx25840/Kconfig	modified	+1	−1	View file
drivers/media/video/cx25840/cx25840-vbi.c	modified	+4	−0	View file
drivers/media/video/cx88/Kconfig	modified	+12	−97	View file
drivers/media/video/cx88/Makefile	modified	+0	−7	View file
drivers/media/video/cx88/cx88-blackbird.c	modified	+2	−0	View file
drivers/media/video/cx88/cx88-cards.c	modified	+157	−4	View file
drivers/media/video/cx88/cx88-core.c	modified	+12	−1	View file
drivers/media/video/cx88/cx88-dvb.c	modified	+154	−176	View file
drivers/media/video/cx88/cx88-i2c.c	modified	+13	−0	View file
drivers/media/video/cx88/cx88-input.c	modified	+18	−1	View file
drivers/media/video/cx88/cx88-tvaudio.c	modified	+0	−5	View file
drivers/media/video/cx88/cx88-video.c	modified	+6	−1	View file
drivers/media/video/cx88/cx88.h	modified	+5	−0	View file
drivers/media/video/em28xx/Kconfig	modified	+2	−1	View file
drivers/media/video/em28xx/em28xx-video.c	modified	+1	−1	View file
drivers/media/video/ks0127.c	modified	+1	−2	View file
drivers/media/video/pvrusb2/Kconfig	modified	+16	−2	View file
drivers/media/video/pvrusb2/Makefile	modified	+1	−5	View file
drivers/media/video/pvrusb2/pvrusb2-ctrl.c	modified	+15	−6	View file
drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c	modified	+1	−1	View file
drivers/media/video/pvrusb2/pvrusb2-encoder.c	modified	+2	−2	View file
drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h	modified	+2	−29	View file
drivers/media/video/pvrusb2/pvrusb2-hdw.c	modified	+64	−20	View file
drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c	modified	+0	−4	View file
drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c	modified	+1	−1	View file
drivers/media/video/pvrusb2/pvrusb2-i2c-core.c	modified	+0	−6	View file
drivers/media/video/pvrusb2/pvrusb2-main.c	modified	+0	−1	View file
drivers/media/video/pvrusb2/pvrusb2-sysfs.c	modified	+0	−3	View file
drivers/media/video/pvrusb2/pvrusb2-v4l2.c	modified	+19	−17	View file
drivers/media/video/saa5246a.c	modified	+0	−1	View file
drivers/media/video/saa5249.c	modified	+0	−1	View file
drivers/media/video/saa7115.c	modified	+702	−548	View file
drivers/media/video/saa711x_regs.h	added	+549	−0	View file
drivers/media/video/saa7134/Kconfig	modified	+6	−44	View file
drivers/media/video/saa7134/Makefile	modified	+0	−3	View file
drivers/media/video/saa7134/saa7134-alsa.c	modified	+8	−0	View file
drivers/media/video/saa7134/saa7134-cards.c	modified	+125	−2	View file
drivers/media/video/saa7134/saa7134-core.c	modified	+1	−1	View file
drivers/media/video/saa7134/saa7134-dvb.c	modified	+134	−63	View file
drivers/media/video/saa7134/saa7134-input.c	modified	+6	−0	View file
drivers/media/video/saa7134/saa7134-tvaudio.c	modified	+1	−0	View file
drivers/media/video/saa7134/saa7134.h	modified	+3	−0	View file
drivers/media/video/tda9887.c	modified	+2	−0	View file
drivers/media/video/tuner-simple.c	modified	+3	−3	View file
drivers/media/video/tuner-types.c	modified	+1	−0	View file
drivers/media/video/tvaudio.c	modified	+16	−26	View file
drivers/media/video/tveeprom.c	modified	+2	−0	View file
drivers/media/video/tvp5150.c	modified	+6	−1	View file
drivers/media/video/usbvideo/konicawc.c	modified	+8	−1	View file
drivers/media/video/usbvideo/vicam.c	modified	+4	−0	View file
drivers/media/video/v4l1-compat.c	modified	+9	−3	View file
drivers/media/video/v4l2-common.c	modified	+1	−0	View file
drivers/media/video/video-buf-dvb.c	modified	+2	−0	View file
drivers/media/video/videodev.c	modified	+26	−6	View file
drivers/media/video/vino.c	modified	+0	−1	View file
drivers/media/video/vivi.c	modified	+4	−1	View file
drivers/media/video/vpx3220.c	modified	+1	−1	View file
drivers/media/video/zoran_card.c	modified	+3	−3	View file
drivers/media/video/zoran_driver.c	modified	+7	−0	View file
drivers/media/video/zr36120.c	modified	+5	−1	View file
include/linux/videodev2.h	modified	+3	−2	View file
include/media/ir-common.h	modified	+2	−0	View file
include/media/tuner-types.h	modified	+3	−0	View file
include/media/tuner.h	modified	+1	−0	View file
include/media/v4l2-common.h	modified	+12	−4	View file
include/media/v4l2-dev.h	modified	+7	−3	View file

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

Documentation/feature-removal-schedule.txt

View file

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 4ab4c42..9364f47 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -47,7 +47,7 @@ Who:	Jody McIntyre <[email protected]>
 ---------------------------
 
 What:	Video4Linux API 1 ioctls and video_decoder.h from Video devices.
-When:	July 2006
+When:	December 2006
 Why:	V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6
 	series. The old API have lots of drawbacks and don't provide enough
 	means to work with all video and audio standards. The newer API is

Documentation/video4linux/CARDLIST.cx88

View file

diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88
index 00d9a1f..669a09a 100644
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/Documentation/video4linux/CARDLIST.cx88
@@ -7,10 +7,10 @@
   6 -> AverTV Studio 303 (M126)                            [1461:000b]
   7 -> MSI TV-@nywhere Master                              [1462:8606]
   8 -> Leadtek Winfast DV2000                              [107d:6620]
-  9 -> Leadtek PVR 2000                                    [107d:663b,107d:663C]
+  9 -> Leadtek PVR 2000                                    [107d:663b,107d:663c,107d:6632]
  10 -> IODATA GV-VCP3/PCI                                  [10fc:d003]
  11 -> Prolink PlayTV PVR
- 12 -> ASUS PVR-416                                        [1043:4823]
+ 12 -> ASUS PVR-416                                        [1043:4823,1461:c111]
  13 -> MSI TV-@nywhere
  14 -> KWorld/VStream XPert DVB-T                          [17de:08a6]
  15 -> DViCO FusionHDTV DVB-T1                             [18ac:db00]
@@ -51,3 +51,7 @@
  50 -> NPG Tech Real TV FM Top 10                          [14f1:0842]
  51 -> WinFast DTV2000 H                                   [107d:665e]
  52 -> Geniatech DVB-S                                     [14f1:0084]
+ 53 -> Hauppauge WinTV-HVR3000 TriMode Analog/DVB-S/DVB-T  [0070:1404]
+ 54 -> Norwood Micro TV Tuner
+ 55 -> Shenzhen Tungsten Ages Tech TE-DTV-250 / Swann OEM  [c180:c980]
+ 56 -> Hauppauge WinTV-HVR1300 DVB-T/Hybrid MPEG Encoder   [0070:9600,0070:9601,0070:9602]

Documentation/video4linux/CARDLIST.saa7134

View file

diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index 9068b66..94cf695 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -58,7 +58,7 @@
  57 -> Avermedia AVerTV GO 007 FM               [1461:f31f]
  58 -> ADS Tech Instant TV (saa7135)            [1421:0350,1421:0351,1421:0370,1421:1370]
  59 -> Kworld/Tevion V-Stream Xpert TV PVR7134
- 60 -> LifeView/Typhoon FlyDVB-T Duo Cardbus    [5168:0502,4e42:0502]
+ 60 -> LifeView/Typhoon/Genius FlyDVB-T Duo Cardbus [5168:0502,4e42:0502,1489:0502]
  61 -> Philips TOUGH DVB-T reference design     [1131:2004]
  62 -> Compro VideoMate TV Gold+II
  63 -> Kworld Xpert TV PVR7134
@@ -83,7 +83,7 @@
  82 -> MSI TV@Anywhere plus                     [1462:6231]
  83 -> Terratec Cinergy 250 PCI TV              [153b:1160]
  84 -> LifeView FlyDVB Trio                     [5168:0319]
- 85 -> AverTV DVB-T 777                         [1461:2c05]
+ 85 -> AverTV DVB-T 777                         [1461:2c05,1461:2c05]
  86 -> LifeView FlyDVB-T / Genius VideoWonder DVB-T [5168:0301,1489:0301]
  87 -> ADS Instant TV Duo Cardbus PTV331        [0331:1421]
  88 -> Tevion/KWorld DVB-T 220RF                [17de:7201]
@@ -94,3 +94,6 @@
  93 -> Medion 7134 Bridge #2                    [16be:0005]
  94 -> LifeView FlyDVB-T Hybrid Cardbus         [5168:3306,5168:3502]
  95 -> LifeView FlyVIDEO3000 (NTSC)             [5169:0138]
+ 96 -> Medion Md8800 Quadro                     [16be:0007,16be:0008]
+ 97 -> LifeView FlyDVB-S /Acorp TV134DS         [5168:0300,4e42:0300]
+ 98 -> Proteus Pro 2309                         [0919:2003]

Documentation/video4linux/bttv/Insmod-options

View file

diff --git a/Documentation/video4linux/bttv/Insmod-options b/Documentation/video4linux/bttv/Insmod-options
index fc94ff2..bb7c2ca 100644
--- a/Documentation/video4linux/bttv/Insmod-options
+++ b/Documentation/video4linux/bttv/Insmod-options
@@ -54,6 +54,12 @@ bttv.o
 				dropouts.
 		chroma_agc=0/1	AGC of chroma signal, off by default.
 		adc_crush=0/1	Luminance ADC crush, on by default.
+		i2c_udelay=     Allow reduce I2C speed. Default is 5 usecs
+				(meaning 66,67 Kbps). The default is the
+				maximum supported speed by kernel bitbang
+				algoritm. You may use lower numbers, if I2C
+				messages are lost (16 is known to work on
+				all supported cards).
 
 		bttv_gpio=0/1
 		gpiomask=

Documentation/video4linux/cx2341x/README.hm12

View file

diff --git a/Documentation/video4linux/cx2341x/README.hm12 b/Documentation/video4linux/cx2341x/README.hm12
new file mode 100644
index 0000000..0e213ed
--- /dev/null
+++ b/Documentation/video4linux/cx2341x/README.hm12
@@ -0,0 +1,116 @@
+The cx23416 can produce (and the cx23415 can also read) raw YUV output. The
+format of a YUV frame is specific to this chip and is called HM12. 'HM' stands
+for 'Hauppauge Macroblock', which is a misnomer as 'Conexant Macroblock' would
+be more accurate.
+
+The format is YUV 4:2:0 which uses 1 Y byte per pixel and 1 U and V byte per
+four pixels.
+
+The data is encoded as two macroblock planes, the first containing the Y
+values, the second containing UV macroblocks.
+
+The Y plane is divided into blocks of 16x16 pixels from left to right
+and from top to bottom. Each block is transmitted in turn, line-by-line.
+
+So the first 16 bytes are the first line of the top-left block, the
+second 16 bytes are the second line of the top-left block, etc. After
+transmitting this block the first line of the block on the right to the
+first block is transmitted, etc.
+
+The UV plane is divided into blocks of 16x8 UV values going from left
+to right, top to bottom. Each block is transmitted in turn, line-by-line.
+
+So the first 16 bytes are the first line of the top-left block and
+contain 8 UV value pairs (16 bytes in total). The second 16 bytes are the
+second line of 8 UV pairs of the top-left block, etc. After transmitting
+this block the first line of the block on the right to the first block is
+transmitted, etc.
+
+The code below is given as an example on how to convert HM12 to separate
+Y, U and V planes. This code assumes frames of 720x576 (PAL) pixels.
+
+The width of a frame is always 720 pixels, regardless of the actual specified
+width.
+
+--------------------------------------------------------------------------
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static unsigned char frame[576*720*3/2];
+static unsigned char framey[576*720];
+static unsigned char frameu[576*720 / 4];
+static unsigned char framev[576*720 / 4];
+
+static void de_macro_y(unsigned char* dst, unsigned char *src, int dstride, int w, int h)
+{
+    unsigned int y, x, i;
+
+    // descramble Y plane
+    // dstride = 720 = w
+    // The Y plane is divided into blocks of 16x16 pixels
+    // Each block in transmitted in turn, line-by-line.
+    for (y = 0; y < h; y += 16) {
+	for (x = 0; x < w; x += 16) {
+	    for (i = 0; i < 16; i++) {
+		memcpy(dst + x + (y + i) * dstride, src, 16);
+		src += 16;
+	    }
+	}
+    }
+}
+
+static void de_macro_uv(unsigned char *dstu, unsigned char *dstv, unsigned char *src, int dstride, int w, int h)
+{
+    unsigned int y, x, i;
+
+    // descramble U/V plane
+    // dstride = 720 / 2 = w
+    // The U/V values are interlaced (UVUV...).
+    // Again, the UV plane is divided into blocks of 16x16 UV values.
+    // Each block in transmitted in turn, line-by-line.
+    for (y = 0; y < h; y += 16) {
+	for (x = 0; x < w; x += 8) {
+	    for (i = 0; i < 16; i++) {
+		int idx = x + (y + i) * dstride;
+
+		dstu[idx+0] = src[0];  dstv[idx+0] = src[1];
+		dstu[idx+1] = src[2];  dstv[idx+1] = src[3];
+		dstu[idx+2] = src[4];  dstv[idx+2] = src[5];
+		dstu[idx+3] = src[6];  dstv[idx+3] = src[7];
+		dstu[idx+4] = src[8];  dstv[idx+4] = src[9];
+		dstu[idx+5] = src[10]; dstv[idx+5] = src[11];
+		dstu[idx+6] = src[12]; dstv[idx+6] = src[13];
+		dstu[idx+7] = src[14]; dstv[idx+7] = src[15];
+		src += 16;
+	    }
+	}
+    }
+}
+
+/*************************************************************************/
+int main(int argc, char **argv)
+{
+    FILE *fin;
+    int i;
+
+    if (argc == 1) fin = stdin;
+    else fin = fopen(argv[1], "r");
+
+    if (fin == NULL) {
+	fprintf(stderr, "cannot open input\n");
+	exit(-1);
+    }
+    while (fread(frame, sizeof(frame), 1, fin) == 1) {
+	de_macro_y(framey, frame, 720, 720, 576);
+	de_macro_uv(frameu, framev, frame + 720 * 576, 720 / 2, 720 / 2, 576 / 2);
+	fwrite(framey, sizeof(framey), 1, stdout);
+	fwrite(framev, sizeof(framev), 1, stdout);
+	fwrite(frameu, sizeof(frameu), 1, stdout);
+    }
+    fclose(fin);
+    return 0;
+}
+
+--------------------------------------------------------------------------

Documentation/video4linux/cx2341x/README.vbi

View file

diff --git a/Documentation/video4linux/cx2341x/README.vbi b/Documentation/video4linux/cx2341x/README.vbi
new file mode 100644
index 0000000..5807cf1
--- /dev/null
+++ b/Documentation/video4linux/cx2341x/README.vbi
@@ -0,0 +1,45 @@
+
+Format of embedded V4L2_MPEG_STREAM_VBI_FMT_IVTV VBI data
+=========================================================
+
+This document describes the V4L2_MPEG_STREAM_VBI_FMT_IVTV format of the VBI data
+embedded in an MPEG-2 program stream. This format is in part dictated by some
+hardware limitations of the ivtv driver (the driver for the Conexant cx23415/6
+chips), in particular a maximum size for the VBI data. Anything longer is cut
+off when the MPEG stream is played back through the cx23415.
+
+The advantage of this format is it is very compact and that all VBI data for
+all lines can be stored while still fitting within the maximum allowed size.
+
+The stream ID of the VBI data is 0xBD. The maximum size of the embedded data is
+4 + 43 * 36, which is 4 bytes for a header and 2 * 18 VBI lines with a 1 byte
+header and a 42 bytes payload each. Anything beyond this limit is cut off by
+the cx23415/6 firmware. Besides the data for the VBI lines we also need 36 bits
+for a bitmask determining which lines are captured and 4 bytes for a magic cookie,
+signifying that this data package contains V4L2_MPEG_STREAM_VBI_FMT_IVTV VBI data.
+If all lines are used, then there is no longer room for the bitmask. To solve this
+two different magic numbers were introduced:
+
+'itv0': After this magic number two unsigned longs follow. Bits 0-17 of the first
+unsigned long denote which lines of the first field are captured. Bits 18-31 of
+the first unsigned long and bits 0-3 of the second unsigned long are used for the
+second field.
+
+'ITV0': This magic number assumes all VBI lines are captured, i.e. it implicitly
+implies that the bitmasks are 0xffffffff and 0xf.
+
+After these magic cookies (and the 8 byte bitmask in case of cookie 'itv0') the
+captured VBI lines start:
+
+For each line the least significant 4 bits of the first byte contain the data type.
+Possible values are shown in the table below. The payload is in the following 42
+bytes.
+
+Here is the list of possible data types:
+
+#define IVTV_SLICED_TYPE_TELETEXT       0x1     // Teletext (uses lines 6-22 for PAL)
+#define IVTV_SLICED_TYPE_CC             0x4     // Closed Captions (line 21 NTSC)
+#define IVTV_SLICED_TYPE_WSS            0x5     // Wide Screen Signal (line 23 PAL)
+#define IVTV_SLICED_TYPE_VPS            0x7     // Video Programming System (PAL) (line 16)
+
+Hans Verkuil <[email protected]>

drivers/media/common/Kconfig

View file

diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig
index 1a04db4..f33e5d9 100644
--- a/drivers/media/common/Kconfig
+++ b/drivers/media/common/Kconfig
@@ -4,7 +4,6 @@ config VIDEO_SAA7146
 
 config VIDEO_SAA7146_VV
 	tristate
-	select VIDEO_V4L2
 	select VIDEO_BUF
 	select VIDEO_VIDEOBUF
 	select VIDEO_SAA7146

drivers/media/common/ir-keymaps.c

View file

diff --git a/drivers/media/common/ir-keymaps.c b/drivers/media/common/ir-keymaps.c
index ca98d94..db75344 100644
--- a/drivers/media/common/ir-keymaps.c
+++ b/drivers/media/common/ir-keymaps.c
@@ -32,6 +32,37 @@ IR_KEYTAB_TYPE ir_codes_empty[IR_KEYTAB_SIZE] = {
 
 EXPORT_SYMBOL_GPL(ir_codes_empty);
 
+/* Michal Majchrowicz <[email protected]> */
+IR_KEYTAB_TYPE ir_codes_proteus_2309[IR_KEYTAB_SIZE] = {
+	/* numeric */
+	[ 0x00 ] = KEY_0,
+	[ 0x01 ] = KEY_1,
+	[ 0x02 ] = KEY_2,
+	[ 0x03 ] = KEY_3,
+	[ 0x04 ] = KEY_4,
+	[ 0x05 ] = KEY_5,
+	[ 0x06 ] = KEY_6,
+	[ 0x07 ] = KEY_7,
+	[ 0x08 ] = KEY_8,
+	[ 0x09 ] = KEY_9,
+
+	[ 0x5c ] = KEY_POWER,     /* power       */
+	[ 0x20 ] = KEY_F,         /* full screen */
+	[ 0x0f ] = KEY_BACKSPACE, /* recall      */
+	[ 0x1b ] = KEY_ENTER,     /* mute        */
+	[ 0x41 ] = KEY_RECORD,    /* record      */
+	[ 0x43 ] = KEY_STOP,      /* stop        */
+	[ 0x16 ] = KEY_S,
+	[ 0x1a ] = KEY_Q,         /* off         */
+	[ 0x2e ] = KEY_RED,
+	[ 0x1f ] = KEY_DOWN,      /* channel -   */
+	[ 0x1c ] = KEY_UP,        /* channel +   */
+	[ 0x10 ] = KEY_LEFT,      /* volume -    */
+	[ 0x1e ] = KEY_RIGHT,     /* volume +    */
+	[ 0x14 ] = KEY_F1,
+};
+
+EXPORT_SYMBOL_GPL(ir_codes_proteus_2309);
 /* Matt Jesson <[email protected] */
 IR_KEYTAB_TYPE ir_codes_avermedia_dvbt[IR_KEYTAB_SIZE] = {
 	[ 0x28 ] = KEY_0,         //'0' / 'enter'
@@ -1473,3 +1504,51 @@ IR_KEYTAB_TYPE ir_codes_npgtech[IR_KEYTAB_SIZE] = {
 };
 
 EXPORT_SYMBOL_GPL(ir_codes_npgtech);
+
+/* Norwood Micro (non-Pro) TV Tuner
+   By Peter Naulls <[email protected]>
+   Key comments are the functions given in the manual */
+IR_KEYTAB_TYPE ir_codes_norwood[IR_KEYTAB_SIZE] = {
+	/* Keys 0 to 9 */
+	[ 0x20 ] = KEY_0,
+	[ 0x21 ] = KEY_1,
+	[ 0x22 ] = KEY_2,
+	[ 0x23 ] = KEY_3,
+	[ 0x24 ] = KEY_4,
+	[ 0x25 ] = KEY_5,
+	[ 0x26 ] = KEY_6,
+	[ 0x27 ] = KEY_7,
+	[ 0x28 ] = KEY_8,
+	[ 0x29 ] = KEY_9,
+
+	[ 0x78 ] = KEY_TUNER,             /* Video Source        */
+	[ 0x2c ] = KEY_EXIT,              /* Open/Close software */
+	[ 0x2a ] = KEY_SELECT,            /* 2 Digit Select      */
+	[ 0x69 ] = KEY_AGAIN,             /* Recall              */
+
+	[ 0x32 ] = KEY_BRIGHTNESSUP,      /* Brightness increase */
+	[ 0x33 ] = KEY_BRIGHTNESSDOWN,    /* Brightness decrease */
+	[ 0x6b ] = KEY_KPPLUS,            /* (not named >>>>>)   */
+	[ 0x6c ] = KEY_KPMINUS,           /* (not named <<<<<)   */
+
+	[ 0x2d ] = KEY_MUTE,              /* Mute                */
+	[ 0x30 ] = KEY_VOLUMEUP,          /* Volume up           */
+	[ 0x31 ] = KEY_VOLUMEDOWN,        /* Volume down         */
+	[ 0x60 ] = KEY_CHANNELUP,         /* Channel up          */
+	[ 0x61 ] = KEY_CHANNELDOWN,       /* Channel down        */
+
+	[ 0x3f ] = KEY_RECORD,            /* Record              */
+	[ 0x37 ] = KEY_PLAY,              /* Play                */
+	[ 0x36 ] = KEY_PAUSE,             /* Pause               */
+	[ 0x2b ] = KEY_STOP,              /* Stop                */
+	[ 0x67 ] = KEY_FASTFORWARD,       /* Foward              */
+	[ 0x66 ] = KEY_REWIND,            /* Rewind              */
+	[ 0x3e ] = KEY_SEARCH,            /* Auto Scan           */
+	[ 0x2e ] = KEY_CAMERA,            /* Capture Video       */
+	[ 0x6d ] = KEY_MENU,              /* Show/Hide Control   */
+	[ 0x2f ] = KEY_ZOOM,              /* Full Screen         */
+	[ 0x34 ] = KEY_RADIO,             /* FM                  */
+	[ 0x65 ] = KEY_POWER,             /* Computer power      */
+};
+
+EXPORT_SYMBOL_GPL(ir_codes_norwood);

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 0027acc..d867a6a 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -455,7 +455,6 @@ static void vv_callback(struct saa7146_dev *dev, unsigned long status)
 
 static struct video_device device_template =
 {
-	.hardware	= VID_HARDWARE_SAA7146,
 	.fops		= &video_fops,
 	.minor		= -1,
 };

drivers/media/dvb/b2c2/Kconfig

View file

diff --git a/drivers/media/dvb/b2c2/Kconfig b/drivers/media/dvb/b2c2/Kconfig
index 49a06fc..a0dcd59 100644
--- a/drivers/media/dvb/b2c2/Kconfig
+++ b/drivers/media/dvb/b2c2/Kconfig
@@ -2,13 +2,13 @@ config DVB_B2C2_FLEXCOP
 	tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters"
 	depends on DVB_CORE && I2C
 	select DVB_PLL
-	select DVB_STV0299
-	select DVB_MT352
-	select DVB_MT312
-	select DVB_NXT200X
-	select DVB_STV0297
-	select DVB_BCM3510
-	select DVB_LGDT330X
+	select DVB_STV0299 if !DVB_FE_CUSTOMISE
+	select DVB_MT352 if !DVB_FE_CUSTOMISE
+	select DVB_MT312 if !DVB_FE_CUSTOMISE
+	select DVB_NXT200X if !DVB_FE_CUSTOMISE
+	select DVB_STV0297 if !DVB_FE_CUSTOMISE
+	select DVB_BCM3510 if !DVB_FE_CUSTOMISE
+	select DVB_LGDT330X if !DVB_FE_CUSTOMISE
 	help
 	  Support for the digital TV receiver chip made by B2C2 Inc. included in
 	  Technisats PCI cards and USB boxes.

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 3be87c7..b8ba878 100644
--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -505,7 +505,7 @@ 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) {
+	if ((fc->fe = dvb_attach(stv0299_attach, &samsung_tbmu24112_config, &fc->i2c_adap)) != NULL) {
 		ops = &fc->fe->ops;
 
 		ops->tuner_ops.set_params = samsung_tbmu24112_tuner_set_params;
@@ -519,36 +519,36 @@ int flexcop_frontend_init(struct flexcop_device *fc)
 		info("found the stv0299 at i2c address: 0x%02x",samsung_tbmu24112_config.demod_address);
 	} else
 	/* try the air dvb-t (mt352/Samsung tdtc9251dh0(??)) */
-	if ((fc->fe = mt352_attach(&samsung_tdtc9251dh0_config, &fc->i2c_adap)) != NULL ) {
+	if ((fc->fe = dvb_attach(mt352_attach, &samsung_tdtc9251dh0_config, &fc->i2c_adap)) != NULL ) {
 		fc->dev_type          = FC_AIR_DVB;
 		fc->fe->ops.tuner_ops.calc_regs = samsung_tdtc9251dh0_calc_regs;
 		info("found the mt352 at i2c address: 0x%02x",samsung_tdtc9251dh0_config.demod_address);
 	} else
 	/* try the air atsc 2nd generation (nxt2002) */
-	if ((fc->fe = nxt200x_attach(&samsung_tbmv_config, &fc->i2c_adap)) != NULL) {
+	if ((fc->fe = dvb_attach(nxt200x_attach, &samsung_tbmv_config, &fc->i2c_adap)) != NULL) {
 		fc->dev_type          = FC_AIR_ATSC2;
-		dvb_pll_attach(fc->fe, 0x61, &fc->i2c_adap, &dvb_pll_samsung_tbmv);
+		dvb_attach(dvb_pll_attach, fc->fe, 0x61, NULL, &dvb_pll_samsung_tbmv);
 		info("found the nxt2002 at i2c address: 0x%02x",samsung_tbmv_config.demod_address);
 	} else
 	/* try the air atsc 3nd generation (lgdt3303) */
-	if ((fc->fe = lgdt330x_attach(&air2pc_atsc_hd5000_config, &fc->i2c_adap)) != NULL) {
+	if ((fc->fe = dvb_attach(lgdt330x_attach, &air2pc_atsc_hd5000_config, &fc->i2c_adap)) != NULL) {
 		fc->dev_type          = FC_AIR_ATSC3;
 		fc->fe->ops.tuner_ops.set_params = lgdt3303_tuner_set_params;
 		info("found the lgdt3303 at i2c address: 0x%02x",air2pc_atsc_hd5000_config.demod_address);
 	} else
 	/* try the air atsc 1nd generation (bcm3510)/panasonic ct10s */
-	if ((fc->fe = bcm3510_attach(&air2pc_atsc_first_gen_config, &fc->i2c_adap)) != NULL) {
+	if ((fc->fe = dvb_attach(bcm3510_attach, &air2pc_atsc_first_gen_config, &fc->i2c_adap)) != NULL) {
 		fc->dev_type          = FC_AIR_ATSC1;
 		info("found the bcm3510 at i2c address: 0x%02x",air2pc_atsc_first_gen_config.demod_address);
 	} else
 	/* try the cable dvb (stv0297) */
-	if ((fc->fe = stv0297_attach(&alps_tdee4_stv0297_config, &fc->i2c_adap)) != NULL) {
+	if ((fc->fe = dvb_attach(stv0297_attach, &alps_tdee4_stv0297_config, &fc->i2c_adap)) != NULL) {
 		fc->dev_type                        = FC_CABLE;
 		fc->fe->ops.tuner_ops.set_params = alps_tdee4_stv0297_tuner_set_params;
 		info("found the stv0297 at i2c address: 0x%02x",alps_tdee4_stv0297_config.demod_address);
 	} else
 	/* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */
-	if ((fc->fe = vp310_mt312_attach(&skystar23_samsung_tbdu18132_config, &fc->i2c_adap)) != NULL) {
+	if ((fc->fe = dvb_attach(vp310_mt312_attach, &skystar23_samsung_tbdu18132_config, &fc->i2c_adap)) != NULL) {
 		ops = &fc->fe->ops;
 
 		ops->tuner_ops.set_params = skystar23_samsung_tbdu18132_tuner_set_params;
@@ -571,9 +571,7 @@ int flexcop_frontend_init(struct flexcop_device *fc)
 	} else {
 		if (dvb_register_frontend(&fc->dvb_adapter, fc->fe)) {
 			err("frontend registration failed!");
-			ops = &fc->fe->ops;
-			if (ops->release != NULL)
-				ops->release(fc->fe);
+			dvb_frontend_detach(fc->fe);
 			fc->fe = NULL;
 			return -EINVAL;
 		}
@@ -584,8 +582,10 @@ int flexcop_frontend_init(struct flexcop_device *fc)
 
 void flexcop_frontend_exit(struct flexcop_device *fc)
 {
-	if (fc->init_state & FC_STATE_FE_INIT)
+	if (fc->init_state & FC_STATE_FE_INIT) {
 		dvb_unregister_frontend(fc->fe);
+		dvb_frontend_detach(fc->fe);
+	}
 
 	fc->init_state &= ~FC_STATE_FE_INIT;
 }

drivers/media/dvb/bt8xx/Kconfig

View file

diff --git a/drivers/media/dvb/bt8xx/Kconfig b/drivers/media/dvb/bt8xx/Kconfig
index 7d0ee1a..ae2ff5d 100644
--- a/drivers/media/dvb/bt8xx/Kconfig
+++ b/drivers/media/dvb/bt8xx/Kconfig
@@ -2,13 +2,13 @@ config DVB_BT8XX
 	tristate "BT8xx based PCI cards"
 	depends on DVB_CORE && PCI && I2C && VIDEO_BT848
 	select DVB_PLL
-	select DVB_MT352
-	select DVB_SP887X
-	select DVB_NXT6000
-	select DVB_CX24110
-	select DVB_OR51211
-	select DVB_LGDT330X
-	select DVB_ZL10353
+	select DVB_MT352 if !DVB_FE_CUSTOMISE
+	select DVB_SP887X if !DVB_FE_CUSTOMISE
+	select DVB_NXT6000 if !DVB_FE_CUSTOMISE
+	select DVB_CX24110 if !DVB_FE_CUSTOMISE
+	select DVB_OR51211 if !DVB_FE_CUSTOMISE
+	select DVB_LGDT330X if !DVB_FE_CUSTOMISE
+	select DVB_ZL10353 if !DVB_FE_CUSTOMISE
 	select FW_LOADER
 	help
 	  Support for PCI cards based on the Bt8xx PCI bridge. Examples are

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 06ac899..9f72b70 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -1715,6 +1715,15 @@ static int dst_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_paramet
 static void dst_release(struct dvb_frontend *fe)
 {
 	struct dst_state *state = fe->demodulator_priv;
+	if (state->dst_ca) {
+		dvb_unregister_device(state->dst_ca);
+#ifdef CONFIG_DVB_CORE_ATTACH
+		symbol_put(dst_ca_attach);
+#endif
+	}
+#ifdef CONFIG_DVB_CORE_ATTACH
+	symbol_put(dst_attach);
+#endif
 	kfree(state);
 }
 

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 fa923b9..240ad08 100644
--- a/drivers/media/dvb/bt8xx/dst_ca.c
+++ b/drivers/media/dvb/bt8xx/dst_ca.c
@@ -699,12 +699,17 @@ static struct dvb_device dvbdev_ca = {
 	.fops = &dst_ca_fops
 };
 
-int dst_ca_attach(struct dst_state *dst, struct dvb_adapter *dvb_adapter)
+struct dvb_device *dst_ca_attach(struct dst_state *dst, struct dvb_adapter *dvb_adapter)
 {
 	struct dvb_device *dvbdev;
+
 	dprintk(verbose, DST_CA_ERROR, 1, "registering DST-CA device");
-	dvb_register_device(dvb_adapter, &dvbdev, &dvbdev_ca, dst, DVB_DEVICE_CA);
-	return 0;
+	if (dvb_register_device(dvb_adapter, &dvbdev, &dvbdev_ca, dst, DVB_DEVICE_CA) == 0) {
+		dst->dst_ca = dvbdev;
+		return dst->dst_ca;
+	}
+
+	return NULL;
 }
 
 EXPORT_SYMBOL(dst_ca_attach);

drivers/media/dvb/bt8xx/dst_common.h

View file

diff --git a/drivers/media/dvb/bt8xx/dst_common.h b/drivers/media/dvb/bt8xx/dst_common.h
index 0677b04..3bf084f 100644
--- a/drivers/media/dvb/bt8xx/dst_common.h
+++ b/drivers/media/dvb/bt8xx/dst_common.h
@@ -140,6 +140,7 @@ struct dst_state {
 	char *tuner_name;
 	struct mutex dst_mutex;
 	u8 fw_name[8];
+	struct dvb_device *dst_ca;
 };
 
 struct tuner_types {
@@ -178,7 +179,7 @@ int write_dst(struct dst_state *state, u8 * data, u8 len);
 int read_dst(struct dst_state *state, u8 * ret, u8 len);
 u8 dst_check_sum(u8 * buf, u32 len);
 struct dst_state* dst_attach(struct dst_state* state, struct dvb_adapter *dvb_adapter);
-int dst_ca_attach(struct dst_state *state, struct dvb_adapter *dvb_adapter);
+struct dvb_device *dst_ca_attach(struct dst_state *state, struct dvb_adapter *dvb_adapter);
 int dst_gpio_outb(struct dst_state* state, u32 mask, u32 enbb, u32 outhigh, int delay);
 
 int dst_command(struct dst_state* state, u8 * data, u8 len);

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 b715b97..fb6c4cc 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -67,7 +67,7 @@ static void dvb_bt8xx_task(unsigned long data)
 
 static int dvb_bt8xx_start_feed(struct dvb_demux_feed *dvbdmxfeed)
 {
-	struct dvb_demux *dvbdmx = dvbdmxfeed->demux;
+	struct dvb_demux*dvbdmx = dvbdmxfeed->demux;
 	struct dvb_bt8xx_card *card = dvbdmx->priv;
 	int rc;
 
@@ -595,15 +595,14 @@ static void lgdt330x_reset(struct dvb_bt8xx_card *bt)
 
 static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
 {
-	int ret;
 	struct dst_state* state = NULL;
 
 	switch(type) {
 	case BTTV_BOARD_DVICO_DVBT_LITE:
-		card->fe = mt352_attach(&thomson_dtt7579_config, card->i2c_adapter);
+		card->fe = dvb_attach(mt352_attach, &thomson_dtt7579_config, card->i2c_adapter);
 
 		if (card->fe == NULL)
-			card->fe = zl10353_attach(&thomson_dtt7579_zl10353_config,
+			card->fe = dvb_attach(zl10353_attach, &thomson_dtt7579_zl10353_config,
 						  card->i2c_adapter);