* [PATCH 2/8] V4L/DVB (4802): Cx88: fix remote control on WinFast 2000XP Expert
2006-11-13 12:15 [PATCH 0/8] V4L/DVB fixes mchehab
@ 2006-11-13 12:18 ` mchehab
2006-11-13 12:18 ` [PATCH 1/8] V4L/DVB (4795): Tda826x: use correct max frequency mchehab
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: mchehab @ 2006-11-13 12:18 UTC (permalink / raw)
To: linux-kernel
Cc: linux-dvb-maintainer, Hermann Pitton, Michael Krufky,
Mauro Carvalho Chehab
From: Hermann Pitton <hermann-pitton@arcor.de>
fix remote control on WinFast 2000XP Expert by setting timing back to 1 ms,
like it was in the original patch by Robert Reid.
Signed-off-by: Hermann Pitton <hermann-pitton@arcor.de>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
drivers/media/video/cx88/cx88-input.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index ee48995..57e1c02 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -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;
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 1/8] V4L/DVB (4795): Tda826x: use correct max frequency
2006-11-13 12:15 [PATCH 0/8] V4L/DVB fixes mchehab
2006-11-13 12:18 ` [PATCH 2/8] V4L/DVB (4802): Cx88: fix remote control on WinFast 2000XP Expert mchehab
@ 2006-11-13 12:18 ` mchehab
2006-11-13 12:18 ` [PATCH 3/8] V4L/DVB (4804): Fix missing i2c dependency for saa7110 mchehab
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: mchehab @ 2006-11-13 12:18 UTC (permalink / raw)
To: linux-kernel
Cc: linux-dvb-maintainer, Alexey Dobriyan, Andrew Morton,
Michael Krufky, Mauro Carvalho Chehab
From: Alexey Dobriyan <adobriyan@gmail.com>
sparse "defined twice" warning
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
drivers/media/dvb/frontends/tda826x.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/media/dvb/frontends/tda826x.c b/drivers/media/dvb/frontends/tda826x.c
index eeab26b..34815b0 100644
--- a/drivers/media/dvb/frontends/tda826x.c
+++ b/drivers/media/dvb/frontends/tda826x.c
@@ -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,
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 3/8] V4L/DVB (4804): Fix missing i2c dependency for saa7110
2006-11-13 12:15 [PATCH 0/8] V4L/DVB fixes mchehab
2006-11-13 12:18 ` [PATCH 2/8] V4L/DVB (4802): Cx88: fix remote control on WinFast 2000XP Expert mchehab
2006-11-13 12:18 ` [PATCH 1/8] V4L/DVB (4795): Tda826x: use correct max frequency mchehab
@ 2006-11-13 12:18 ` mchehab
2006-11-13 12:18 ` [PATCH 6/8] V4L/DVB (4816): Change tuner type for Avermedia A16AR mchehab
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: mchehab @ 2006-11-13 12:18 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-dvb-maintainer, Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org>
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'
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
drivers/media/video/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index fbe5b61..bf26755 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -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.
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 6/8] V4L/DVB (4816): Change tuner type for Avermedia A16AR
2006-11-13 12:15 [PATCH 0/8] V4L/DVB fixes mchehab
` (2 preceding siblings ...)
2006-11-13 12:18 ` [PATCH 3/8] V4L/DVB (4804): Fix missing i2c dependency for saa7110 mchehab
@ 2006-11-13 12:18 ` mchehab
2006-11-13 12:18 ` [PATCH 8/8] V4L/DVB (4818): Flexcop-usb: fix debug printk mchehab
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: mchehab @ 2006-11-13 12:18 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-dvb-maintainer, pasky, Mauro Carvalho Chehab
From: pasky@ucw.cz <pasky@ucw.cz>
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. :-)
Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
drivers/media/video/saa7134/saa7134-cards.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 1a402e4..51f0cfd 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2969,7 +2969,7 @@ struct saa7134_board saa7134_boards[] =
/* Petr Baudis <pasky@ucw.cz> */
.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,
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 8/8] V4L/DVB (4818): Flexcop-usb: fix debug printk
2006-11-13 12:15 [PATCH 0/8] V4L/DVB fixes mchehab
` (3 preceding siblings ...)
2006-11-13 12:18 ` [PATCH 6/8] V4L/DVB (4816): Change tuner type for Avermedia A16AR mchehab
@ 2006-11-13 12:18 ` mchehab
2006-11-13 12:18 ` [PATCH 4/8] V4L/DVB (4814): Remote support for Avermedia 777 mchehab
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: mchehab @ 2006-11-13 12:18 UTC (permalink / raw)
To: linux-kernel
Cc: linux-dvb-maintainer, Alexey Dobriyan, Michael Krufky,
Mauro Carvalho Chehab
From: Alexey Dobriyan <adobriyan@gmail.com>
.. fix debug printk. Why, oh why, one would want to do
(u16 & 0xff) << 8
and print it with %02x format?
Acked-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
drivers/media/dvb/b2c2/flexcop-usb.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/media/dvb/b2c2/flexcop-usb.c b/drivers/media/dvb/b2c2/flexcop-usb.c
index 2853ea1..87fb75f 100644
--- a/drivers/media/dvb/b2c2/flexcop-usb.c
+++ b/drivers/media/dvb/b2c2/flexcop-usb.c
@@ -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,
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 4/8] V4L/DVB (4814): Remote support for Avermedia 777
2006-11-13 12:15 [PATCH 0/8] V4L/DVB fixes mchehab
` (4 preceding siblings ...)
2006-11-13 12:18 ` [PATCH 8/8] V4L/DVB (4818): Flexcop-usb: fix debug printk mchehab
@ 2006-11-13 12:18 ` mchehab
2006-11-13 12:18 ` [PATCH 5/8] V4L/DVB (4815): Remote support for Avermedia A16AR mchehab
2006-11-13 12:18 ` [PATCH 7/8] V4L/DVB (4817): Fix uses of "&&" where "&" was intended mchehab
7 siblings, 0 replies; 9+ messages in thread
From: mchehab @ 2006-11-13 12:18 UTC (permalink / raw)
To: linux-kernel
Cc: linux-dvb-maintainer, pasky, Jose Alberto Reguero, Mauro Carvalho Chehab
From: pasky@ucw.cz <pasky@ucw.cz>
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).
Signed-off-by: Jose Alberto Reguero <jareguero@telefonica.net>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
drivers/media/video/saa7134/saa7134-cards.c | 1 +
drivers/media/video/saa7134/saa7134-input.c | 8 ++++++++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index c9d8e3b..94324b3 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -3718,6 +3718,7 @@ int saa7134_board_init1(struct saa7134_d
case 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:
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index ff59911..e8dcb6f 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -194,6 +194,14 @@ int saa7134_input_init1(struct saa7134_d
saa_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;
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 5/8] V4L/DVB (4815): Remote support for Avermedia A16AR
2006-11-13 12:15 [PATCH 0/8] V4L/DVB fixes mchehab
` (5 preceding siblings ...)
2006-11-13 12:18 ` [PATCH 4/8] V4L/DVB (4814): Remote support for Avermedia 777 mchehab
@ 2006-11-13 12:18 ` mchehab
2006-11-13 12:18 ` [PATCH 7/8] V4L/DVB (4817): Fix uses of "&&" where "&" was intended mchehab
7 siblings, 0 replies; 9+ messages in thread
From: mchehab @ 2006-11-13 12:18 UTC (permalink / raw)
To: linux-kernel; +Cc: linux-dvb-maintainer, pasky, Mauro Carvalho Chehab
From: pasky@ucw.cz <pasky@ucw.cz>
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
Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
drivers/media/video/saa7134/saa7134-cards.c | 2 +-
drivers/media/video/saa7134/saa7134-input.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 94324b3..1a402e4 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -3735,6 +3735,7 @@ int saa7134_board_init1(struct saa7134_d
case 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_d
saa_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);
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index e8dcb6f..7f62403 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -185,7 +185,6 @@ int saa7134_input_init1(struct saa7134_d
case 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_d
saa_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;
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 7/8] V4L/DVB (4817): Fix uses of "&&" where "&" was intended
2006-11-13 12:15 [PATCH 0/8] V4L/DVB fixes mchehab
` (6 preceding siblings ...)
2006-11-13 12:18 ` [PATCH 5/8] V4L/DVB (4815): Remote support for Avermedia A16AR mchehab
@ 2006-11-13 12:18 ` mchehab
7 siblings, 0 replies; 9+ messages in thread
From: mchehab @ 2006-11-13 12:18 UTC (permalink / raw)
To: linux-kernel
Cc: linux-dvb-maintainer, Jean Delvare, Michael Krufky,
Mauro Carvalho Chehab
From: Jean Delvare <khali@linux-fr.org>
Fix uses of "&&" where "&" was intended in bttv-cards.c and tveeprom.c
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
drivers/media/video/bt8xx/bttv-cards.c | 2 +-
drivers/media/video/tveeprom.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index a84903e..21ebe8f 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -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.
*/
/* ----------------------------------------------------------------------- */
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index e6baaee..6b9ef73 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -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;
^ permalink raw reply [flat|nested] 9+ messages in thread