diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-22 13:34:10 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-22 13:34:10 -0300 |
| commit | fd4323811c298ab794afc6e13719ba331bc0b740 (patch) | |
| tree | 12656b08ffdae9ff5742d699b270f77e2e54d485 /linux/drivers/media/video/cx88/cx88-blackbird.c | |
| parent | 7fcf69dab28d0e73c9c2bb5744b884001faddb09 (diff) | |
| parent | c9eef42f5449ab1894a458988661f433624ccb81 (diff) | |
| download | mediapointer-dvb-s2-fd4323811c298ab794afc6e13719ba331bc0b740.tar.gz mediapointer-dvb-s2-fd4323811c298ab794afc6e13719ba331bc0b740.tar.bz2 | |
merge: http://linuxtv.org/hg/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-blackbird.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-blackbird.c | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-blackbird.c b/linux/drivers/media/video/cx88/cx88-blackbird.c index e1e9580b2..73580db8b 100644 --- a/linux/drivers/media/video/cx88/cx88-blackbird.c +++ b/linux/drivers/media/video/cx88/cx88-blackbird.c @@ -1719,12 +1719,25 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev, memcpy(&dev->params,&default_mpeg_params,sizeof(default_mpeg_params)); memcpy(&dev->dnr_params,&default_dnr_params,sizeof(default_dnr_params)); - if (core->tuner_formats & V4L2_STD_525_60) { - dev->height = 480; - dev->params.vi_frame_rate = 30; - } else { - dev->height = 576; - dev->params.vi_frame_rate = 25; + switch (core->board) { + case CX88_BOARD_HAUPPAUGE_ROSLYN: + if (core->tuner_formats & V4L2_STD_525_60) { + dev->height = 480; + dev->params.vi_frame_rate = 30; + } else { + dev->height = 576; + dev->params.vi_frame_rate = 25; + } + break; + case CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT: + if (core->tvnorm->id & V4L2_STD_525_60) { + dev->height = 480; + dev->params.vi_frame_rate = 30; + } else { + dev->height = 576; + dev->params.vi_frame_rate = 25; + } + break; } err = cx8802_init_common(dev); |