Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 285586
b: refs/heads/master
c: c6f56e7
h: refs/heads/master
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Dec 31, 2011
1 parent dcc4059 commit 90ecdc8
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 65 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 88ab898f6639ca5a14943a882fbd141afc81fe90
refs/heads/master: c6f56e7d794cba022353d464dfa3383d1b3e0125
4 changes: 1 addition & 3 deletions trunk/drivers/media/common/tuners/mt2266.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,20 +150,18 @@ static int mt2266_set_params(struct dvb_frontend *fe)
case 6000000:
mt2266_writeregs(priv, mt2266_init_6mhz,
sizeof(mt2266_init_6mhz));
priv->bandwidth = BANDWIDTH_6_MHZ;
break;
case 8000000:
mt2266_writeregs(priv, mt2266_init_8mhz,
sizeof(mt2266_init_8mhz));
priv->bandwidth = BANDWIDTH_8_MHZ;
break;
case 7000000:
default:
mt2266_writeregs(priv, mt2266_init_7mhz,
sizeof(mt2266_init_7mhz));
priv->bandwidth = BANDWIDTH_7_MHZ;
break;
}
priv->bandwidth = c->bandwidth_hz;

if (band == MT2266_VHF && priv->band == MT2266_UHF) {
dprintk("Switch from UHF to VHF");
Expand Down
5 changes: 1 addition & 4 deletions trunk/drivers/media/common/tuners/mxl5007t.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,6 @@ static int mxl5007t_set_params(struct dvb_frontend *fe)
enum mxl5007t_mode mode;
int ret;
u32 freq = c->frequency;
u32 band = BANDWIDTH_6_MHZ;

switch (delsys) {
case SYS_ATSC:
Expand All @@ -645,10 +644,8 @@ static int mxl5007t_set_params(struct dvb_frontend *fe)
break;
case 7000000:
bw = MxL_BW_7MHz;
band = BANDWIDTH_7_MHZ;
case 8000000:
bw = MxL_BW_8MHz;
band = BANDWIDTH_8_MHZ;
default:
return -EINVAL;
}
Expand All @@ -672,7 +669,7 @@ static int mxl5007t_set_params(struct dvb_frontend *fe)
goto fail;

state->frequency = freq;
state->bandwidth = band;
state->bandwidth = c->bandwidth_hz;
fail:
mutex_unlock(&state->lock);

Expand Down
7 changes: 1 addition & 6 deletions trunk/drivers/media/common/tuners/tda18271-fe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -934,7 +934,6 @@ static int tda18271_set_params(struct dvb_frontend *fe)
u32 delsys = c->delivery_system;
u32 bw = c->bandwidth_hz;
u32 freq = c->frequency;
u32 band = BANDWIDTH_6_MHZ;
struct tda18271_priv *priv = fe->tuner_priv;
struct tda18271_std_map *std_map = &priv->std;
struct tda18271_std_map_item *map;
Expand All @@ -953,10 +952,8 @@ static int tda18271_set_params(struct dvb_frontend *fe)
map = &std_map->dvbt_6;
} else if (bw <= 7000000) {
map = &std_map->dvbt_7;
band = BANDWIDTH_7_MHZ;
} else {
map = &std_map->dvbt_8;
band = BANDWIDTH_8_MHZ;
}
break;
case SYS_DVBC_ANNEX_B:
Expand All @@ -968,10 +965,8 @@ static int tda18271_set_params(struct dvb_frontend *fe)
map = &std_map->qam_6;
} else if (bw <= 7000000) {
map = &std_map->qam_7;
band = BANDWIDTH_7_MHZ;
} else {
map = &std_map->qam_8;
band = BANDWIDTH_8_MHZ;
}
break;
default:
Expand All @@ -990,7 +985,7 @@ static int tda18271_set_params(struct dvb_frontend *fe)

priv->if_freq = map->if_freq;
priv->frequency = freq;
priv->bandwidth = band;
priv->bandwidth = bw;
fail:
return ret;
}
Expand Down
14 changes: 2 additions & 12 deletions trunk/drivers/media/common/tuners/tda827x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ static int tda827xo_set_params(struct dvb_frontend *fe)
struct tda827x_priv *priv = fe->tuner_priv;
u8 buf[14];
int rc;
u32 band;

struct i2c_msg msg = { .addr = priv->i2c_addr, .flags = 0,
.buf = buf, .len = sizeof(buf) };
Expand All @@ -168,16 +167,12 @@ static int tda827xo_set_params(struct dvb_frontend *fe)
dprintk("%s:\n", __func__);
if (c->bandwidth_hz == 0) {
if_freq = 5000000;
band = BANDWIDTH_8_MHZ;
} else if (c->bandwidth_hz <= 6000000) {
if_freq = 4000000;
band = BANDWIDTH_6_MHZ;
} else if (c->bandwidth_hz <= 7000000) {
if_freq = 4500000;
band = BANDWIDTH_7_MHZ;
} else { /* 8 MHz */
if_freq = 5000000;
band = BANDWIDTH_8_MHZ;
}
tuner_freq = c->frequency;

