diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-03-25 12:04:18 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-03-25 12:04:18 -0300 |
| commit | c72566b0b7d46f2f44806ce248c168c67b7418dd (patch) | |
| tree | 001913516ee3442a5be26f2ac3c7919b8f88b65f /linux/drivers/media/dvb/frontends | |
| parent | c385f35b24d3e17968392a94bc5b22517880603f (diff) | |
| download | mediapointer-dvb-s2-c72566b0b7d46f2f44806ce248c168c67b7418dd.tar.gz mediapointer-dvb-s2-c72566b0b7d46f2f44806ce248c168c67b7418dd.tar.bz2 | |
Reverted changeset 5463
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/frontends')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/nxt200x.c | 17 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/frontends/nxt200x.h | 4 |
2 files changed, 9 insertions, 12 deletions
diff --git a/linux/drivers/media/dvb/frontends/nxt200x.c b/linux/drivers/media/dvb/frontends/nxt200x.c index de4bc0156..87c286ee6 100644 --- a/linux/drivers/media/dvb/frontends/nxt200x.c +++ b/linux/drivers/media/dvb/frontends/nxt200x.c @@ -560,20 +560,18 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe, if (state->config->set_ts_params) state->config->set_ts_params(fe, 1); - /* set input for TUV1236d */ - if (state->config->is_tuv1236d) { - buf[4] |= 0x08; - } + /* set input */ + if (state->config->set_pll_input) + state->config->set_pll_input(buf, 1); break; case VSB_8: /* Set non-punctured clock for VSB */ if (state->config->set_ts_params) state->config->set_ts_params(fe, 0); - /* reset input for TUV1236d */ - if (state->config->is_tuv1236d) { - buf[4] &= ~0x08; - } + /* set input */ + if (state->config->set_pll_input) + state->config->set_pll_input(buf, 0); break; default: return -EINVAL; @@ -581,8 +579,7 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe, } /* write frequency information */ - if (fe->ops.tuner_ops.calc_regs) - nxt200x_writetuner(state, buf); + nxt200x_writetuner(state, buf); /* reset the agc now that tuning has been completed */ nxt200x_agc_reset(state); diff --git a/linux/drivers/media/dvb/frontends/nxt200x.h b/linux/drivers/media/dvb/frontends/nxt200x.h index 335451ca5..28bc5591b 100644 --- a/linux/drivers/media/dvb/frontends/nxt200x.h +++ b/linux/drivers/media/dvb/frontends/nxt200x.h @@ -38,8 +38,8 @@ struct nxt200x_config /* the demodulator's i2c address */ u8 demod_address; - /* TUV1236d need a different initialization */ - int is_tuv1236d:1; + /* used to set pll input */ + int (*set_pll_input)(u8* buf, int input); /* need to set device param for start_dma */ int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured); |