diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-12-26 13:03:44 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-12-31 06:47:27 -0500 |
| commit | fd12984456d42bf917eb9c84e47666bd9bf33fb5 (patch) | |
| tree | 3fb5bee0674b83241480f9f0b8d3261d32a5cd22 /drivers/media/dvb/frontends | |
| parent | d42c08695a3f636feb844e15efd6b653fca84e44 (diff) | |
[media] s5h1409: convert set_fontend to use DVBv5 parameters
Instead of using dvb_frontend_parameters struct, that were
designed for a subset of the supported standards, use the DVBv5
cache information.
Also, fill the supported delivery systems at dvb_frontend_ops
struct.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/frontends')
| -rw-r--r-- | drivers/media/dvb/frontends/s5h1409.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/dvb/frontends/s5h1409.c b/drivers/media/dvb/frontends/s5h1409.c index f39216ca84fa..2641fd51286d 100644 --- a/drivers/media/dvb/frontends/s5h1409.c +++ b/drivers/media/dvb/frontends/s5h1409.c | |||
| @@ -631,9 +631,9 @@ static void s5h1409_set_qam_interleave_mode_legacy(struct dvb_frontend *fe) | |||
| 631 | } | 631 | } |
| 632 | 632 | ||
| 633 | /* Talk to the demod, set the FEC, GUARD, QAM settings etc */ | 633 | /* Talk to the demod, set the FEC, GUARD, QAM settings etc */ |
| 634 | static int s5h1409_set_frontend(struct dvb_frontend *fe, | 634 | static int s5h1409_set_frontend(struct dvb_frontend *fe) |
| 635 | struct dvb_frontend_parameters *p) | ||
| 636 | { | 635 | { |
| 636 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | ||
| 637 | struct s5h1409_state *state = fe->demodulator_priv; | 637 | struct s5h1409_state *state = fe->demodulator_priv; |
| 638 | 638 | ||
| 639 | dprintk("%s(frequency=%d)\n", __func__, p->frequency); | 639 | dprintk("%s(frequency=%d)\n", __func__, p->frequency); |
| @@ -642,7 +642,7 @@ static int s5h1409_set_frontend(struct dvb_frontend *fe, | |||
| 642 | 642 | ||
| 643 | state->current_frequency = p->frequency; | 643 | state->current_frequency = p->frequency; |
| 644 | 644 | ||
| 645 | s5h1409_enable_modulation(fe, p->u.vsb.modulation); | 645 | s5h1409_enable_modulation(fe, p->modulation); |
| 646 | 646 | ||
| 647 | if (fe->ops.tuner_ops.set_params) { | 647 | if (fe->ops.tuner_ops.set_params) { |
| 648 | if (fe->ops.i2c_gate_ctrl) | 648 | if (fe->ops.i2c_gate_ctrl) |
| @@ -926,12 +926,12 @@ static int s5h1409_read_ber(struct dvb_frontend *fe, u32 *ber) | |||
| 926 | } | 926 | } |
| 927 | 927 | ||
| 928 | static int s5h1409_get_frontend(struct dvb_frontend *fe, | 928 | static int s5h1409_get_frontend(struct dvb_frontend *fe, |
| 929 | struct dvb_frontend_parameters *p) | 929 | struct dtv_frontend_properties *p) |
| 930 | { | 930 | { |
| 931 | struct s5h1409_state *state = fe->demodulator_priv; | 931 | struct s5h1409_state *state = fe->demodulator_priv; |
| 932 | 932 | ||
| 933 | p->frequency = state->current_frequency; | 933 | p->frequency = state->current_frequency; |
| 934 | p->u.vsb.modulation = state->current_modulation; | 934 | p->modulation = state->current_modulation; |
| 935 | 935 | ||
| 936 | return 0; | 936 | return 0; |
| 937 | } | 937 | } |
| @@ -996,7 +996,7 @@ error: | |||
| 996 | EXPORT_SYMBOL(s5h1409_attach); | 996 | EXPORT_SYMBOL(s5h1409_attach); |
| 997 | 997 | ||
| 998 | static struct dvb_frontend_ops s5h1409_ops = { | 998 | static struct dvb_frontend_ops s5h1409_ops = { |
| 999 | 999 | .delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B }, | |
| 1000 | .info = { | 1000 | .info = { |
| 1001 | .name = "Samsung S5H1409 QAM/8VSB Frontend", | 1001 | .name = "Samsung S5H1409 QAM/8VSB Frontend", |
| 1002 | .type = FE_ATSC, | 1002 | .type = FE_ATSC, |
| @@ -1008,8 +1008,8 @@ static struct dvb_frontend_ops s5h1409_ops = { | |||
| 1008 | 1008 | ||
| 1009 | .init = s5h1409_init, | 1009 | .init = s5h1409_init, |
| 1010 | .i2c_gate_ctrl = s5h1409_i2c_gate_ctrl, | 1010 | .i2c_gate_ctrl = s5h1409_i2c_gate_ctrl, |
| 1011 | .set_frontend_legacy = s5h1409_set_frontend, | 1011 | .set_frontend = s5h1409_set_frontend, |
| 1012 | .get_frontend_legacy = s5h1409_get_frontend, | 1012 | .get_frontend = s5h1409_get_frontend, |
| 1013 | .get_tune_settings = s5h1409_get_tune_settings, | 1013 | .get_tune_settings = s5h1409_get_tune_settings, |
| 1014 | .read_status = s5h1409_read_status, | 1014 | .read_status = s5h1409_read_status, |
| 1015 | .read_ber = s5h1409_read_ber, | 1015 | .read_ber = s5h1409_read_ber, |