Expand Down Expand Up @@ -224,7 +219,7 @@ static int tda827xo_set_params(struct dvb_frontend *fe)
goto err;

priv->frequency = c->frequency;
priv->bandwidth = band;
priv->bandwidth = c->bandwidth_hz;

return 0;

Expand Down Expand Up @@ -522,7 +517,6 @@ static int tda827xa_set_params(struct dvb_frontend *fe)
struct tda827x_priv *priv = fe->tuner_priv;
struct tda827xa_data *frequency_map = tda827xa_dvbt;
u8 buf[11];
u32 band;

struct i2c_msg msg = { .addr = priv->i2c_addr, .flags = 0,
.buf = buf, .len = sizeof(buf) };
Expand All @@ -537,16 +531,12 @@ static int tda827xa_set_params(struct dvb_frontend *fe)

if (c->bandwidth_hz == 0) {
if_freq = 5000000;
band = BANDWIDTH_8_MHZ;
} else if (c->bandwidth_hz <= 6000000) {
if_freq = 4000000;
band = BANDWIDTH_6_MHZ;
} else if (c->bandwidth_hz <= 7000000) {
if_freq = 4500000;
band = BANDWIDTH_7_MHZ;
} else { /* 8 MHz */
if_freq = 5000000;
band = BANDWIDTH_8_MHZ;
}
tuner_freq = c->frequency;

Expand Down Expand Up @@ -652,7 +642,7 @@ static int tda827xa_set_params(struct dvb_frontend *fe)
goto err;

priv->frequency = c->frequency;
priv->bandwidth = band;
priv->bandwidth = c->bandwidth_hz;

return 0;

Expand Down
12 changes: 1 addition & 11 deletions trunk/drivers/media/common/tuners/tuner-simple.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1028,17 +1028,7 @@ static int simple_get_frequency(struct dvb_frontend *fe, u32 *frequency)
static int simple_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)
{
struct tuner_simple_priv *priv = fe->tuner_priv;
switch (priv->bandwidth) {
case 6000000:
*bandwidth = BANDWIDTH_6_MHZ;
break;
case 7000000:
*bandwidth = BANDWIDTH_7_MHZ;
break;
case 8000000:
*bandwidth = BANDWIDTH_8_MHZ;
break;
}
*bandwidth = priv->bandwidth;
return 0;
}

