diff options
author | Mauro Carvalho Chehab <devnull@localhost> | 2005-12-05 02:31:46 +0000 |
---|---|---|
committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-12-05 02:31:46 +0000 |
commit | 612c907e788235feb98ab5fa3f4610f57f588ad7 (patch) | |
tree | e2e2cd73e8013e94867a1ea3942d40146f8ddc05 /linux/drivers/media/video/cx88/cx88-cards.c | |
parent | 59f6dfc471e70d46707befa95db7a23472fb90e2 (diff) | |
download | mediapointer-dvb-s2-612c907e788235feb98ab5fa3f4610f57f588ad7.tar.gz mediapointer-dvb-s2-612c907e788235feb98ab5fa3f4610f57f588ad7.tar.bz2 |
Several fixes for Hauppauge Roselyn Design (blackbird)
From: Steven Toth <stoth@hauppauge.com>
- This patch adds eeprom awareness for the Roslyn. In effect, the
blackbird will query the tuner V4L2_STD_xxxx definitions to determine
whether it's connected to a NTSC or PAL tuner. Based on that, various
default values will change for blackbird encoding.
- Fixes back panel SVIDEO/COMPOSITE with audio, work properly.
- Fixes a problem with lip sync issues, due to bad framerate vs
audio rate assumptions.
- Fixed a problem with the GPIO configuration in cx88-cards.
- Removed the comments in cx88-cards that made no sense.
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-cards.c')
-rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 67f697c80..c251ffbfe 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-cards.c,v 1.112 2005/12/02 04:38:14 mkrufky Exp $ + * $Id: cx88-cards.c,v 1.113 2005/12/05 02:31:46 mchehab Exp $ * * device driver for Conexant 2388x based TV cards * card-specific stuff. @@ -613,12 +613,12 @@ struct cx88_board cx88_boards[] = { .input = {{ .type = CX88_VMUX_TELEVISION, .vmux = 0, - .gpio0 = 0xed12, /* internal decoder */ + .gpio0 = 0xed1a, .gpio2 = 0x00ff, },{ .type = CX88_VMUX_DEBUG, .vmux = 0, - .gpio0 = 0xff01, /* mono from tuner chip */ + .gpio0 = 0xff01, },{ .type = CX88_VMUX_COMPOSITE1, .vmux = 1, @@ -1204,11 +1204,13 @@ static void hauppauge_eeprom(struct cx88_core *core, u8 *eeprom_data) tveeprom_hauppauge_analog(&core->i2c_client, &tv, eeprom_data); core->tuner_type = tv.tuner_type; + core->tuner_formats = tv.tuner_formats; core->has_radio = tv.has_radio; /* Make sure we support the board model */ switch (tv.model) { + case 28552: /* WinTV-PVR 'Roslyn' (No IR) */ case 90002: /* Nova-T-PCI (9002) */ case 92001: /* Nova-S-Plus (Video and IR) */ case 92002: /* Nova-S-Plus (Video and IR) */ |