From fd4f209564fc886b3391355f1f0429724a01e24a Mon Sep 17 00:00:00 2001 From: Patrick Boettcher Date: Fri, 25 Jan 2008 07:31:58 -0300 Subject: [PATCH] --- yaml --- r: 76779 b: refs/heads/master c: 904a82e3e27b57a2518f7575c0cab9b6aaddc422 h: refs/heads/master i: 76777: a665afc2b03f10e60a1e59ba00c315cc4e8452b7 76775: 3ab6456e62f6a6673ffeabc81af1f5efac888a07 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/frontends/dib7000p.c | 10 ++++------ trunk/drivers/media/dvb/frontends/dibx000_common.h | 5 +++++ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 98bdc3254fac..07c7d68d94fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3cb2c39ded029b8572cf7625b8042e9984d63c2c +refs/heads/master: 904a82e3e27b57a2518f7575c0cab9b6aaddc422 diff --git a/trunk/drivers/media/dvb/frontends/dib7000p.c b/trunk/drivers/media/dvb/frontends/dib7000p.c index 0396a6f31ef8..47c23e29753e 100644 --- a/trunk/drivers/media/dvb/frontends/dib7000p.c +++ b/trunk/drivers/media/dvb/frontends/dib7000p.c @@ -35,8 +35,8 @@ struct dib7000p_state { u16 wbd_ref; - u8 current_band; - fe_bandwidth_t current_bandwidth; + u8 current_band; + u32 current_bandwidth; struct dibx000_agc_config *current_agc; u32 timf; @@ -1074,7 +1074,7 @@ static int dib7000p_get_frontend(struct dvb_frontend* fe, fep->inversion = INVERSION_AUTO; - fep->u.ofdm.bandwidth = state->current_bandwidth; + fep->u.ofdm.bandwidth = BANDWIDTH_TO_INDEX(state->current_bandwidth); switch ((tps >> 8) & 0x3) { case 0: fep->u.ofdm.transmission_mode = TRANSMISSION_MODE_2K; break; @@ -1131,10 +1131,8 @@ static int dib7000p_set_frontend(struct dvb_frontend* fe, int time, ret; dib7000p_set_output_mode(state, OUTMODE_HIGH_Z); - state->current_bandwidth = fep->u.ofdm.bandwidth; - dib7000p_set_bandwidth(state, BANDWIDTH_TO_KHZ(fep->u.ofdm.bandwidth)); - /* maybe the parameter has been changed */ + /* maybe the parameter has been changed */ state->sfn_workaround_active = buggy_sfn_workaround; if (fe->ops.tuner_ops.set_params) diff --git a/trunk/drivers/media/dvb/frontends/dibx000_common.h b/trunk/drivers/media/dvb/frontends/dibx000_common.h index 5e17275afd25..84e4d5362922 100644 --- a/trunk/drivers/media/dvb/frontends/dibx000_common.h +++ b/trunk/drivers/media/dvb/frontends/dibx000_common.h @@ -128,6 +128,11 @@ enum dibx000_adc_states { (v) == BANDWIDTH_7_MHZ ? 7000 : \ (v) == BANDWIDTH_6_MHZ ? 6000 : 8000 ) +#define BANDWIDTH_TO_INDEX(v) ( \ + (v) == 8000 ? BANDWIDTH_8_MHZ : \ + (v) == 7000 ? BANDWIDTH_7_MHZ : \ + (v) == 6000 ? BANDWIDTH_6_MHZ : BANDWIDTH_8_MHZ ) + /* Chip output mode. */ #define OUTMODE_HIGH_Z 0 #define OUTMODE_MPEG2_PAR_GATED_CLK 1