Expand Down
11 changes: 3 additions & 8 deletions trunk/drivers/media/common/tuners/xc4000.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1139,15 +1139,13 @@ static int xc4000_set_params(struct dvb_frontend *fe)
dprintk(1, "%s() VSB modulation\n", __func__);
priv->rf_mode = XC_RF_MODE_AIR;
priv->freq_hz = c->frequency - 1750000;
priv->bandwidth = BANDWIDTH_6_MHZ;
priv->video_standard = XC4000_DTV6;
type = DTV6;
break;
case SYS_DVBC_ANNEX_B:
dprintk(1, "%s() QAM modulation\n", __func__);
priv->rf_mode = XC_RF_MODE_CABLE;
priv->freq_hz = c->frequency - 1750000;
priv->bandwidth = BANDWIDTH_6_MHZ;
priv->video_standard = XC4000_DTV6;
type = DTV6;
break;
Expand All @@ -1156,26 +1154,21 @@ static int xc4000_set_params(struct dvb_frontend *fe)
dprintk(1, "%s() OFDM\n", __func__);
if (bw == 0) {
if (c->frequency < 400000000) {
priv->bandwidth = BANDWIDTH_7_MHZ;
priv->freq_hz = c->frequency - 2250000;
} else {
priv->bandwidth = BANDWIDTH_8_MHZ;
priv->freq_hz = c->frequency - 2750000;
}
priv->video_standard = XC4000_DTV7_8;
type = DTV78;
} else if (bw <= 6000000) {
priv->bandwidth = BANDWIDTH_6_MHZ;
priv->video_standard = XC4000_DTV6;
priv->freq_hz = c->frequency - 1750000;
type = DTV6;
} else if (bw <= 7000000) {
priv->bandwidth = BANDWIDTH_7_MHZ;
priv->video_standard = XC4000_DTV7;
priv->freq_hz = c->frequency - 2250000;
type = DTV7;
} else {
priv->bandwidth = BANDWIDTH_8_MHZ;
priv->video_standard = XC4000_DTV8;
priv->freq_hz = c->frequency - 2750000;
type = DTV8;
Expand All @@ -1195,6 +1188,8 @@ static int xc4000_set_params(struct dvb_frontend *fe)
if (check_firmware(fe, type, 0, priv->if_khz) != 0)
goto fail;

priv->bandwidth = c->bandwidth_hz;

ret = xc_set_signal_source(priv, priv->rf_mode);
if (ret != 0) {
printk(KERN_ERR "xc4000: xc_set_signal_source(%d) failed\n",
Expand Down Expand Up @@ -1591,7 +1586,7 @@ struct dvb_frontend *xc4000_attach(struct dvb_frontend *fe,
break;
case 1:
/* new tuner instance */
priv->bandwidth = BANDWIDTH_6_MHZ;
priv->bandwidth = 6000000;
/* set default configuration */
priv->if_khz = 4560;
priv->default_pm = 0;
Expand Down
12 changes: 3 additions & 9 deletions trunk/drivers/media/common/tuners/xc5000.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -650,32 +650,27 @@ static int xc5000_set_params(struct dvb_frontend *fe)
dprintk(1, "%s() VSB modulation\n", __func__);
priv->rf_mode = XC_RF_MODE_AIR;
priv->freq_hz = freq - 1750000;
priv->bandwidth = BANDWIDTH_6_MHZ;
priv->video_standard = DTV6;
break;
case SYS_DVBC_ANNEX_B:
dprintk(1, "%s() QAM modulation\n", __func__);
priv->rf_mode = XC_RF_MODE_CABLE;
priv->freq_hz = freq - 1750000;
priv->bandwidth = BANDWIDTH_6_MHZ;
priv->video_standard = DTV6;
break;
case SYS_DVBT:
case SYS_DVBT2:
dprintk(1, "%s() OFDM\n", __func__);
switch (bw) {
case 6000000:
priv->bandwidth = BANDWIDTH_6_MHZ;
priv->video_standard = DTV6;
priv->freq_hz = freq - 1750000;
break;
case 7000000:
priv->bandwidth = BANDWIDTH_7_MHZ;
priv->video_standard = DTV7;
priv->freq_hz = freq - 2250000;
break;
case 8000000:
priv->bandwidth = BANDWIDTH_8_MHZ;
priv->video_standard = DTV8;
priv->freq_hz = freq - 2750000;
break;
Expand All @@ -689,17 +684,14 @@ static int xc5000_set_params(struct dvb_frontend *fe)
dprintk(1, "%s() QAM modulation\n", __func__);
priv->rf_mode = XC_RF_MODE_CABLE;
if (bw <= 6000000) {
priv->bandwidth = BANDWIDTH_6_MHZ;
priv->video_standard = DTV6;
priv->freq_hz = freq - 1750000;
b = 6;
} else if (bw <= 7000000) {
priv->bandwidth = BANDWIDTH_7_MHZ;
priv->video_standard = DTV7;
priv->freq_hz = freq - 2250000;
b = 7;
} else {
priv->bandwidth = BANDWIDTH_8_MHZ;
priv->video_standard = DTV7_8;
priv->freq_hz = freq - 2750000;
b = 8;
Expand Down Expand Up @@ -745,6 +737,8 @@ static int xc5000_set_params(struct dvb_frontend *fe)
if (debug)
xc_debug_dump(priv);

priv->bandwidth = bw;

return 0;
}

Expand Down Expand Up @@ -1126,7 +1120,7 @@ struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe,
break;
case 1:
/* new tuner instance */
priv->bandwidth = BANDWIDTH_6_MHZ;
priv->bandwidth = 6000000;
fe->tuner_priv = priv;
break;
default:
Expand Down
5 changes: 1 addition & 4 deletions trunk/drivers/media/dvb/dvb-usb/mxl111sf-tuner.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,6 @@ static int mxl111sf_tuner_set_params(struct dvb_frontend *fe)
struct mxl111sf_tuner_state *state = fe->tuner_priv;
int ret;
u8 bw;
u32 band = BANDWIDTH_6_MHZ;

mxl_dbg("()");

Expand All @@ -297,11 +296,9 @@ static int mxl111sf_tuner_set_params(struct dvb_frontend *fe)
break;
case 7000000:
bw = 7;
band = BANDWIDTH_7_MHZ;
break;
case 8000000:
bw = 8;
band = BANDWIDTH_8_MHZ;
break;
default:
err("%s: bandwidth not set!", __func__);
Expand All @@ -317,7 +314,7 @@ static int mxl111sf_tuner_set_params(struct dvb_frontend *fe)
goto fail;

state->frequency = c->frequency;
state->bandwidth = band;
state->bandwidth = c->bandwidth_hz;
fail:
return ret;
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/media/dvb/frontends/dib3000mb_priv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ struct dib3000_state {
int timing_offset;
int timing_offset_comp_done;

fe_bandwidth_t last_tuned_bw;
u32 last_tuned_bw;
u32 last_tuned_freq;
};

Expand Down
7 changes: 1 addition & 6 deletions trunk/drivers/media/dvb/frontends/dvb-pll.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -635,12 +635,7 @@ static int dvb_pll_set_params(struct dvb_frontend *fe)
}

priv->frequency = frequency;
if (c->bandwidth_hz <= 6000000)
priv->bandwidth = BANDWIDTH_6_MHZ;
else if (c->bandwidth_hz <= 7000000)
priv->bandwidth = BANDWIDTH_7_MHZ;
if (c->bandwidth_hz <= 8000000)
priv->bandwidth = BANDWIDTH_8_MHZ;
priv->bandwidth = c->bandwidth_hz;

return 0;
}
Expand Down

0 comments on commit 90ecdc8

Please sign in to comment.