diff options
| author | Andrew de Quincey <adq_dvb@lidskialf.net> | 2006-05-16 21:22:02 +0100 |
|---|---|---|
| committer | Andrew de Quincey <adq_dvb@lidskialf.net> | 2006-05-16 21:22:02 +0100 |
| commit | 7b2b6e9be7a9c4c8ba356cfed999b6283579c7ae (patch) | |
| tree | 4bb05b3af93e5ed910863b872e3f69102bbc7baf /linux/drivers/media/video/saa7134/saa7134-dvb.c | |
| parent | 09face28b78569cdcc7c6ab30a96e8548c85f319 (diff) | |
| download | mediapointer-dvb-s2-7b2b6e9be7a9c4c8ba356cfed999b6283579c7ae.tar.gz mediapointer-dvb-s2-7b2b6e9be7a9c4c8ba356cfed999b6283579c7ae.tar.bz2 | |
Fix Pinnacle 300i
From: Andrew de Quincey <adq_dvb@lidskialf.net>
I had broken the mt352 tuning when a non-directly connected PLL was used -
uncommon, but this is what is used on the pinnacle card.
Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-dvb.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-dvb.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c index ea0a1290d..f5cdbf027 100644 --- a/linux/drivers/media/video/saa7134/saa7134-dvb.c +++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c @@ -133,9 +133,8 @@ static int mt352_aver777_init(struct dvb_frontend* fe) return 0; } -static int mt352_pinnacle_tuner_calc_regs(struct dvb_frontend* fe, - struct dvb_frontend_parameters* params, - u8* pllbuf, int buf_len) +static int mt352_pinnacle_tuner_set_params(struct dvb_frontend* fe, + struct dvb_frontend_parameters* params) { u8 off[] = { 0x00, 0xf1}; u8 on[] = { 0x00, 0x71}; @@ -144,9 +143,6 @@ static int mt352_pinnacle_tuner_calc_regs(struct dvb_frontend* fe, struct saa7134_dev *dev = fe->dvb->priv; struct v4l2_frequency f; - if (buf_len < 5) - return -EINVAL; - /* set frequency (mt2050) */ f.tuner = 0; f.type = V4L2_TUNER_DIGITAL_TV; @@ -163,13 +159,7 @@ static int mt352_pinnacle_tuner_calc_regs(struct dvb_frontend* fe, pinnacle_antenna_pwr(dev, antenna_pwr); /* mt352 setup */ - mt352_pinnacle_init(fe); - pllbuf[0] = 0x61; - pllbuf[1] = 0x00; - pllbuf[2] = 0x00; - pllbuf[3] = 0x80; - pllbuf[4] = 0x00; - return 5; + return mt352_pinnacle_init(fe); } static int mt352_aver777_tuner_calc_regs(struct dvb_frontend *fe, struct dvb_frontend_parameters *params, u8* pllbuf, int buf_len) @@ -1026,7 +1016,7 @@ static int dvb_init(struct saa7134_dev *dev) dev->dvb.frontend = mt352_attach(&pinnacle_300i, &dev->i2c_adap); if (dev->dvb.frontend) { - dev->dvb.frontend->ops->tuner_ops.calc_regs = mt352_pinnacle_tuner_calc_regs; + dev->dvb.frontend->ops->tuner_ops.set_params = mt352_pinnacle_tuner_set_params; } break; |