diff options
| author | Gerd Knorr <devnull@localhost> | 2005-01-03 18:56:19 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2005-01-03 18:56:19 +0000 |
| commit | 1bbc067b98c7c1e71836fc3487f1821dcf186cf0 (patch) | |
| tree | eea23a1d298a75dae0fc20eba31a3221eb4b7d1f /linux/drivers/media/video | |
| parent | 379530f55fe7f4d59be8c7d2979fcf832f1347ba (diff) | |
| download | mediapointer-dvb-s2-1bbc067b98c7c1e71836fc3487f1821dcf186cf0.tar.gz mediapointer-dvb-s2-1bbc067b98c7c1e71836fc3487f1821dcf186cf0.tar.bz2 | |
- misc.
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 10 | ||||
| -rw-r--r-- | linux/drivers/media/video/tda9887.c | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index be57aeb30..81f9d0aa1 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.54 2005/01/03 17:46:20 kraxel Exp $ + * $Id: cx88-cards.c,v 1.55 2005/01/03 18:56:19 kraxel Exp $ * * device driver for Conexant 2388x based TV cards * card-specific stuff. @@ -327,14 +327,15 @@ struct cx88_board cx88_boards[] = { .name = "KWorld/VStream XPert DVB-T", .tuner_type = TUNER_ABSENT, .input = {{ - .type = CX88_VMUX_DVB, - .vmux = 0, - },{ .type = CX88_VMUX_COMPOSITE1, .vmux = 1, + .gpio0 = 0x0700, + .gpio2 = 0x0101, },{ .type = CX88_VMUX_SVIDEO, .vmux = 2, + .gpio0 = 0x0700, + .gpio2 = 0x0101, }}, .dvb = 1, }, @@ -879,6 +880,7 @@ void cx88_card_setup(struct cx88_core *core) core->pll_addr = 0x60; core->pll_desc = &dvb_pll_thomson_dtt7579; break; + case CX88_BOARD_KWORLD_DVB_T: case CX88_BOARD_DNTV_LIVE_DVB_T: cx_set(MO_GP0_IO, 0x00000707); cx_set(MO_GP2_IO, 0x00000101); diff --git a/linux/drivers/media/video/tda9887.c b/linux/drivers/media/video/tda9887.c index 39850d9b3..e5c67036f 100644 --- a/linux/drivers/media/video/tda9887.c +++ b/linux/drivers/media/video/tda9887.c @@ -447,14 +447,14 @@ static int tda9887_set_pinnacle(struct tda9887 *t, char *buf) { unsigned int bCarrierMode = UNSET; - if (t->std & V4L2_STD_PAL) { + if (t->std & V4L2_STD_625_50) { if ((1 == t->pinnacle_id) || (7 == t->pinnacle_id)) { bCarrierMode = cIntercarrier; } else { bCarrierMode = cQSS; } } - if (t->std & V4L2_STD_NTSC) { + if (t->std & V4L2_STD_525_60) { if ((5 == t->pinnacle_id) || (6 == t->pinnacle_id)) { bCarrierMode = cIntercarrier; } else { |