linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / media / dvb / frontends / s5h1420.c

diff --git a/drivers/media/dvb/frontends/s5h1420.c b/drivers/media/dvb/frontends/s5h1420.c
index 2c2c344..d694775 100644 (file)
--- a/drivers/media/dvb/frontends/s5h1420.c
+++ b/drivers/media/dvb/frontends/s5h1420.c
@@ -38,6 +38,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 struct s5h1420_state {
        struct i2c_adapter* i2c;
+       struct dvb_frontend_ops ops;
        const struct s5h1420_config* config;
        struct dvb_frontend frontend;
 
@@ -583,6 +584,7 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe,
        struct s5h1420_state* state = fe->demodulator_priv;
        int frequency_delta;
        struct dvb_frontend_tune_settings fesettings;
+       u32 tmp;
 
        /* check if we should do a fast-tune */
        memcpy(&fesettings.parameters, p, sizeof(struct dvb_frontend_parameters));
@@ -594,17 +596,10 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe,
            (state->fec_inner == p->u.qpsk.fec_inner) &&
            (state->symbol_rate == p->u.qpsk.symbol_rate)) {
 
-               if (fe->ops.tuner_ops.set_params) {
-                       fe->ops.tuner_ops.set_params(fe, p);
-                       if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
-               }
-               if (fe->ops.tuner_ops.get_frequency) {
-                       u32 tmp;
-                       fe->ops.tuner_ops.get_frequency(fe, &tmp);
-                       if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
+               if (state->config->pll_set) {
+                       s5h1420_writereg (state, 0x02, s5h1420_readreg(state,0x02) | 1);
+                       state->config->pll_set(fe, p, &tmp);
                        s5h1420_setfreqoffset(state, p->frequency - tmp);
-               } else {
-                       s5h1420_setfreqoffset(state, 0);
                }
                return 0;
        }
@@ -651,9 +646,9 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe,
        s5h1420_writereg(state, 0x05, s5h1420_readreg(state, 0x05) | 1);
 
        /* set tuner PLL */
-       if (fe->ops.tuner_ops.set_params) {
-               fe->ops.tuner_ops.set_params(fe, p);
-               if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
+       if (state->config->pll_set) {
+               s5h1420_writereg (state, 0x02, s5h1420_readreg(state,0x02) | 1);
+               state->config->pll_set(fe, p, &tmp);
                s5h1420_setfreqoffset(state, 0);
        }
 
@@ -713,17 +708,6 @@ static int s5h1420_get_tune_settings(struct dvb_frontend* fe,
        return 0;
 }
 
-static int s5h1420_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)
-{
-       struct s5h1420_state* state = fe->demodulator_priv;
-
-       if (enable) {
-               return s5h1420_writereg (state, 0x02, s5h1420_readreg(state,0x02) | 1);
-       } else {
-               return s5h1420_writereg (state, 0x02, s5h1420_readreg(state,0x02) & 0xfe);
-       }
-}
-
 static int s5h1420_init (struct dvb_frontend* fe)
 {
        struct s5h1420_state* state = fe->demodulator_priv;
@@ -733,6 +717,13 @@ static int s5h1420_init (struct dvb_frontend* fe)
        msleep(10);
        s5h1420_reset(state);
 
+       /* init PLL */
+       if (state->config->pll_init) {
+               s5h1420_writereg (state, 0x02, s5h1420_readreg(state,0x02) | 1);
+               state->config->pll_init(fe);
+               s5h1420_writereg (state, 0x02, s5h1420_readreg(state,0x02) & 0xfe);
+       }
+
        return 0;
 }
 
@@ -765,6 +756,7 @@ struct dvb_frontend* s5h1420_attach(const struct s5h1420_config* config,
        /* setup the state */
        state->config = config;
        state->i2c = i2c;
+       memcpy(&state->ops, &s5h1420_ops, sizeof(struct dvb_frontend_ops));
        state->postlocked = 0;
        state->fclk = 88000000;
        state->tunedfreq = 0;
@@ -777,7 +769,7 @@ struct dvb_frontend* s5h1420_attach(const struct s5h1420_config* config,
                goto error;
 
        /* create dvb_frontend */
-       memcpy(&state->frontend.ops, &s5h1420_ops, sizeof(struct dvb_frontend_ops));
+       state->frontend.ops = &state->ops;
        state->frontend.demodulator_priv = state;
        return &state->frontend;
 
@@ -808,7 +800,6 @@ static struct dvb_frontend_ops s5h1420_ops = {
 
        .init = s5h1420_init,
        .sleep = s5h1420_sleep,
-       .i2c_gate_ctrl = s5h1420_i2c_gate_ctrl,
 
        .set_frontend = s5h1420_set_frontend,
        .get_frontend = s5h1420_get_frontend,