]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
V4L/DVB (3889): Sort out support for non-attached tuners on mt352
authorAndrew de Quincey <adq_dvb@lidskialf.net>
Tue, 18 Apr 2006 20:47:12 +0000 (17:47 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Sun, 25 Jun 2006 04:59:17 +0000 (01:59 -0300)
Make it use set_params/pllbuf as appropriate so it works with
dvb_pll_attach()ed tuners.

Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/dvb/frontends/mt352.c

index a7a347a3cad0ec26ecae4b5c7d030e6f480cce6a..3c86018e7f9db35b2d10fa1499ebfac9c5c2a930 100644 (file)
@@ -287,18 +287,32 @@ static int mt352_set_parameters(struct dvb_frontend* fe,
        mt352_calc_nominal_rate(state, op->bandwidth, buf+4);
        mt352_calc_input_freq(state, buf+6);
 
+       // if there is no secondary tuner, call set_params to set up a potential
+       // tuner attached elsewhere
+       if (state->config.no_tuner) {
+               if (fe->ops->tuner_ops.set_params) {
+                       fe->ops->tuner_ops.set_params(fe, param);
+                       if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+               }
+
+               /* start decoding only */
+               mt352_write(fe, fsm_go, 2);
+       }
+
+       // retrieve the pllbuf - we do this even if there is no
+       // secondary tuner simply so we have a record of what was sent for
+       // debugging.
        if (fe->ops->tuner_ops.pllbuf) {
                fe->ops->tuner_ops.pllbuf(fe, param, buf+8, 5);
                buf[8] <<= 1;
                mt352_write(fe, buf, sizeof(buf));
        }
-       if (state->config.no_tuner) {
-               /* start decoding */
-               mt352_write(fe, fsm_go, 2);
-       } else {
-               /* start tuning */
+
+       // send PLL and start tuning and then decoding
+       if (!state->config.no_tuner) {
                mt352_write(fe, tuner_go, 2);
        }
+
        return 0;
 }