diff options
| author | Michael Krufky <devnull@localhost> | 2005-12-02 04:16:47 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-12-02 04:16:47 +0000 |
| commit | eb9557684562f451a266dcdfe010c4184107a6bd (patch) | |
| tree | 5354cbc00b647506d0291d0113ba18737a3fe23c /linux/drivers/media/video/cx88/cx88-dvb.c | |
| parent | 625a0ecb23b4796b8f33e2e08bfd8fbfaad2837c (diff) | |
| download | mediapointer-dvb-s2-eb9557684562f451a266dcdfe010c4184107a6bd.tar.gz mediapointer-dvb-s2-eb9557684562f451a266dcdfe010c4184107a6bd.tar.bz2 | |
Adding support for the Hauppauge HVR1100 and HVR1100-LP products.
From: Steven Toth <stoth@hauppauge.com>
- Add support for the Hauppauge HVR1100 and HVR1100-LP products.
- Add i2c_gate_ctrl callback function to dvb_frontend_ops struct.
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-dvb.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-dvb.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c index b7bcae666..f331297d7 100644 --- a/linux/drivers/media/video/cx88/cx88-dvb.c +++ b/linux/drivers/media/video/cx88/cx88-dvb.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-dvb.c,v 1.74 2005/11/22 19:32:26 mkrufky Exp $ + * $Id: cx88-dvb.c,v 1.75 2005/12/02 04:16:47 mkrufky Exp $ * * device driver for Conexant 2388x based TV cards * MPEG Transport Stream (DVB) routines @@ -197,6 +197,14 @@ static struct cx22702_config hauppauge_novat_config = { .pll_address = 0x61, .pll_desc = &dvb_pll_thomson_dtt759x, }; +static struct cx22702_config hauppauge_hvr1100_config = { + .demod_address = 0x63, +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12) + .output_mode = CX22702_SERIAL_OUTPUT, +#endif + .pll_address = 0x61, + .pll_desc = &dvb_pll_fmd1216me, +}; #endif #ifdef HAVE_OR51132 @@ -376,6 +384,11 @@ static int dvb_register(struct cx8802_dev *dev) dev->dvb.frontend = cx22702_attach(&connexant_refboard_config, &dev->core->i2c_adap); break; + case CX88_BOARD_HAUPPAUGE_HVR1100: + case CX88_BOARD_HAUPPAUGE_HVR1100LP: + dev->dvb.frontend = cx22702_attach(&hauppauge_hvr1100_config, + &dev->core->i2c_adap); + break; #endif #ifdef HAVE_MT352 case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1: @@ -538,6 +551,9 @@ static int __devinit dvb_probe(struct pci_dev *pci_dev, err = dvb_register(dev); if (0 != err) goto fail_fini; + + /* Maintain a reference to cx88-video can query the 8802 device. */ + core->dvbdev = dev; return 0; fail_fini: @@ -553,6 +569,9 @@ static void __devexit dvb_remove(struct pci_dev *pci_dev) { struct cx8802_dev *dev = pci_get_drvdata(pci_dev); + /* Destroy any 8802 reference. */ + dev->core->dvbdev = NULL; + /* dvb */ videobuf_dvb_unregister(&dev->dvb); |