diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-12-22 18:38:27 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-12-31 06:16:43 -0500 |
| commit | 490ecd635e8ec4aa9619cbed736934f07f4ef62f (patch) | |
| tree | 567558531885b5c6c6443ab1b276a679be00409e /drivers/media/dvb/frontends/dib8000.c | |
| parent | fe08492935e6b20fc2e30ced262acb0546b32e0f (diff) | |
[media] dib8000: Remove the old DVBv3 struct from it and add delsys
This driver only uses the DVBv5 struct. All it needs is to remove
the non-used params var, and to add the ISDB-T to the delivery
systems.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/frontends/dib8000.c')
| -rw-r--r-- | drivers/media/dvb/frontends/dib8000.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/media/dvb/frontends/dib8000.c b/drivers/media/dvb/frontends/dib8000.c index 98600628b1e9..115c099d9d28 100644 --- a/drivers/media/dvb/frontends/dib8000.c +++ b/drivers/media/dvb/frontends/dib8000.c | |||
| @@ -2810,7 +2810,7 @@ int dib8000_set_tune_state(struct dvb_frontend *fe, enum frontend_tune_state tun | |||
| 2810 | } | 2810 | } |
| 2811 | EXPORT_SYMBOL(dib8000_set_tune_state); | 2811 | EXPORT_SYMBOL(dib8000_set_tune_state); |
| 2812 | 2812 | ||
| 2813 | static int dib8000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep) | 2813 | static int dib8000_get_frontend(struct dvb_frontend *fe, struct dtv_frontend_properties *c) |
| 2814 | { | 2814 | { |
| 2815 | struct dib8000_state *state = fe->demodulator_priv; | 2815 | struct dib8000_state *state = fe->demodulator_priv; |
| 2816 | u16 i, val = 0; | 2816 | u16 i, val = 0; |
| @@ -2824,7 +2824,7 @@ static int dib8000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par | |||
| 2824 | if (stat&FE_HAS_SYNC) { | 2824 | if (stat&FE_HAS_SYNC) { |
| 2825 | dprintk("TMCC lock on the slave%i", index_frontend); | 2825 | dprintk("TMCC lock on the slave%i", index_frontend); |
| 2826 | /* synchronize the cache with the other frontends */ | 2826 | /* synchronize the cache with the other frontends */ |
| 2827 | state->fe[index_frontend]->ops.get_frontend_legacy(state->fe[index_frontend], fep); | 2827 | state->fe[index_frontend]->ops.get_frontend(state->fe[index_frontend], c); |
| 2828 | for (sub_index_frontend = 0; (sub_index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[sub_index_frontend] != NULL); sub_index_frontend++) { | 2828 | for (sub_index_frontend = 0; (sub_index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[sub_index_frontend] != NULL); sub_index_frontend++) { |
| 2829 | if (sub_index_frontend != index_frontend) { | 2829 | if (sub_index_frontend != index_frontend) { |
| 2830 | state->fe[sub_index_frontend]->dtv_property_cache.isdbt_sb_mode = state->fe[index_frontend]->dtv_property_cache.isdbt_sb_mode; | 2830 | state->fe[sub_index_frontend]->dtv_property_cache.isdbt_sb_mode = state->fe[index_frontend]->dtv_property_cache.isdbt_sb_mode; |
| @@ -2956,7 +2956,7 @@ static int dib8000_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_par | |||
| 2956 | return 0; | 2956 | return 0; |
| 2957 | } | 2957 | } |
| 2958 | 2958 | ||
| 2959 | static int dib8000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep) | 2959 | static int dib8000_set_frontend(struct dvb_frontend *fe) |
| 2960 | { | 2960 | { |
| 2961 | struct dib8000_state *state = fe->demodulator_priv; | 2961 | struct dib8000_state *state = fe->demodulator_priv; |
| 2962 | u8 nbr_pending, exit_condition, index_frontend; | 2962 | u8 nbr_pending, exit_condition, index_frontend; |
| @@ -3088,7 +3088,7 @@ static int dib8000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par | |||
| 3088 | 3088 | ||
| 3089 | dprintk("tune success on frontend%i", index_frontend_success); | 3089 | dprintk("tune success on frontend%i", index_frontend_success); |
| 3090 | 3090 | ||
| 3091 | dib8000_get_frontend(fe, fep); | 3091 | dib8000_get_frontend(fe, &state->fe[0]->dtv_property_cache); |
| 3092 | } | 3092 | } |
| 3093 | 3093 | ||
| 3094 | for (index_frontend = 0, ret = 0; (ret >= 0) && (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) | 3094 | for (index_frontend = 0, ret = 0; (ret >= 0) && (index_frontend < MAX_NUMBER_OF_FRONTENDS) && (state->fe[index_frontend] != NULL); index_frontend++) |
| @@ -3461,6 +3461,7 @@ int dib8000_pid_filter(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff) | |||
| 3461 | EXPORT_SYMBOL(dib8000_pid_filter); | 3461 | EXPORT_SYMBOL(dib8000_pid_filter); |
| 3462 | 3462 | ||
| 3463 | static const struct dvb_frontend_ops dib8000_ops = { | 3463 | static const struct dvb_frontend_ops dib8000_ops = { |
| 3464 | .delsys = { SYS_ISDBT }, | ||
| 3464 | .info = { | 3465 | .info = { |
| 3465 | .name = "DiBcom 8000 ISDB-T", | 3466 | .name = "DiBcom 8000 ISDB-T", |
| 3466 | .type = FE_OFDM, | 3467 | .type = FE_OFDM, |
| @@ -3479,9 +3480,9 @@ static const struct dvb_frontend_ops dib8000_ops = { | |||
| 3479 | .init = dib8000_wakeup, | 3480 | .init = dib8000_wakeup, |
| 3480 | .sleep = dib8000_sleep, | 3481 | .sleep = dib8000_sleep, |
| 3481 | 3482 | ||
| 3482 | .set_frontend_legacy = dib8000_set_frontend, | 3483 | .set_frontend = dib8000_set_frontend, |
| 3483 | .get_tune_settings = dib8000_fe_get_tune_settings, | 3484 | .get_tune_settings = dib8000_fe_get_tune_settings, |
| 3484 | .get_frontend_legacy = dib8000_get_frontend, | 3485 | .get_frontend = dib8000_get_frontend, |
| 3485 | 3486 | ||
| 3486 | .read_status = dib8000_read_status, | 3487 | .read_status = dib8000_read_status, |
| 3487 | .read_ber = dib8000_read_ber, | 3488 | .read_ber = dib8000_read_ber, |