aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88/cx88-dvb.c
diff options
context:
space:
mode:
authorDarron Broad <darron@kewl.org>2008-10-11 10:31:41 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-17 16:23:28 -0400
commit8e739090d6cdd43ddf938a3899c4f929db8d5ba8 (patch)
tree464c3fd04768f4f6d89763367c1f27429d18432b /drivers/media/video/cx88/cx88-dvb.c
parentf972e0bd9361594071d3e68e2342c53b51a1d42b (diff)
V4L/DVB (9225): MFE: Add configurable gate control
This adds a configurable (one per card) gate control option for multi-frontend. Prior to this point gate control was assumed to be on the primary frontend, this is a fault when the gate to the analogue section is on the secondary which is the default for both the HVR-3000 and HVR-4000 in MFE. Signed-off-by: Darron Broad <darron@kewl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx88/cx88-dvb.c')
-rw-r--r--drivers/media/video/cx88/cx88-dvb.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 58128687e5cc..9bb7bee0da6d 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -608,7 +608,10 @@ static int dvb_register(struct cx8802_dev *dev)
608 if (!fe0) 608 if (!fe0)
609 return -EINVAL; 609 return -EINVAL;
610 610
611 /* init frontend */ 611 /* multi-frontend gate control is undefined or defaults to fe0 */
612 dev->frontends.gate = 0;
613
614 /* init frontend(s) */
612 switch (core->boardnr) { 615 switch (core->boardnr) {
613 case CX88_BOARD_HAUPPAUGE_DVB_T1: 616 case CX88_BOARD_HAUPPAUGE_DVB_T1:
614 fe0->dvb.frontend = dvb_attach(cx22702_attach, 617 fe0->dvb.frontend = dvb_attach(cx22702_attach,
@@ -665,6 +668,7 @@ static int dvb_register(struct cx8802_dev *dev)
665 /* DVB-T init */ 668 /* DVB-T init */
666 fe1 = videobuf_dvb_get_frontend(&dev->frontends, 2); 669 fe1 = videobuf_dvb_get_frontend(&dev->frontends, 2);
667 if (fe1) { 670 if (fe1) {
671 dev->frontends.gate = 2;
668 fe1->dvb.frontend = dvb_attach(cx22702_attach, 672 fe1->dvb.frontend = dvb_attach(cx22702_attach,
669 &hauppauge_hvr_config, 673 &hauppauge_hvr_config,
670 &dev->core->i2c_adap); 674 &dev->core->i2c_adap);
@@ -1008,6 +1012,7 @@ static int dvb_register(struct cx8802_dev *dev)
1008 /* DVB-T Init */ 1012 /* DVB-T Init */
1009 fe1 = videobuf_dvb_get_frontend(&dev->frontends, 2); 1013 fe1 = videobuf_dvb_get_frontend(&dev->frontends, 2);
1010 if (fe1) { 1014 if (fe1) {
1015 dev->frontends.gate = 2;
1011 fe1->dvb.frontend = dvb_attach(cx22702_attach, 1016 fe1->dvb.frontend = dvb_attach(cx22702_attach,
1012 &hauppauge_hvr_config, 1017 &hauppauge_hvr_config,
1013 &dev->core->i2c_adap); 1018 &dev->core->i2c_adap);