V4L/DVB fixes
cover V4L/DVB fixes
Linus,
Please pull 'master' from:
git://git.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git master
It contains the following:
Building system fix:
- Fix missing i2c dependency for saa7110
Bad usage of &:
- Fix uses of "&&" where "&" was intended
- Flexcop-usb: fix debug printk
Trivial fixes at media drivers:
- Tda826x: use correct max frequency
- Change tuner type for Avermedia A16AR
IR trivial fixes:
- Cx88: fix remote control on WinFast 2000XP Expert
- Remote support for Avermedia 777
- Remote support for Avermedia A16AR
Cheers,
Mauro.
V4L/DVB development is hosted at http://linuxtv.org
---
drivers/media/dvb/b2c2/flexcop-usb.c | 2 +- drivers/media/dvb/frontends/tda826x.c | 2 +- drivers/media/video/Kconfig | 2 +- drivers/media/video/bt8xx/bttv-cards.c | 2 +- drivers/media/video/cx88/cx88-input.c | 10 ++++++++-- drivers/media/video/saa7134/saa7134-cards.c | 5 +++-- drivers/media/video/saa7134/saa7134-input.c | 10 +++++++++- drivers/media/video/tveeprom.c | 2 +- 8 files changed, 25 insertions(+), 10 deletions(-)
PATCH 1/8 V4L/DVB (4795): Tda826x: use correct max frequency
From: Alexey Dobriyan <[email protected]>
sparse "defined twice" warning
---
drivers/media/dvb/frontends/tda826x.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/media/dvb/frontends/tda826x.c +1 -1
@@ -121,7 +121,7 @@ static struct dvb_tuner_ops tda826x_tune .info = { .name = "Philips TDA826X", .frequency_min = 950000, - .frequency_min =2175000 + .frequency_max =2175000 }, .release = tda826x_release, .sleep = tda826x_sleep,
PATCH 2/8 V4L/DVB (4802): Cx88: fix remote control on WinFast 2000XP Expert
In reply to [email protected]From: Hermann Pitton <[email protected]>
fix remote control on WinFast 2000XP Expert by setting timing back to 1 ms, like it was in the original patch by Robert Reid.
---
drivers/media/video/cx88/cx88-input.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)
drivers/media/video/cx88/cx88-input.c +8 -2
@@ -202,13 +202,19 @@ int cx88_ir_init(struct cx88_core *core, ir->sampling =1 ;break ;case CX88_BOARD_WINFAST_DTV2000H : -case CX88_BOARD_WINFAST2000XP_EXPERT : ir_codes = ir_codes_winfast; ir->gpio_addr =MO_GP0_IO ; ir->mask_keycode =0x8f8 ; ir->mask_keyup =0x100 ; ir->polling =50 ;/* ms */ break ; +case CX88_BOARD_WINFAST2000XP_EXPERT : + ir_codes = ir_codes_winfast; + ir->gpio_addr =MO_GP0_IO ; + ir->mask_keycode =0x8f8 ; + ir->mask_keyup =0x100 ; + ir->polling =1 ;/* ms */ +break ;case CX88_BOARD_IODATA_GVBCTV7E : ir_codes = ir_codes_iodata_bctv7e; ir->gpio_addr =MO_GP0_IO ;
@@ -216,7 +222,7 @@ int cx88_ir_init(struct cx88_core *core, ir->mask_keydown =0x02 ; ir->polling =5 ;/* ms */ break ; -case CX88_BOARD_PROLINK_PLAYTVPVR : +case CX88_BOARD_PROLINK_PLAYTVPVR :case CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO : ir_codes = ir_codes_pixelview; ir->gpio_addr =MO_GP1_IO ;
PATCH 3/8 V4L/DVB (4804): Fix missing i2c dependency for saa7110
In reply to [email protected]From: Mauro Carvalho Chehab <[email protected]>
drivers/media/video/saa7110.c:112: undefined reference to i2c_master_send' drivers/built-in.o: In function saa7110_read':drivers/media/video/saa7110.c:130: undefined reference to i2c_smbus_read_byte' drivers/media/video/saa7110.c:130: undefined reference to i2c_smbus_read_byte'
---
drivers/media/video/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/media/video/Kconfig +1 -1
@@ -186,7 +186,7 @@ config VIDEO_KS0127 config VIDEO_SAA7110 tristate "Philips SAA7110 video decoder" - depends on VIDEO_V4L1 + depends on VIDEO_V4L1 && I2C ---help--- Support for the Philips SAA7110 video decoders.
PATCH 4/8 V4L/DVB (4814): Remote support for Avermedia 777
In reply to [email protected]From: [email protected] <[email protected]>
I didn't test it personally since I don't have this card, but A16AR uses the same interface and that one certainly does work perfectly (see the next patch). This patch was originally sent in
http://marc.theaimsgroup.com/?l=linux-video&m=114743413825375&w=2 https://www.redhat.com/mailman/private/video4linux-list/2006-May/msg00103.html
but never got applied. This version has some trivial modifications and drops the weird gpio hack (it's not clear what practical purpose does it serve).
---
drivers/media/video/saa7134/saa7134-cards.c | 1 + drivers/media/video/saa7134/saa7134-input.c | 8 ++++++++ 2 files changed, 9 insertions(+), 0 deletions(-)
drivers/media/video/saa7134/saa7134-cards.c +1 -0
@@ -3718,6 +3718,7 @@ int saa7134_board_init1(struct saa7134_dcase SAA7134_BOARD_AVERMEDIA_STUDIO_307 :case SAA7134_BOARD_AVERMEDIA_307 :case SAA7134_BOARD_AVERMEDIA_GO_007_FM : +case SAA7134_BOARD_AVERMEDIA_777 :/* case SAA7134_BOARD_SABRENT_SBTTVFM: */ /* not finished yet */ case SAA7134_BOARD_VIDEOMATE_TV_PVR :case SAA7134_BOARD_VIDEOMATE_GOLD_PLUS :
drivers/media/video/saa7134/saa7134-input.c +8 -0
@@ -194,6 +194,14 @@ int saa7134_input_init1(struct saa7134_dsaa_setb (SAA7134_GPIO_GPMODE0 ,0x4 );saa_setb (SAA7134_GPIO_GPSTATUS0 ,0x4 );break ; +case SAA7134_BOARD_AVERMEDIA_777 : + ir_codes = ir_codes_avermedia; + mask_keycode =0x02F200 ; + mask_keydown =0x000400 ; + polling =50 ;// ms +/* Without this we won't receive key up events */ +saa_setb (SAA7134_GPIO_GPMODE1 ,0x1 ); +saa_setb (SAA7134_GPIO_GPSTATUS1 ,0x1 );case SAA7134_BOARD_KWORLD_TERMINATOR : ir_codes = ir_codes_pixelview; mask_keycode =0x00001f ;
PATCH 5/8 V4L/DVB (4815): Remote support for Avermedia A16AR
In reply to [email protected]From: [email protected] <[email protected]>
The remote as well as the GPIO interface is the same as what comes with 777. For an example of mplayer lirc configuration, see
http://pasky.or.cz/~pasky/dev/v4l/lircrc
---
drivers/media/video/saa7134/saa7134-cards.c | 2 +- drivers/media/video/saa7134/saa7134-input.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/media/video/saa7134/saa7134-cards.c +1 -1
@@ -3735,6 +3735,7 @@ int saa7134_board_init1(struct saa7134_dcase SAA7134_BOARD_FLYDVBT_LR301 :case SAA7134_BOARD_FLYDVBTDUO :case SAA7134_BOARD_PROTEUS_2309 : +case SAA7134_BOARD_AVERMEDIA_A16AR : dev->has_remote =SAA7134_REMOTE_GPIO ;break ;case SAA7134_BOARD_FLYDVBS_LR300 :
@@ -3773,7 +3774,6 @@ int saa7134_board_init1(struct saa7134_dsaa_writeb (SAA7134_GPIO_GPMODE3 ,0x08 );saa_writeb (SAA7134_GPIO_GPSTATUS3 ,0x00 );break ; -case SAA7134_BOARD_AVERMEDIA_A16AR :case SAA7134_BOARD_AVERMEDIA_CARDBUS :/* power-up tuner chip */ saa_andorl (SAA7134_GPIO_GPMODE0 >>2 ,0xffffffff ,0xffffffff );
drivers/media/video/saa7134/saa7134-input.c +1 -1
@@ -185,7 +185,6 @@ int saa7134_input_init1(struct saa7134_dcase SAA7134_BOARD_AVERMEDIA_STUDIO_305 :case SAA7134_BOARD_AVERMEDIA_STUDIO_307 :case SAA7134_BOARD_AVERMEDIA_GO_007_FM : -case SAA7134_BOARD_AVERMEDIA_A16AR : ir_codes = ir_codes_avermedia; mask_keycode =0x0007C8 ; mask_keydown =0x000010 ;
@@ -195,6 +194,7 @@ int saa7134_input_init1(struct saa7134_dsaa_setb (SAA7134_GPIO_GPSTATUS0 ,0x4 );break ;case SAA7134_BOARD_AVERMEDIA_777 : +case SAA7134_BOARD_AVERMEDIA_A16AR : ir_codes = ir_codes_avermedia; mask_keycode =0x02F200 ; mask_keydown =0x000400 ;
PATCH 6/8 V4L/DVB (4816): Change tuner type for Avermedia A16AR
In reply to [email protected]From: [email protected] <[email protected]>
This changes it from TDA8290 which is allegedly very unlikely to TD1316 which is allegedly very likely. I didn't get it to work with either, but expected that this got applied when Mauro sent it to me, so here it goes again; feel free to drop it to the floor. :-)
---
drivers/media/video/saa7134/saa7134-cards.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/media/video/saa7134/saa7134-cards.c +1 -1
@@ -2969,7 +2969,7 @@ struct saa7134_board saa7134_boards[] =/* Petr Baudis <[email protected]> */ .name = "AVerMedia TV Hybrid A16AR", .audio_clock = 0x187de7, - .tuner_type = TUNER_PHILIPS_TDA8290, /* untested */ + .tuner_type = TUNER_PHILIPS_TD1316, /* untested */ .radio_type = TUNER_TEA5767, /* untested */ .tuner_addr = ADDR_UNSET, .radio_addr = ADDR_UNSET,
PATCH 7/8 V4L/DVB (4817): Fix uses of "&&" where "&" was intended
In reply to [email protected]From: Jean Delvare <[email protected]>
Fix uses of "&&" where "&" was intended in bttv-cards.c and tveeprom.c
---
drivers/media/video/bt8xx/bttv-cards.c | 2 +- drivers/media/video/tveeprom.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/media/video/bt8xx/bttv-cards.c +1 -1
@@ -4001,7 +4001,7 @@ static void __devinit init_PXC200(struct* - sleep 1ms * - write 0x0E * read from GPIO_DATA into buf (uint_32) -* - if ( buf>>18 & 0x01 ) || ( buf>>19 && 0x01 != 0 ) +* - if ( buf>>18 & 0x01 ) || ( buf>>19 & 0x01 != 0 ) * error. ERROR_CPLD_Check_Failed. */ /* ----------------------------------------------------------------------- */
drivers/media/video/tveeprom.c +1 -1
@@ -468,7 +468,7 @@ void tveeprom_hauppauge_analog(struct i2 (eeprom_data[i+6 ] <<8 ) + (eeprom_data[i+7 ] <<16 ); -if ( (eeprom_data[i +8 ] &&0xf0 ) && +if ( (eeprom_data[i +8 ] &0xf0 ) && (tvee->serial_number <0xffffff ) ) { tvee->MAC_address[0 ] =0x00 ; tvee->MAC_address[1 ] =0x0D ;
PATCH 8/8 V4L/DVB (4818): Flexcop-usb: fix debug printk
In reply to [email protected]From: Alexey Dobriyan <[email protected]>
.. fix debug printk. Why, oh why, one would want to do
(u16 & 0xff) << 8
and print it with %02x format?
---
drivers/media/dvb/b2c2/flexcop-usb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/media/dvb/b2c2/flexcop-usb.c +1 -1
@@ -246,7 +246,7 @@ static int flexcop_usb_i2c_req(struct fl wIndex = (chipaddr <<8 ) | addr;deb_i2c ("i2c %2d: %02x %02x %02x %02x %02x %02x\n" ,func,request_type,req, - ((wValue &&0xff ) <<8 ),wValue >>8 ,((wIndex &&0xff ) <<8 ),wIndex >>8 ); + wValue &0xff , wValue >>8 , wIndex &0xff , wIndex >>8 ); len = usb_control_msg(fc_usb->udev,pipe, req,