V4L/DVB updates
Subsystems (2)
cover V4L/DVB updates
This patch series is also available under v4l-dvb.git tree at:
kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
Linus, please pull these from master branch.
The biggest change here is a removed module, whose features are now included
at a generic module.
Also available at -git repository a devel branch with newer pending stuff for
2.6.17.
This series contains the following stuff:
- Added credits for em28xx-video.c
- Add PCI ID for DigitalNow DVB-T Dual, rebranded DViCO FusionHDTV DVB-T Dual.
- Add probe check for the tda9840.
- VIDEO_CX88_ALSA must select SND_PCM
- Fixes tvp5150a/am1 detection.
- Mark Typhoon cards as Lifeview OEM's
- Kill nxt2002 in favor of the nxt200x module
- rename dvb_pll_tbmv30111in to dvb_pll_samsung_tbmv
- Recognise Hauppauge card #34519
- make VP-3054 Secondary I2C Bus Support a Kconfig option.
- Cause tda9887 to use I2C_DRIVERID_TDA9887
- drivers/media/dvb/ possible cleanups
- Missing break statement on tuner-core
- fixed spelling error, exectuted --> executed.
- Fix printk type warning
- changed comment in tuner-core.c
Cheers,
Mauro
---
Documentation/video4linux/CARDLIST.cx88 | 2 Documentation/video4linux/CARDLIST.saa7134 | 6 drivers/media/dvb/b2c2/Kconfig | 2 drivers/media/dvb/b2c2/flexcop-common.h | 2 drivers/media/dvb/b2c2/flexcop-dma.c | 35 drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 11 drivers/media/dvb/b2c2/flexcop-misc.c | 6 drivers/media/dvb/b2c2/flexcop-pci.c | 6 drivers/media/dvb/b2c2/flexcop-reg.h | 4 drivers/media/dvb/dvb-usb/cxusb.c | 8 drivers/media/dvb/dvb-usb/dvb-usb-firmware.c | 8 drivers/media/dvb/dvb-usb/dvb-usb.h | 1 drivers/media/dvb/dvb-usb/vp702x.c | 6 drivers/media/dvb/dvb-usb/vp702x.h | 2 drivers/media/dvb/frontends/Kconfig | 12 drivers/media/dvb/frontends/Makefile | 1 drivers/media/dvb/frontends/dvb-pll.c | 8 drivers/media/dvb/frontends/dvb-pll.h | 2 drivers/media/dvb/frontends/nxt2002.c | 706 ------------------- drivers/media/dvb/frontends/nxt2002.h | 23 drivers/media/dvb/frontends/nxt200x.c | 58 + drivers/media/dvb/ttpci/av7110.h | 2 drivers/media/dvb/ttpci/av7110_ir.c | 26 drivers/media/video/cx88/Kconfig | 12 drivers/media/video/cx88/Makefile | 2 drivers/media/video/cx88/cx88-cards.c | 6 drivers/media/video/em28xx/em28xx-core.c | 2 drivers/media/video/em28xx/em28xx-video.c | 3 drivers/media/video/saa7134/saa7134-cards.c | 47 - drivers/media/video/saa7134/saa7134-dvb.c | 2 drivers/media/video/saa7134/saa7134.h | 2 drivers/media/video/tda9887.c | 2 drivers/media/video/tuner-core.c | 3 drivers/media/video/tvaudio.c | 9 drivers/media/video/tvp5150.c | 21 35 files changed, 171 insertions(+), 877 deletions(-)
PATCH 1/16 Added credits for em28xx-video.c
From: Mauro Carvalho Chehab <[email protected]>
- Added credits for sn9c102 kernel module and his author as some parts of em28xx-video were based.
---
drivers/media/video/em28xx/em28xx-video.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
drivers/media/video/em28xx/em28xx-video.c +3 -0
@@ -6,6 +6,9 @@ Mauro Carvalho Chehab <[email protected]> Sascha Sommer <[email protected]> + Some parts based on SN9C10x PC Camera Controllers GPL driver made + by Luca Risolia <[email protected]> + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or
PATCH 2/16 Add PCI ID for DigitalNow DVB-T Dual, rebranded DViCO FusionHDTV DVB-T Dual.
In reply to [email protected]From: Michael Krufky <[email protected]>
- Add PCI ID for DigitalNow DVB-T Dual,
rebranded DViCO FusionHDTV DVB-T Dual.
---
Documentation/video4linux/CARDLIST.cx88 | 2 +- drivers/media/video/cx88/cx88-cards.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-)
Documentation/video4linux/CARDLIST.cx88 +1 -1
@@ -42,4 +42,4 @@ 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] + 44 -> DViCO FusionHDTV DVB-T Dual Digital [18ac:db50,18ac:db54]
drivers/media/video/cx88/cx88-cards.c +5 -0
@@ -1246,6 +1246,11 @@ struct cx88_subid cx88_subids[] = { .card = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL, },{ .subvendor = 0x18ac, + .subdevice = 0xdb54, + .card = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL, + /* Re-branded DViCO: DigitalNow DVB-T Dual */ + },{ + .subvendor = 0x18ac, .subdevice = 0xdb11, .card = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS, /* Re-branded DViCO: UltraView DVB-T Plus */
PATCH 3/16 Add probe check for the tda9840.
In reply to [email protected]From: Hans Verkuil <[email protected]>
- Add probe check for the tda9840 to prevent misdetection of a Micronas dpl3518a as a tda9840.
---
drivers/media/video/tvaudio.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)
drivers/media/video/tvaudio.c +9 -0
@@ -390,6 +390,14 @@ static void tda9840_setmode(struct CHIPSchip_write (chip,TDA9840_SW , t); } +static int tda9840_checkit (struct CHIPSTATE *chip) +{ +int rc; + rc =chip_read (chip); +/* lower 5 bits should be 0 */ +return ((rc &0x1f ) ==0 ) ?1 :0 ; +} +/* ---------------------------------------------------------------------- */ /* audio chip descriptions - defines+functions for tda985x */
@@ -1264,6 +1272,7 @@ static struct CHIPDESC chiplist[] = { .addr_hi = I2C_TDA9840 >> 1, .registers = 5, + .checkit = tda9840_checkit, .getmode = tda9840_getmode, .setmode = tda9840_setmode, .checkmode = generic_checkmode,
PATCH 4/16 VIDEO_CX88_ALSA must select SND_PCM
In reply to [email protected]From: Adrian Bunk <[email protected]>
- VIDEO_CX88_ALSA must select SND_PCM
---
drivers/media/video/cx88/Kconfig | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/media/video/cx88/Kconfig +1 -0
@@ -32,6 +32,7 @@ config VIDEO_CX88_DVB config VIDEO_CX88_ALSA tristate "ALSA DMA audio support" depends on VIDEO_CX88 && SND && EXPERIMENTAL + select SND_PCM ---help--- This is a video4linux driver for direct (DMA) audio on Conexant 2388x based TV cards.
PATCH 5/16 Fixes tvp5150a/am1 detection.
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
- Tvp5150 type were determined by a secondary register instead of using ROM code.
- tvp5150am1 have ROM=4.0, while tvp5150a have ROM=3.33 (decimal). All other ROM versions are reported as unknown tvp5150.
- Except for reporting, current code doesn't enable any special feature for tvp5150am1 or tvp5150a. Code should work for both models (but were tested only for tvp5150am1).
---
drivers/media/video/tvp5150.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-)
drivers/media/video/tvp5150.c +12 -9
@@ -746,24 +746,27 @@ static int tvp5150_set_std(struct i2c_clstatic inline void tvp5150_reset (struct i2c_client *c) { -u8 type, ver_656, msb_id, lsb_id, msb_rom, lsb_rom; +u8 msb_id, lsb_id, msb_rom, lsb_rom;struct tvp5150 *decoder =i2c_get_clientdata (c); - type=tvp5150_read (c,TVP5150_AUTOSW_MSK ); msb_id=tvp5150_read (c,TVP5150_MSB_DEV_ID ); lsb_id=tvp5150_read (c,TVP5150_LSB_DEV_ID ); msb_rom=tvp5150_read (c,TVP5150_ROM_MAJOR_VER ); lsb_rom=tvp5150_read (c,TVP5150_ROM_MINOR_VER ); -if (type==0xdc ) { - ver_656=tvp5150_read (c,TVP5150_REV_SELECT ); -tvp5150_info ("tvp%02x%02xam1 detected 656 version is %d.\n" ,msb_id, lsb_id,ver_656); - }else if (type==0xfc ) { -tvp5150_info ("tvp%02x%02xa detected.\n" ,msb_id, lsb_id); +if ((msb_rom==4 )&&(lsb_rom==0 )) {/* Is TVP5150AM1 */ +tvp5150_info ("tvp%02x%02xam1 detected.\n" ,msb_id, lsb_id); + +/* ITU-T BT.656.4 timing */ +tvp5150_write (c,TVP5150_REV_SELECT ,0 ); }else { -tvp5150_info ("unknown tvp%02x%02x chip detected(%d).\n" ,msb_id,lsb_id,type); +if ((msb_rom==3 )||(lsb_rom==0x21 )) {/* Is TVP5150A */ +tvp5150_info ("tvp%02x%02xa detected.\n" ,msb_id, lsb_id); + }else { +tvp5150_info ("*** unknown tvp%02x%02x chip detected.\n" ,msb_id,lsb_id); +tvp5150_info ("*** Rom ver is %d.%d\n" ,msb_rom,lsb_rom); + } } -tvp5150_info ("Rom ver is %d.%d\n" ,msb_rom,lsb_rom);/* Initializes TVP5150 to its default values */ tvp5150_write_inittab (c, tvp5150_init_default);
PATCH 7/16 Kill nxt2002 in favor of the nxt200x module
In reply to [email protected]From: Michael Krufky <[email protected]>
- Kill nxt2002 module in favor of nxt200x.
- Repair broken nxt2002 support in the nxt200x module.
- Make the flexcop driver use nxt200x instead of the nxt2002 module for the Air2PC 2nd generation PCI card.
- Remove the nxt2002 module from cvs and kernel build.
---
drivers/media/dvb/b2c2/Kconfig | 2 drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 9 drivers/media/dvb/frontends/Kconfig | 12 drivers/media/dvb/frontends/Makefile | 1 drivers/media/dvb/frontends/dvb-pll.c | 2 drivers/media/dvb/frontends/nxt2002.c | 706 ----------------------------- drivers/media/dvb/frontends/nxt2002.h | 23 - drivers/media/dvb/frontends/nxt200x.c | 58 ++ 8 files changed, 57 insertions(+), 756 deletions(-)
drivers/media/dvb/b2c2/Kconfig +1 -1
@@ -4,7 +4,7 @@ config DVB_B2C2_FLEXCOP select DVB_STV0299 select DVB_MT352 select DVB_MT312 - select DVB_NXT2002 + select DVB_NXT200X select DVB_STV0297 select DVB_BCM3510 select DVB_LGDT330X
drivers/media/dvb/b2c2/flexcop-fe-tuner.c +5 -4
@@ -9,7 +9,7 @@#include "stv0299.h" #include "mt352.h" -#include "nxt2002.h" +#include "nxt200x.h" #include "bcm3510.h" #include "stv0297.h" #include "mt312.h"
@@ -343,9 +343,10 @@ static struct lgdt330x_config air2pc_ats .clock_polarity_flip = 1, }; -static struct nxt2002_config samsung_tbmv_config = { +static struct nxt200x_config samsung_tbmv_config = { .demod_address =0x0a , - .request_firmware = flexcop_fe_request_firmware, + .pll_address =0xc2 , + .pll_desc = &dvb_pll_tbmv30111in, };static struct bcm3510_config air2pc_atsc_first_gen_config = {
@@ -505,7 +506,7 @@ int flexcop_frontend_init(struct flexcopinfo ("found the mt352 at i2c address: 0x%02x" ,samsung_tdtc9251dh0_config.demod_address); }else /* try the air atsc 2nd generation (nxt2002) */ -if ((fc->fe =nxt2002_attach (&samsung_tbmv_config, &fc->i2c_adap)) !=NULL ) { +if ((fc->fe =nxt200x_attach (&samsung_tbmv_config, &fc->i2c_adap)) !=NULL ) { fc->dev_type =FC_AIR_ATSC2 ;info ("found the nxt2002 at i2c address: 0x%02x" ,samsung_tbmv_config.demod_address); }else
drivers/media/dvb/frontends/Kconfig +0 -12
@@ -166,18 +166,6 @@ config DVB_STV0297 comment "ATSC (North American/Korean Terresterial DTV) frontends" depends on DVB_CORE -config DVB_NXT2002 - tristate "Nxt2002 based" - depends on DVB_CORE - select FW_LOADER - help - An ATSC 8VSB tuner module. Say Y when you want to support this frontend. - - This driver needs external firmware. Please use the command - "<kerneldir>/Documentation/dvb/get_dvb_firmware nxt2002" to - download/extract it, and then copy it to /usr/lib/hotplug/firmware - or /lib/firmware (depending on configuration of firmware hotplug). - config DVB_NXT200X tristate "Nextwave NXT2002/NXT2004 based" depends on DVB_CORE
drivers/media/dvb/frontends/Makefile +0 -1
@@ -25,7 +25,6 @@ obj-$(CONFIG_DVB_CX22702) += cx22702.o obj-$(CONFIG_DVB_TDA80XX) += tda80xx.o obj-$(CONFIG_DVB_TDA10021) += tda10021.o obj-$(CONFIG_DVB_STV0297) += stv0297.o -obj-$(CONFIG_DVB_NXT2002) += nxt2002.o obj-$(CONFIG_DVB_NXT200X) += nxt200x.o obj-$(CONFIG_DVB_OR51211) += or51211.o obj-$(CONFIG_DVB_OR51132) += or51132.o
drivers/media/dvb/frontends/dvb-pll.c +1 -1
@@ -326,7 +326,7 @@ struct dvb_pll_desc dvb_pll_tuv1236d = { };EXPORT_SYMBOL (dvb_pll_tuv1236d); -/* Samsung TBMV30111IN +/* Samsung TBMV30111IN / TBMV30712IN1 * used in Air2PC ATSC - 2nd generation (nxt2002) */ struct dvb_pll_desc dvb_pll_tbmv30111in = {
drivers/media/dvb/frontends/nxt2002.c deleted +0 -706
706 lines not on this page · raw message
drivers/media/dvb/frontends/nxt2002.h deleted +0 -23
@@ -1,23 +0,0 @@ -/* -Driver for the Nxt2002 demodulator -*/ - -#ifndef NXT2002_H -#define NXT2002_H - -#include <linux/dvb/frontend.h> -#include <linux/firmware.h> - -struct nxt2002_config -{ -/* the demodulator's i2c address */ -u8 demod_address; - -/* request firmware for device */ -int (*request_firmware)(struct dvb_frontend * fe,const struct firmware **fw,char * name); -}; - -extern struct dvb_frontend *nxt2002_attach (const struct nxt2002_config * config, -struct i2c_adapter * i2c); - -#endif // NXT2002_H
drivers/media/dvb/frontends/nxt200x.c +50 -8
95 lines not on this page · raw message
PATCH 8/16 rename dvb_pll_tbmv30111in to dvb_pll_samsung_tbmv
In reply to [email protected]From: Michael Krufky <[email protected]>
- rename dvb_pll_tbmv30111in to dvb_pll_samsung_tbmv
---
drivers/media/dvb/b2c2/flexcop-fe-tuner.c | 2 +- drivers/media/dvb/frontends/dvb-pll.c | 6 +++--- drivers/media/dvb/frontends/dvb-pll.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
drivers/media/dvb/b2c2/flexcop-fe-tuner.c +1 -1
@@ -346,7 +346,7 @@ static struct lgdt330x_config air2pc_atsstatic struct nxt200x_config samsung_tbmv_config = { .demod_address =0x0a , .pll_address =0xc2 , - .pll_desc = &dvb_pll_tbmv30111in, + .pll_desc = &dvb_pll_samsung_tbmv, };static struct bcm3510_config air2pc_atsc_first_gen_config = {
drivers/media/dvb/frontends/dvb-pll.c +3 -3
@@ -329,8 +329,8 @@ EXPORT_SYMBOL(dvb_pll_tuv1236d);/* Samsung TBMV30111IN / TBMV30712IN1 * used in Air2PC ATSC - 2nd generation (nxt2002) */ -struct dvb_pll_desc dvb_pll_tbmv30111in = { - .name ="Samsung TBMV30111IN" , +struct dvb_pll_desc dvb_pll_samsung_tbmv = { + .name ="Samsung TBMV30111IN / TBMV30712IN1" , .min =54000000 , .max =860000000 , .count =6 ,
@@ -343,7 +343,7 @@ struct dvb_pll_desc dvb_pll_tbmv30111in { 999999999, 44000000, 166666, 0xfc, 0x02 }, } }; -EXPORT_SYMBOL (dvb_pll_tbmv30111in); +EXPORT_SYMBOL (dvb_pll_samsung_tbmv);/* * Philips SD1878 Tuner.
drivers/media/dvb/frontends/dvb-pll.h +1 -1
@@ -38,7 +38,7 @@ extern struct dvb_pll_desc dvb_pll_tded4extern struct dvb_pll_desc dvb_pll_tuv1236d;extern struct dvb_pll_desc dvb_pll_tdhu2; -extern struct dvb_pll_desc dvb_pll_tbmv30111in; +extern struct dvb_pll_desc dvb_pll_samsung_tbmv;extern struct dvb_pll_desc dvb_pll_philips_sd1878_tda8261; int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf,
PATCH 9/16 Recognise Hauppauge card #34519
In reply to [email protected]From: Ian Pickworth <[email protected]>
- Recognise Hauppauge card #34519
---
drivers/media/video/cx88/cx88-cards.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/media/video/cx88/cx88-cards.c +1 -0
@@ -1298,6 +1298,7 @@ static void hauppauge_eeprom(struct cx88switch (tv.model) {case 28552 :/* WinTV-PVR 'Roslyn' (No IR) */ +case 34519 :/* WinTV-PCI-FM */ case 90002 :/* Nova-T-PCI (9002) */ case 92001 :/* Nova-S-Plus (Video and IR) */ case 92002 :/* Nova-S-Plus (Video and IR) */
PATCH 10/16 make VP-3054 Secondary I2C Bus Support a Kconfig option.
In reply to [email protected]From: Michael Krufky <[email protected]>
- make VP-3054 Secondary I2C Bus Support a Kconfig option.
---
drivers/media/video/cx88/Kconfig | 11 +++++++++++ drivers/media/video/cx88/Makefile | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-)
drivers/media/video/cx88/Kconfig +11 -0
@@ -49,6 +49,7 @@ config VIDEO_CX88_DVB_ALL_FRONTENDS default y depends on VIDEO_CX88_DVB select DVB_MT352 + select VIDEO_CX88_VP3054 select DVB_OR51132 select DVB_CX22702 select DVB_LGDT330X
@@ -70,6 +71,16 @@ config VIDEO_CX88_DVB_MT352 This adds DVB-T support for cards based on the Connexant 2388x chip and the MT352 demodulator. +config VIDEO_CX88_VP3054 + tristate "VP-3054 Secondary I2C Bus Support" + default m + depends on DVB_MT352 + ---help--- + This adds DVB-T support for cards based on the + Connexant 2388x chip and the MT352 demodulator, + which also require support for the VP-3054 + Secondary I2C bus, such at DNTV Live! DVB-T Pro. + config VIDEO_CX88_DVB_OR51132 bool "OR51132 ATSC Support" default y
drivers/media/video/cx88/Makefile +1 -1
@@ -18,6 +18,6 @@ extra-cflags-$(CONFIG_DVB_LGDT330X) += extra-cflags-$(CONFIG_DVB_MT352) += -DHAVE_MT352=1 extra-cflags-$(CONFIG_DVB_NXT200X) += -DHAVE_NXT200X=1 extra-cflags-$(CONFIG_DVB_CX24123) += -DHAVE_CX24123=1 -extra-cflags-$(CONFIG_VIDEO_CX88_DVB)+= -DHAVE_VP3054_I2C=1 +extra-cflags-$(CONFIG_VIDEO_CX88_VP3054)+= -DHAVE_VP3054_I2C=1 EXTRA_CFLAGS += $(extra-cflags-y) $(extra-cflags-m)
Re: [PATCH 10/16] make VP-3054 Secondary I2C Bus Support a Kconfig option.
Quoted 25 lines · On Mon, Jan 23, 2006 at 06:24:44PM -0200, [email protected] wrote:
From: Michael Krufky <[email protected]>
- make VP-3054 Secondary I2C Bus Support a
Kconfigoption.Signed-off-by Michael Krufky <[email protected]>Signed-off-by Mauro Carvalho Chehab <[email protected]>---
drivers/media/video/cx88/Kconfig | 11 +++++++++++ drivers/media/video/cx88/Makefile | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-)drivers/media/video/cx88/Kconfig +1
-0@@ -49,6 +49,7 @@ config VIDEO_CX88_DVB_ALL_FRONTENDS default y depends on VIDEO_CX88_DVB select DVB_MT352 + select VIDEO_CX88_VP3054 select DVB_OR51132 select DVB_CX22702 select DVB_LGDT330X
drivers/media/video/cx88/Kconfig config VIDEO_CX88_DVB_MT352 · line 76
Quoted 7 lines
drivers/media/video/cx88/Kconfig +3
-0@@ -70,6 +71,16 @@ config VIDEO_CX88_DVB_MT352 This adds DVB-T support for cards based on the Connexant 2388x chip and the MT352 demodulator. +config VIDEO_CX88_VP3054 + tristate "VP-3054 Secondary I2C Bus Support" + default m
This option should be a bool since "m" doesn't make much sense (it's anyways interpreted the same as "y").
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon SeedRe: [PATCH 10/16] make VP-3054 Secondary I2C Bus Support a Kconfig option.
Quoted 31 lines · Adrian Bunk
Quoted 28 lines · On Mon, Jan 23, 2006 at 06:24:44PM -0200, [email protected] wrote:
From: Michael Krufky <[email protected]>
- make VP-3054 Secondary I2C Bus Support a
Kconfigoption.Signed-off-by Michael Krufky <[email protected]>Signed-off-by Mauro Carvalho Chehab <[email protected]>---
drivers/media/video/cx88/Kconfig| 11 +++++++++++drivers/media/video/cx88/Makefile| 2 +-2 files changed, 12 insertions(+), 1 deletions(-)drivers/media/video/cx88/Kconfig +1
-0@@ -49,6 +49,7 @@ config VIDEO_CX88_DVB_ALL_FRONTENDS default y depends on VIDEO_CX88_DVB select DVB_MT352 + select VIDEO_CX88_VP3054 select DVB_OR51132 select DVB_CX22702 select DVB_LGDT330X@@ -70,6 +71,16 @@ config VIDEO_CX88_DVB_MT352 This adds DVB-T support for cards based on the Connexant 2388x chip and the MT352 demodulator.
Quoted 9 lines
drivers/media/video/cx88/Kconfig config VIDEO_CX88_DVB_MT352 · line 76
Quoted 6 lines
drivers/media/video/cx88/Kconfig +3
-0+config VIDEO_CX88_VP3054 + tristate "VP-3054 Secondary I2C Bus Support" + default mThis option should be a bool since "m" doesn't make much sense (it's anyways interpreted the same as "y").
Adrian,
You have a point - it is a boolean choice yes/no, about whether or not to compile support for this module, ... but it is in fact a module, and when M is chosen, cx88-vp3054-i2c.ko will build as a module. When Y is chosen, it will be built in-kernel, just as all other tri-states..... The difference is that this module depends on DVB_MT352 ... if DVB_MT352 is M, then this should be M/N ... if VIDEO_CX88_DVB is Y, then this should be Y/N...
This particular menu item is NOT the same as the other submenu items of the VIDEO_CX88_DVB_FRONTEND_FOO
This may be why you thought this should be changed to a boolean, but it really should remain as a tristate.... Thank you though.
:-)
Regards,
Signature · 1 line
Michael Krufky
Re: [PATCH 10/16] make VP-3054 Secondary I2C Bus Support a Kconfig option.
Quoted 18 lines · Mike Krufky
Quoted 6 lines · Adrian Bunk
On Mon, Jan 23, 2006 at 06:24:44PM -0200, [email protected] wrote:
...Quoted 4 lines
drivers/media/video/cx88/Kconfig +0
-0@@ -70,6 +71,16 @@ config VIDEO_CX88_DVB_MT352 This adds DVB-T support for cards based on the Connexant 2388x chip and the MT352 demodulator.Quoted 10 lines
drivers/media/video/cx88/Kconfig config VIDEO_CX88_DVB_MT352 · line 76
Quoted 6 lines
drivers/media/video/cx88/Kconfig +3
-0+config VIDEO_CX88_VP3054 + tristate "VP-3054 Secondary I2C Bus Support" + default mThis option should be a bool since "m" doesn't make much sense (it's anyways interpreted the same as "y").
Quoted 5 lines
Adrian,
You have a point - it is a boolean choice yes/no, about whether or not to compile support for this module, ... but it is in fact a module, and when M is chosen, cx88-vp3054-i2c.ko will build as a module. When Y is
I don't see this in your patches.
All your patches do is to define -DHAVE_VP3054_I2C=1 depending on CONFIG_VIDEO_CX88_VP3054.
Quoted 5 lines
chosen, it will be built in-kernel, just as all other tri-states..... The difference is that this module depends on
DVB_MT352... ifDVB_MT352is M, then this should be M/N ... ifVIDEO_CX88_DVBis Y, then this should be Y/N...
...
If VIDEO_CX88_DVB (and modules support enabled in the kernel) this will be Y/M/N...
A more general question:
Why are you using the indirection through the defines in the Makefile? You could diectly use the (boolean) CONFIG_* options in the drivers.
Quoted 4 lines
:-)
Regards,
Michael Krufky
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed[PATCH|BUG-FIX] V4L/DVB: allow tristate build for cx88-vp3054-i2c
Quoted 17 lines · Adrian Bunk
Quoted 14 lines · Mike Krufky
Quoted 12 lines · Adrian Bunk
Review config VIDEO_CX88_DVB_MT352 · line 77
Quoted 8 lines · On Mon, Jan 23, 2006 at 06:24:44PM -0200, [email protected] wrote:
(quoted diff) +3
-0@@ -70,6 +71,16 @@ config VIDEO_CX88_DVB_MT352 This adds DVB-T support for cards based on the Connexant 2388x chip and the MT352 demodulator. +config VIDEO_CX88_VP3054 + tristate "VP-3054 Secondary I2C Bus Support" + default mThis option should be a bool since "m" doesn't make much sense (it's anyways interpreted the same as "y").
Quoted 8 lines
Quoted 4 lines
You have a point - it is a boolean choice yes/no, about whether or not to compile support for this module, ... but it is in fact a module, and when M is chosen, cx88-vp3054-i2c.ko will build as a module. When Y is chosen, it will be built in-kernel.
I don't see this in your patches.
All your patches do is to define -DHAVE_VP3054_I2C=1 depending on
CONFIG_VIDEO_CX88_VP3054.
Oops! I made a mistake, but not the one you thought. The attached patch fixes it.
Mauro, I just applied this to CVS, please apply on v4l-dvb.git
[PATCH] V4L/DVB: allow tristate build for cx88-vp3054-i2c
- allow tristate build for cx88-vp3054-i2c
Index: linux/drivers/media/video/cx88/Makefile
===================================================================
RCS file: /cvs/video4linux/v4l-dvb/linux/drivers/media/video/cx88/Makefile,v retrieving revision 1.8
drivers/media/video/cx88/Makefile +2 -1
@@ -4,8 +4,9 @@ cx8800-objs := cx88-video.o cx88-vbi.o cx8802-objs := cx88-mpeg.o obj-$(CONFIG_VIDEO_CX88) += cx88xx.o cx8800.o cx8802.o cx88-blackbird.o -obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o cx88-vp3054-i2c.o +obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o obj-$(CONFIG_VIDEO_CX88_ALSA) += cx88-alsa.o +obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o EXTRA_CFLAGS += -I$(src)/.. EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/dvb-core
Mauro Carvalho Chehab
AppliedRe: [PATCH|BUG-FIX] V4L/DVB: allow tristate build for cx88-vp3054-i2c
Em Seg, 2006-01-23 às 21:55 -0500, Michael Krufky escreveu:
Quoted 3 lines
Adrian Bunk wrote:
Mauro, I just applied this to CVS, please apply on v4l-dvb.git
Applied, thanks.
Cheers,
Mauro.
PATCH 11/16 Cause tda9887 to use I2C_DRIVERID_TDA9887
In reply to [email protected]From: Mike Isely <[email protected]>
- The tda9887 has an I2C id reserved for it, but it hasn't been using it. Probably an oversight. Fixed with this patch.
---
drivers/media/video/tda9887.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/media/video/tda9887.c +1 -1
@@ -876,7 +876,7 @@ static int tda9887_resume(struct device/* ----------------------------------------------------------------------- */ static struct i2c_driver driver = { - .id =-1 ,/* FIXME */ + .id =I2C_DRIVERID_TDA9887 , .attach_adapter = tda9887_probe, .detach_client = tda9887_detach, .command = tda9887_command,
PATCH 12/16 drivers/media/dvb/ possible cleanups
In reply to [email protected]From: Adrian Bunk <[email protected]>
- Make needlessly global code static
- #if 0 the following unused global functions:
- b2c2/flexcop-dma.c: flexcop_dma_control_packet_irq()
- b2c2/flexcop-dma.c: flexcop_dma_config_packet_count()
---
drivers/media/dvb/b2c2/flexcop-common.h | 2 - drivers/media/dvb/b2c2/flexcop-dma.c | 35 -------------------------- drivers/media/dvb/b2c2/flexcop-misc.c | 6 ++-- drivers/media/dvb/b2c2/flexcop-reg.h | 4 --- drivers/media/dvb/dvb-usb/cxusb.c | 8 +++--- drivers/media/dvb/dvb-usb/dvb-usb-firmware.c | 8 ++++-- drivers/media/dvb/dvb-usb/dvb-usb.h | 1 - drivers/media/dvb/dvb-usb/vp702x.c | 6 +++- drivers/media/dvb/dvb-usb/vp702x.h | 2 - drivers/media/dvb/ttpci/av7110.h | 2 - drivers/media/dvb/ttpci/av7110_ir.c | 26 ++++++++++--------- 11 files changed, 29 insertions(+), 71 deletions(-)
drivers/media/dvb/b2c2/flexcop-common.h +0 -2
@@ -116,11 +116,9 @@ void flexcop_dma_free(struct flexcop_dmaint flexcop_dma_control_timer_irq (struct flexcop_device *fc,flexcop_dma_index_t no,int onoff);int flexcop_dma_control_size_irq (struct flexcop_device *fc,flexcop_dma_index_t no,int onoff); -int flexcop_dma_control_packet_irq (struct flexcop_device *fc,flexcop_dma_index_t no,int onoff);int flexcop_dma_config (struct flexcop_device *fc,struct flexcop_dma *dma,flexcop_dma_index_t dma_idx);int flexcop_dma_xfer_control (struct flexcop_device *fc,flexcop_dma_index_t dma_idx,flexcop_dma_addr_index_t index,int onoff);int flexcop_dma_config_timer (struct flexcop_device *fc,flexcop_dma_index_t dma_idx,u8 cycles); -int flexcop_dma_config_packet_count (struct flexcop_device *fc,flexcop_dma_index_t dma_idx,u8 packets);/* from flexcop-eeprom.c */ /* the PCI part uses this call to get the MAC address, the USB part has its own */
drivers/media/dvb/b2c2/flexcop-dma.c +0 -35
@@ -169,38 +169,3 @@ int flexcop_dma_config_timer(struct flex }EXPORT_SYMBOL (flexcop_dma_config_timer); -/* packet IRQ does not exist in FCII or FCIIb - according to data book and tests */ -int flexcop_dma_control_packet_irq (struct flexcop_device *fc, -flexcop_dma_index_t no, -int onoff) -{ -flexcop_ibi_value v = fc->read_ibi_reg (fc,ctrl_208); - -deb_rdump ("reg: %03x: %x\n" ,ctrl_208,v.raw); -if (no &FC_DMA_1 ) - v.ctrl_208.DMA1_Size_IRQ_Enable_sig = onoff; - -if (no &FC_DMA_2 ) - v.ctrl_208.DMA2_Size_IRQ_Enable_sig = onoff; - - fc->write_ibi_reg (fc,ctrl_208,v); -deb_rdump ("reg: %03x: %x\n" ,ctrl_208,v.raw); - -return 0 ; -} -EXPORT_SYMBOL (flexcop_dma_control_packet_irq); - -int flexcop_dma_config_packet_count (struct flexcop_device *fc, -flexcop_dma_index_t dma_idx, -u8 packets) -{ -flexcop_ibi_register r = (dma_idx &FC_DMA_1 ) ? dma1_004 : dma2_014; -flexcop_ibi_value v = fc->read_ibi_reg (fc,r); - -flexcop_dma_remap (fc,dma_idx,1 ); - - v.dma_0x4_remap.DMA_maxpackets = packets; - fc->write_ibi_reg (fc,r,v); -return 0 ; -} -EXPORT_SYMBOL (flexcop_dma_config_packet_count);
drivers/media/dvb/b2c2/flexcop-misc.c +3 -3
@@ -36,14 +36,14 @@ void flexcop_determine_revision(struct f/* bus parts have to decide if hw pid filtering is used or not. */ } -const char *flexcop_revision_names[] = { +static const char *flexcop_revision_names[] = {"Unkown chip" ,"FlexCopII" ,"FlexCopIIb" ,"FlexCopIII" , }; -const char *flexcop_device_names[] = { +static const char *flexcop_device_names[] = {"Unkown device" ,"Air2PC/AirStar 2 DVB-T" ,"Air2PC/AirStar 2 ATSC 1st generation" ,
@@ -54,7 +54,7 @@ const char *flexcop_device_names[] = { "Air2PC/AirStar 2 ATSC 3rd generation (HD5000)", }; -const char *flexcop_bus_names[] = { +static const char *flexcop_bus_names[] = {"USB" ,"PCI" , };
drivers/media/dvb/b2c2/flexcop-reg.h +0 -4
@@ -16,8 +16,6 @@ typedef enum {FLEXCOP_III , } flexcop_revision_t; -extern const char *flexcop_revision_names[]; - typedef enum { FC_UNK = 0, FC_AIR_DVB,
@@ -34,8 +32,6 @@ typedef enum {FC_PCI , } flexcop_bus_t; -extern const char *flexcop_device_names[]; -/* FlexCop IBI Registers */ #if defined(__LITTLE_ENDIAN)#include "flexcop_ibi_value_le.h"
drivers/media/dvb/dvb-usb/cxusb.c +4 -4
@@ -184,7 +184,7 @@ static int cxusb_rc_query(struct dvb_usbreturn 0 ; } -struct dvb_usb_rc_key dvico_mce_rc_keys[] = { +static struct dvb_usb_rc_key dvico_mce_rc_keys[] = { {0xfe ,0x02 ,KEY_TV }, {0xfe ,0x0e ,KEY_MP3 }, {0xfe ,0x1a ,KEY_DVD },
@@ -273,7 +273,7 @@ static int cxusb_mt352_demod_init(structreturn 0 ; } -struct cx22702_config cxusb_cx22702_config = { +static struct cx22702_config cxusb_cx22702_config = { .demod_address =0x63 , .output_mode =CX22702_PARALLEL_OUTPUT ,
@@ -282,13 +282,13 @@ struct cx22702_config cxusb_cx22702_conf .pll_set = dvb_usb_pll_set_i2c, }; -struct lgdt330x_config cxusb_lgdt330x_config = { +static struct lgdt330x_config cxusb_lgdt330x_config = { .demod_address =0x0e , .demod_chip =LGDT3303 , .pll_set = dvb_usb_pll_set_i2c, }; -struct mt352_config cxusb_dee1601_config = { +static struct mt352_config cxusb_dee1601_config = { .demod_address =0x0f , .demod_init = cxusb_dee1601_demod_init, .pll_set = dvb_usb_pll_set,
drivers/media/dvb/dvb-usb/dvb-usb-firmware.c +5 -3
@@ -24,6 +24,9 @@ static struct usb_cypress_controller cyp { .id = CYPRESS_FX2, .name = "Cypress FX2", .cpu_cs_register = 0xe600 }, }; +static int dvb_usb_get_hexline (const struct firmware *fw,struct hexline *hx, +int *pos); +/* * load a firmware packet to the device */
@@ -112,7 +115,8 @@ int dvb_usb_download_firmware(struct usbreturn ret; } -int dvb_usb_get_hexline (const struct firmware *fw,struct hexline *hx,int *pos) +static int dvb_usb_get_hexline (const struct firmware *fw,struct hexline *hx, +int *pos) {u8 *b = (u8 *) &fw->data[*pos];int data_offs =4 ;
@@ -142,5 +146,3 @@ int dvb_usb_get_hexline(const struct firreturn *pos; } -EXPORT_SYMBOL (dvb_usb_get_hexline); -
drivers/media/dvb/dvb-usb/dvb-usb.h +0 -1
@@ -341,7 +341,6 @@ struct hexline {u8 data[255 ]; u8 chk; }; -extern int dvb_usb_get_hexline (const struct firmware *,struct hexline *,int *);extern int usb_cypress_load_firmware (struct usb_device *udev,const struct firmware *fw,int type);#endif
drivers/media/dvb/dvb-usb/vp702x.c +4 -2
@@ -53,7 +53,8 @@ int vp702x_usb_in_op(struct dvb_usb_devireturn ret; } -int vp702x_usb_out_op (struct dvb_usb_device *d,u8 req,u16 value,u16 index,u8 *b,int blen) +static int vp702x_usb_out_op (struct dvb_usb_device *d,u8 req,u16 value, +u16 index,u8 *b,int blen) {deb_xfer ("out: req. %x, val: %x, ind: %x, buffer: " ,req,value,index);debug_dump (b,blen,deb_xfer);
@@ -88,7 +89,8 @@ unlock:return ret; } -int vp702x_usb_inout_cmd (struct dvb_usb_device *d,u8 cmd,u8 *o,int olen,u8 *i,int ilen,int msec) +static int vp702x_usb_inout_cmd (struct dvb_usb_device *d,u8 cmd,u8 *o, +int olen,u8 *i,int ilen,int msec) {u8 bout[olen+2 ];u8 bin[ilen+1 ];
drivers/media/dvb/dvb-usb/vp702x.h +0 -2
@@ -101,8 +101,6 @@ extern int dvb_usb_vp702x_debug;extern struct dvb_frontend *vp702x_fe_attach (struct dvb_usb_device *d);extern int vp702x_usb_inout_op (struct dvb_usb_device *d,u8 *o,int olen,u8 *i,int ilen,int msec); -extern int vp702x_usb_inout_cmd (struct dvb_usb_device *d,u8 cmd,u8 *o,int olen,u8 *i,int ilen,int msec);extern int vp702x_usb_in_op (struct dvb_usb_device *d,u8 req,u16 value,u16 index,u8 *b,int blen); -extern int vp702x_usb_out_op (struct dvb_usb_device *d,u8 req,u16 value,u16 index,u8 *b,int blen);#endif
drivers/media/dvb/ttpci/av7110.h +0 -2
@@ -273,8 +273,6 @@ struct av7110 {extern int ChangePIDs (struct av7110 *av7110,u16 vpid,u16 apid,u16 ttpid,u16 subpid,u16 pcrpid); -extern int av7110_setup_irc_config (struct av7110 *av7110,u32 ir_config); -extern int av7110_ir_init (struct av7110 *av7110);extern void av7110_ir_exit (struct av7110 *av7110);
drivers/media/dvb/ttpci/av7110_ir.c +13 -13
@@ -155,6 +155,19 @@ static void input_repeat_key(unsigned lo } +static int av7110_setup_irc_config (struct av7110 *av7110,u32 ir_config) +{ +int ret =0 ; + +dprintk (4 ,"%p\n" , av7110); +if (av7110) { + ret =av7110_fw_cmd (av7110,COMTYPE_PIDFILTER , SetIR,1 , ir_config); + av7110->ir_config = ir_config; + } +return ret; +} + +static int av7110_ir_write_proc (struct file *file,const char __user *buffer,unsigned long count,void *data) {
@@ -187,19 +200,6 @@ static int av7110_ir_write_proc(struct f } -int av7110_setup_irc_config (struct av7110 *av7110,u32 ir_config) -{ -int ret =0 ; - -dprintk (4 ,"%p\n" , av7110); -if (av7110) { - ret =av7110_fw_cmd (av7110,COMTYPE_PIDFILTER , SetIR,1 , ir_config); - av7110->ir_config = ir_config; - } -return ret; -} - -static void ir_handler (struct av7110 *av7110,u32 ircom) {dprintk (4 ,"ircommand = %08x\n" , ircom);
PATCH 13/16 Missing break statement on tuner-core
In reply to [email protected]From: Markus Rechberger <[email protected]>
- default_tuner_init was called twice due to a missing break statement.
---
drivers/media/video/tuner-core.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/media/video/tuner-core.c +1 -0
@@ -216,6 +216,7 @@ static void set_type(struct i2c_client * buffer[3 ] =0xa4 ;i2c_master_send (c,buffer,4 );default_tuner_init (c); +break ;default :default_tuner_init (c);break ;
PATCH 14/16 fixed spelling error, exectuted --> executed.
In reply to [email protected]From: Michael Krufky <[email protected]>
- fixed spelling error, exectuted --> executed.
---
drivers/media/video/em28xx/em28xx-core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/media/video/em28xx/em28xx-core.c +1 -1
@@ -253,7 +253,7 @@ int em28xx_write_ac97(struct em28xx *devif ((ret =em28xx_read_reg (dev,AC97BUSY_REG )) <0 )return ret;else if (((u8 ) ret) &0x01 ) { -em28xx_warn ("AC97 command still being exectuted: not handled properly!\n" ); +em28xx_warn ("AC97 command still being executed: not handled properly!\n" ); }return 0 ; }
PATCH 15/16 Fix printk type warning
In reply to [email protected]From: Randy Dunlap <[email protected]>
- Fix printk type warning:drivers/media/dvb/b2c2/flexcop-pci.c:164: warning:
format '%08x' expects type 'unsigned int', but argument 4 has type 'dma_addr_t'
---
drivers/media/dvb/b2c2/flexcop-pci.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
drivers/media/dvb/b2c2/flexcop-pci.c +4 -2
@@ -161,8 +161,10 @@ static irqreturn_t flexcop_pci_isr(int i fc->read_ibi_reg (fc,dma1_008).dma_0x8.dma_cur_addr <<2 ;u32 cur_pos = cur_addr - fc_pci->dma[0 ].dma_addr0; -deb_irq ("%u irq: %08x cur_addr: %08x: cur_pos: %08x, last_cur_pos: %08x " , -jiffies_to_usecs (jiffies - fc_pci->last_irq),v.raw,cur_addr,cur_pos,fc_pci->last_dma1_cur_pos); +deb_irq ("%u irq: %08x cur_addr: %llx: cur_pos: %08x, last_cur_pos: %08x " , +jiffies_to_usecs (jiffies - fc_pci->last_irq), + v.raw, (unsigned long long )cur_addr, cur_pos, + fc_pci->last_dma1_cur_pos); fc_pci->last_irq = jiffies;/* buffer end was reached, restarted from the beginning
PATCH 16/16 changed comment in tuner-core.c
In reply to [email protected]From: Markus Rechberger <[email protected]>
- changed comment in tuner-core.c
---
drivers/media/video/tuner-core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/media/video/tuner-core.c +1 -1
@@ -449,7 +449,7 @@ static int tuner_attach(struct i2c_adaptprintk ("%02x " ,buffer[i]);printk ("\n" ); } -/* TEA5767 autodetection code - only for addr = 0xc0 */ +/* autodetection code based on the i2c addr */ if (!no_autodetect) {switch (addr) {case 0x42 :
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 06/16] Mark Typhoon cards as Lifeview OEM's
Peter,
This patch stayed for some time at CVS, the way it was commited to
-git. The changes did by nshm are trivial and generally we fold this kind of change with the original patch, since:
1) it is trivial;
2) doesn't change technically;
3) helps to keep Linux logs cleaner;
4) it is susbystem maintainers task to make sure that patches are
correct and follows v4l and Linux CodingStyle.
I think the subject could be better. In fact, this patch subject
should be to add other Lifeview OEM PCI IDs. To use current naming convention is a consequence of the patch.
Em Ter, 2006-01-24 às 21:59 +0100, Peter Missel escreveu:
Quoted 9 lines
Hi Nickolay!
Quoted 2 lines
1. User should be able to find if his card is supported (no matter OEM it or not) by searching his card name in CARDLIST
From my example, you should have a taster of where that would take us with the popular OEM cards like LifeView's.
You wouldn't believe just how many "brand" cards are actually made by them. How many "brands" of LR50 cards does the BT878 driver record?
We need to have just one convention. All patches should bound the
convention whatever it is. Of course, we can discuss the better convention for board names at v4l mailing list, but, once defined, we won't accept (or we should fix) newer patches that will not follow it.
Quoted 7 lines
Quoted 2 lines
2. We haven't invented better way to mark OEM cards yet.
I have made a suggestion on how to solve the naming problem - put the names where they logically belong, into the PCI ID structure, not the card data structure. That way, we get a 1:1 relation between each card incarnation (original or OEM) and its name.
This doesn't solve. There are several boards that don't have its own
PCI ID (They shares the original OEM vendor ID or chipset vendor ID). Also, CARDLIST.foo are generated based on .name field at cards struct.
Quoted 6 lines
Quoted 3 lines
But I understand your point, we can just remove that patch for now if you are really against this change.
We need the patch I made because it solves an actual technical problem, and I'd prefer to see it included the way I made it. Thank you.
We have two options:
1) Revert the patch from -git and start a discussion at V4L mailing
list about name convention. After archieving an agreement with this, you can resubmit the patch, with the decided name;
2) Keep this patch as is and start that discussion. After we archieve
an agreement, you can submit a patch just renaming it.
As you said this patch solves a problem, I would prefer (2).
Quoted 3 lines
regards,
Peter
Cheers,
Mauro.