The patch number 9467 was added via Manu Abraham <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Reinhard Nissl <[EMAIL PROTECTED]>
Fix runtime verbosity
Signed-off-by: Reinhard Nissl <[EMAIL PROTECTED]>
Signed-off-by: Manu Abraham <[EMAIL PROTECTED]>
---
linux/drivers/media/dvb/frontends/stb0899_drv.c | 144 +++++++--------
linux/drivers/media/dvb/frontends/stb0899_priv.h | 12 -
2 files changed, 78 insertions(+), 78 deletions(-)
diff -r ea89d07df694 -r 634f33fade82
linux/drivers/media/dvb/frontends/stb0899_drv.c
--- a/linux/drivers/media/dvb/frontends/stb0899_drv.c Wed May 28 12:08:48
2008 +0400
+++ b/linux/drivers/media/dvb/frontends/stb0899_drv.c Wed Jul 09 22:33:38
2008 +0400
@@ -31,7 +31,7 @@
#include "stb0899_priv.h"
#include "stb0899_reg.h"
-static unsigned int verbose = 1;
+static unsigned int verbose = 0;//1;
module_param(verbose, int, 0644);
/* C/N in dB/10, NIRM/NIRL */
@@ -241,14 +241,14 @@ int _stb0899_read_reg(struct stb0899_sta
ret = i2c_transfer(state->i2c, msg, 2);
if (ret != 2) {
if (ret != -ERESTARTSYS)
- dprintk(verbose, FE_ERROR, 1,
+ dprintk(state->verbose, FE_ERROR, 1,
"Read error, Reg=[0x%02x], Status=%d",
reg, ret);
return ret < 0 ? ret : -EREMOTEIO;
}
- if (unlikely(verbose >= FE_DEBUGREG))
- dprintk(verbose, FE_ERROR, 1, "Reg=[0x%02x], data=%02x",
+ if (unlikely(*state->verbose >= FE_DEBUGREG))
+ dprintk(state->verbose, FE_ERROR, 1, "Reg=[0x%02x], data=%02x",
reg, buf);
return (unsigned int)buf;
@@ -361,7 +361,7 @@ u32 _stb0899_read_s2reg(struct stb0899_s
}
data = MAKEWORD32(buf[3], buf[2], buf[1], buf[0]);
- if (unlikely(state->verbose >= FE_DEBUGREG))
+ if (unlikely(*state->verbose >= FE_DEBUGREG))
printk(KERN_DEBUG "%s Device=[0x%04x], Base address=[0x%08x],
Offset=[0x%04x], Data=[0x%08x]\n",
__func__, stb0899_i2cdev, stb0899_base_addr,
stb0899_reg_offset, data);
@@ -418,7 +418,7 @@ int stb0899_write_s2reg(struct stb0899_s
buf_1[4] = GETBYTE(stb0899_data, BYTE2);
buf_1[5] = GETBYTE(stb0899_data, BYTE3);
- if (unlikely(state->verbose >= FE_DEBUGREG))
+ if (unlikely(*state->verbose >= FE_DEBUGREG))
printk(KERN_DEBUG "%s Device=[0x%04x], Base Address=[0x%08x],
Offset=[0x%04x], Data=[0x%08x]\n",
__func__, stb0899_i2cdev, stb0899_base_addr,
stb0899_reg_offset, stb0899_data);
@@ -480,7 +480,7 @@ int stb0899_read_regs(struct stb0899_sta
(((reg & 0xff00) == 0xf200) || ((reg & 0xff00) == 0xf600)))
_stb0899_read_reg(state, (reg | 0x00ff));
- if (unlikely(state->verbose >= FE_DEBUGREG)) {
+ if (unlikely(*state->verbose >= FE_DEBUGREG)) {
int i;
printk(KERN_DEBUG "%s [0x%04x]:", __func__, reg);
@@ -510,7 +510,7 @@ int stb0899_write_regs(struct stb0899_st
buf[1] = reg & 0xff;
memcpy(&buf[2], data, count);
- if (unlikely(state->verbose >= FE_DEBUGREG)) {
+ if (unlikely(*state->verbose >= FE_DEBUGREG)) {
int i;
printk(KERN_DEBUG "%s [0x%04x]:", __func__, reg);
@@ -530,7 +530,7 @@ int stb0899_write_regs(struct stb0899_st
if (ret != 1) {
if (ret != -ERESTARTSYS)
- dprintk(verbose, FE_ERROR, 1, "Reg=[0x%04x],
Data=[0x%02x ...], Count=%u, Status=%d",
+ dprintk(state->verbose, FE_ERROR, 1, "Reg=[0x%04x],
Data=[0x%02x ...], Count=%u, Status=%d",
reg, data[0], count, ret);
return ret < 0 ? ret : -EREMOTEIO;
}
@@ -554,7 +554,7 @@ static u32 stb0899_get_mclk(struct stb08
div = stb0899_read_reg(state, STB0899_NCOARSE);
mclk = (div + 1) * state->config->xtal_freq / 6;
- dprintk(verbose, FE_DEBUG, 1, "div=%d, mclk=%d", div, mclk);
+ dprintk(state->verbose, FE_DEBUG, 1, "div=%d, mclk=%d", div, mclk);
return mclk;
}
@@ -570,14 +570,14 @@ static void stb0899_set_mclk(struct stb0
struct stb0899_internal *internal = &state->internal;
u8 mdiv = 0;
- dprintk(verbose, FE_DEBUG, 1, "state->config=%p", state->config);
+ dprintk(state->verbose, FE_DEBUG, 1, "state->config=%p", state->config);
mdiv = ((6 * Mclk) / state->config->xtal_freq) - 1;
- dprintk(verbose, FE_DEBUG, 1, "mdiv=%d", mdiv);
+ dprintk(state->verbose, FE_DEBUG, 1, "mdiv=%d", mdiv);
stb0899_write_reg(state, STB0899_NCOARSE, mdiv);
internal->master_clk = stb0899_get_mclk(state);
- dprintk(verbose, FE_DEBUG, 1, "MasterCLOCK=%d", internal->master_clk);
+ dprintk(state->verbose, FE_DEBUG, 1, "MasterCLOCK=%d",
internal->master_clk);
}
static int stb0899_postproc(struct stb0899_state *state, u8 ctl, int enable)
@@ -606,7 +606,7 @@ static void stb0899_release(struct dvb_f
{
struct stb0899_state *state = fe->demodulator_priv;
- dprintk(verbose, FE_DEBUG, 1, "Release Frontend");
+ dprintk(state->verbose, FE_DEBUG, 1, "Release Frontend");
/* post process event */
stb0899_postproc(state, STB0899_POSTPROC_GPIO_POWER, 0);
kfree(state);
@@ -683,7 +683,7 @@ static int stb0899_wait_diseqc_fifo_empt
if (!STB0899_GETFIELD(FIFOFULL, reg))
break;
if ((jiffies - start) > timeout) {
- dprintk(verbose, FE_ERROR, 1, "timed out !!");
+ dprintk(state->verbose, FE_ERROR, 1, "timed out !!");
return -ETIMEDOUT;
}
}
@@ -725,7 +725,7 @@ static int stb0899_wait_diseqc_rxidle(st
while (!STB0899_GETFIELD(RXEND, reg)) {
reg = stb0899_read_reg(state, STB0899_DISRX_ST0);
if (jiffies - start > timeout) {
- dprintk(verbose, FE_ERROR, 1, "timed out!!");
+ dprintk(state->verbose, FE_ERROR, 1, "timed out!!");
return -ETIMEDOUT;
}
msleep(10);
@@ -774,7 +774,7 @@ static int stb0899_wait_diseqc_txidle(st
while (!STB0899_GETFIELD(TXIDLE, reg)) {
reg = stb0899_read_reg(state, STB0899_DISSTATUS);
if (jiffies - start > timeout) {
- dprintk(verbose, FE_ERROR, 1, "timed out!!");
+ dprintk(state->verbose, FE_ERROR, 1, "timed out!!");
return -ETIMEDOUT;
}
msleep(10);
@@ -898,7 +898,7 @@ static int stb0899_sleep(struct dvb_fron
struct stb0899_state *state = fe->demodulator_priv;
u8 reg;
- dprintk(verbose, FE_DEBUG, 1, "Going to Sleep .. (Really tired ..
:-))");
+ dprintk(state->verbose, FE_DEBUG, 1, "Going to Sleep .. (Really tired
.. :-))");
#if 0
reg = stb0899_read_reg(state, STB0899_SYNTCTRL);
STB0899_SETFIELD_VAL(STANDBY, reg, 1);
@@ -935,15 +935,15 @@ static int stb0899_init(struct dvb_front
struct stb0899_state *state = fe->demodulator_priv;
struct stb0899_config *config = state->config;
- dprintk(verbose, FE_DEBUG, 1, "Initializing STB0899 ... ");
+ dprintk(state->verbose, FE_DEBUG, 1, "Initializing STB0899 ... ");
// mutex_init(&state->search_lock);
/* init device */
- dprintk(verbose, FE_DEBUG, 1, "init device");
+ dprintk(state->verbose, FE_DEBUG, 1, "init device");
for (i = 0; config->init_dev[i].address != 0xffff; i++)
stb0899_write_reg(state, config->init_dev[i].address,
config->init_dev[i].data);
- dprintk(verbose, FE_DEBUG, 1, "init S2 demod");
+ dprintk(state->verbose, FE_DEBUG, 1, "init S2 demod");
/* init S2 demod */
for (i = 0; config->init_s2_demod[i].offset != 0xffff; i++)
stb0899_write_s2reg(state, STB0899_S2DEMOD,
@@ -951,12 +951,12 @@ static int stb0899_init(struct dvb_front
config->init_s2_demod[i].offset,
config->init_s2_demod[i].data);
- dprintk(verbose, FE_DEBUG, 1, "init S1 demod");
+ dprintk(state->verbose, FE_DEBUG, 1, "init S1 demod");
/* init S1 demod */
for (i = 0; config->init_s1_demod[i].address != 0xffff; i++)
stb0899_write_reg(state, config->init_s1_demod[i].address,
config->init_s1_demod[i].data);
- dprintk(verbose, FE_DEBUG, 1, "init S2 FEC");
+ dprintk(state->verbose, FE_DEBUG, 1, "init S2 FEC");
/* init S2 fec */
for (i = 0; config->init_s2_fec[i].offset != 0xffff; i++)
stb0899_write_s2reg(state, STB0899_S2FEC,
@@ -964,7 +964,7 @@ static int stb0899_init(struct dvb_front
config->init_s2_fec[i].offset,
config->init_s2_fec[i].data);
- dprintk(verbose, FE_DEBUG, 1, "init TST");
+ dprintk(state->verbose, FE_DEBUG, 1, "init TST");
/* init test */
for (i = 0; config->init_tst[i].address != 0xffff; i++)
stb0899_write_reg(state, config->init_tst[i].address,
config->init_tst[i].data);
@@ -1020,7 +1020,7 @@ static int stb0899_read_signal_strength(
*strength =
stb0899_table_lookup(stb0899_dvbsrf_tab, ARRAY_SIZE(stb0899_dvbsrf_tab) - 1,
val);
*strength += 750;
- dprintk(verbose, FE_DEBUG, 1, "AGCIQVALUE =
0x%02x, C = %d * 0.1 dBm",
+ dprintk(state->verbose, FE_DEBUG, 1,
"AGCIQVALUE = 0x%02x, C = %d * 0.1 dBm",
val & 0xff, *strength);
}
}
@@ -1032,12 +1032,12 @@ static int stb0899_read_signal_strength(
*strength = stb0899_table_lookup(stb0899_dvbs2rf_tab,
ARRAY_SIZE(stb0899_dvbs2rf_tab) - 1, val);
*strength += 750;
- dprintk(verbose, FE_DEBUG, 1, "IF_AGC_GAIN = 0x%04x, C
= %d * 0.1 dBm",
+ dprintk(state->verbose, FE_DEBUG, 1, "IF_AGC_GAIN =
0x%04x, C = %d * 0.1 dBm",
val & 0x3fff, *strength);
}
break;
default:
- dprintk(verbose, FE_DEBUG, 1, "Unsupported delivery system");
+ dprintk(state->verbose, FE_DEBUG, 1, "Unsupported delivery
system");
return -EINVAL;
}
@@ -1064,7 +1064,7 @@ static int stb0899_read_snr(struct dvb_f
val = MAKEWORD16(buf[0], buf[1]);
*snr = stb0899_table_lookup(stb0899_cn_tab,
ARRAY_SIZE(stb0899_cn_tab) - 1, val);
- dprintk(verbose, FE_DEBUG, 1, "NIR = 0x%02x%02x
= %u, C/N = %d * 0.1 dBm\n",
+ dprintk(state->verbose, FE_DEBUG, 1, "NIR =
0x%02x%02x = %u, C/N = %d * 0.1 dBm\n",
buf[0], buf[1], val, *snr);
}
}
@@ -1088,12 +1088,12 @@ static int stb0899_read_snr(struct dvb_f
val = (quantn - estn) / 10;
}
*snr = val;
- dprintk(verbose, FE_DEBUG, 1, "Es/N0 quant = %d (%d)
estimate = %u (%d), C/N = %d * 0.1 dBm",
+ dprintk(state->verbose, FE_DEBUG, 1, "Es/N0 quant = %d
(%d) estimate = %u (%d), C/N = %d * 0.1 dBm",
quant, quantn, est, estn, val);
}
break;
default:
- dprintk(verbose, FE_DEBUG, 1, "Unsupported delivery system");
+ dprintk(state->verbose, FE_DEBUG, 1, "Unsupported delivery
system");
return -EINVAL;
}
@@ -1159,7 +1159,7 @@ static int stb0899_read_status(struct dv
}
break;
default:
- dprintk(verbose, FE_DEBUG, 1, "Unsupported delivery system");
+ dprintk(state->verbose, FE_DEBUG, 1, "Unsupported delivery
system");
return -EINVAL;
}
return 0;
@@ -1218,7 +1218,7 @@ static int stb0899_read_ber(struct dvb_f
}
break;
default:
- dprintk(verbose, FE_DEBUG, 1, "Unsupported delivery system");
+ dprintk(state->verbose, FE_DEBUG, 1, "Unsupported delivery
system");
return -EINVAL;
}
@@ -1410,26 +1410,26 @@ static int stb0899_get_info(struct dvb_f
{
struct stb0899_state *state = fe->demodulator_priv;
- dprintk(verbose, FE_DEBUG, 1, "Get Info");
+ dprintk(state->verbose, FE_DEBUG, 1, "Get Info");
switch (state->delsys) {
case DVBFE_DELSYS_DVBS:
- dprintk(verbose, FE_ERROR, 1, "Querying DVB-S info");
+ dprintk(state->verbose, FE_ERROR, 1, "Querying DVB-S info");
memcpy(fe_info, &dvbs_info, sizeof (struct dvbfe_info));
break;
case DVBFE_DELSYS_DSS:
- dprintk(verbose, FE_ERROR, 1, "Querying DSS info");
+ dprintk(state->verbose, FE_ERROR, 1, "Querying DSS info");
memcpy(fe_info, &dss_info, sizeof (struct dvbfe_info));
break;
case DVBFE_DELSYS_DVBS2:
- dprintk(verbose, FE_ERROR, 1, "Querying DVB-S2 info");
+ dprintk(state->verbose, FE_ERROR, 1, "Querying DVB-S2 info");
memcpy(fe_info, &dvbs2_info, sizeof (struct dvbfe_info));
break;
default:
- dprintk(verbose, FE_ERROR, 1, "Unsupported delivery system");
+ dprintk(state->verbose, FE_ERROR, 1, "Unsupported delivery
system");
return -EINVAL;
}
- dprintk(verbose, FE_DEBUG, 1, "delivery system=%d", state->delsys);
+ dprintk(state->verbose, FE_DEBUG, 1, "delivery system=%d",
state->delsys);
return 0;
}
@@ -1451,7 +1451,7 @@ static void stb0899_set_delivery(struct
switch (state->delsys) {
case DVBFE_DELSYS_DVBS:
- dprintk(verbose, FE_DEBUG, 1, "Delivery System -- DVB-S");
+ dprintk(state->verbose, FE_DEBUG, 1, "Delivery System --
DVB-S");
/* FECM/Viterbi ON */
reg = stb0899_read_reg(state, STB0899_FECM);
STB0899_SETFIELD_VAL(FECM_RSVD0, reg, 0);
@@ -1534,7 +1534,7 @@ static void stb0899_set_delivery(struct
STB0899_SETFIELD_VAL(STOP_CKS2DMD108, stop_clk[1], 1);
break;
default:
- dprintk(verbose, FE_ERROR, 1, "Unsupported delivery system");
+ dprintk(state->verbose, FE_ERROR, 1, "Unsupported delivery
system");
break;
}
STB0899_SETFIELD_VAL(STOP_CKADCI108, stop_clk[0], 0);
@@ -1578,28 +1578,28 @@ static enum dvbfe_search stb0899_search(
i_params->freq = params->frequency;
switch (state->delsys) {
case DVBFE_DELSYS_DVBS:
- dprintk(verbose, FE_ERROR, 1, "set DVB-S params");
+ dprintk(state->verbose, FE_ERROR, 1, "set DVB-S params");
i_params->srate = params->delsys.dvbs.symbol_rate;
break;
case DVBFE_DELSYS_DSS:
- dprintk(verbose, FE_ERROR, 1, "set DSS params");
+ dprintk(state->verbose, FE_ERROR, 1, "set DSS params");
i_params->srate = params->delsys.dss.symbol_rate;
break;
case DVBFE_DELSYS_DVBS2:
- dprintk(verbose, FE_ERROR, 1, "set DVB-S2 params");
+ dprintk(state->verbose, FE_ERROR, 1, "set DVB-S2 params");
i_params->srate = params->delsys.dvbs2.symbol_rate;
break;
default:
- dprintk(verbose, FE_ERROR, 1, "Unsupported delivery system");
+ dprintk(state->verbose, FE_ERROR, 1, "Unsupported delivery
system");
return -EINVAL;
}
- dprintk(verbose, FE_DEBUG, 1, "delivery system=%d", state->delsys);
+ dprintk(state->verbose, FE_DEBUG, 1, "delivery system=%d",
state->delsys);
SearchRange = 10000000;
- dprintk(verbose, FE_DEBUG, 1, "Frequency=%d, Srate=%d", i_params->freq,
i_params->srate);
+ dprintk(state->verbose, FE_DEBUG, 1, "Frequency=%d, Srate=%d",
i_params->freq, i_params->srate);
/* checking Search Range is meaningless for a fixed 3 Mhz
*/
if (INRANGE(i_params->srate, 1000000, 45000000)) {
- dprintk(verbose, FE_DEBUG, 1, "Parameters IN RANGE");
+ dprintk(state->verbose, FE_DEBUG, 1, "Parameters IN RANGE");
stb0899_set_delivery(state);
if (state->config->tuner_set_rfsiggain) {
@@ -1620,7 +1620,7 @@ static enum dvbfe_search stb0899_search(
switch (state->delsys) {
case DVBFE_DELSYS_DVBS:
case DVBFE_DELSYS_DSS:
- dprintk(verbose, FE_DEBUG, 1, "DVB-S delivery system");
+ dprintk(state->verbose, FE_DEBUG, 1, "DVB-S delivery
system");
internal->freq = i_params->freq;
internal->srate = i_params->srate;
/*
@@ -1648,17 +1648,17 @@ static enum dvbfe_search stb0899_search(
stb0899_write_reg(state, STB0899_AGCRFCFG, 0x11);
/* Run the search algorithm */
- dprintk(verbose, FE_DEBUG, 1, "running DVB-S search
algo ..");
+ dprintk(state->verbose, FE_DEBUG, 1, "running DVB-S
search algo ..");
if (stb0899_dvbs_algo(state) == RANGEOK) {
internal->lock = 1;
- dprintk(verbose, FE_DEBUG, 1,
+ dprintk(state->verbose, FE_DEBUG, 1,
"------------------------------------->
DVB-S LOCK !");
// stb0899_write_reg(state, STB0899_ERRCTRL1,
0x3d); /* Viterbi Errors */
// internal->v_status = stb0899_read_reg(state,
STB0899_VSTATUS);
// internal->err_ctrl = stb0899_read_reg(state,
STB0899_ERRCTRL1);
-// dprintk(verbose, FE_DEBUG, 1, "VSTATUS=0x%02x",
internal->v_status);
-// dprintk(verbose, FE_DEBUG, 1,
"ERR_CTRL=0x%02x", internal->err_ctrl);
+// dprintk(state->verbose, FE_DEBUG, 1,
"VSTATUS=0x%02x", internal->v_status);
+// dprintk(state->verbose, FE_DEBUG, 1,
"ERR_CTRL=0x%02x", internal->err_ctrl);
return DVBFE_ALGO_SEARCH_SUCCESS;
} else {
@@ -1692,10 +1692,10 @@ static enum dvbfe_search stb0899_search(
stb0899_set_iterations(state);
/* Run the search algorithm */
- dprintk(verbose, FE_DEBUG, 1, "running DVB-S2 search
algo ..");
+ dprintk(state->verbose, FE_DEBUG, 1, "running DVB-S2
search algo ..");
if (stb0899_dvbs2_algo(state) == DVBS2_FEC_LOCK) {
internal->lock = 1;
- dprintk(verbose, FE_DEBUG, 1,
+ dprintk(state->verbose, FE_DEBUG, 1,
"------------------------------------->
DVB-S2 LOCK !");
// stb0899_write_reg(state, STB0899_ERRCTRL1,
0xb6); /* Packet Errors */
@@ -1710,7 +1710,7 @@ static enum dvbfe_search stb0899_search(
}
break;
default:
- dprintk(verbose, FE_ERROR, 1, "Unsupported delivery
system");
+ dprintk(state->verbose, FE_ERROR, 1, "Unsupported
delivery system");
return DVBFE_ALGO_SEARCH_INVALID;
}
}
@@ -1723,12 +1723,12 @@ static enum stb0899_status stb0899_track
u8 reg;
reg = stb0899_read_reg(state, STB0899_DSTATUS);
- dprintk(verbose, FE_DEBUG, 1, "-------------------->
STB0899_DSTATUS=[0x%02x]", reg);
+ dprintk(state->verbose, FE_DEBUG, 1, "-------------------->
STB0899_DSTATUS=[0x%02x]", reg);
if (STB0899_GETFIELD(CARRIER_FOUND, reg)) {
- dprintk(verbose, FE_DEBUG, 1, "-------------> CARRIEROK !");
+ dprintk(state->verbose, FE_DEBUG, 1, "-------------> CARRIEROK
!");
return CARRIEROK;
} else {
- dprintk(verbose, FE_DEBUG, 1, "-------------> NOCARRIER !");
+ dprintk(state->verbose, FE_DEBUG, 1, "-------------> NOCARRIER
!");
return NOCARRIER;
}
@@ -1740,12 +1740,12 @@ static enum stb0899_status stb0899_get_i
u8 reg;
reg = STB0899_READ_S2REG(STB0899_S2DEMOD, DMD_STATUS);
- dprintk(verbose, FE_DEBUG, 1, "DMD_STATUS=[0x%02x]", reg);
+ dprintk(state->verbose, FE_DEBUG, 1, "DMD_STATUS=[0x%02x]", reg);
if (STB0899_GETFIELD(IF_AGC_LOCK, reg)) {
- dprintk(verbose, FE_DEBUG, 1, "------------->IF AGC LOCKED !");
+ dprintk(state->verbose, FE_DEBUG, 1, "------------->IF AGC
LOCKED !");
return AGC1OK;
} else {
- dprintk(verbose, FE_DEBUG, 1, "------------->IF AGC LOCK LOST
!");
+ dprintk(state->verbose, FE_DEBUG, 1, "------------->IF AGC LOCK
LOST !");
return NOAGC1;
}
@@ -1932,7 +1932,7 @@ static int stb0899_track(struct dvb_fron
#if 0
switch (state->delsys) {
case DVBFE_DELSYS_DVBS:
- dprintk(verbose, FE_DEBUG, 1, "Tracking DVB-S state");
+ dprintk(state->verbose, FE_DEBUG, 1, "Tracking DVB-S state");
if (stb0899_track_carrier(state) == CARRIEROK) {
params->frequency =
internal->freq;
params->inversion =
internal->inversion;
@@ -1943,7 +1943,7 @@ static int stb0899_track(struct dvb_fron
}
break;
case DVBFE_DELSYS_DSS:
- dprintk(verbose, FE_DEBUG, 1, "Tracking DSS state");
+ dprintk(state->verbose, FE_DEBUG, 1, "Tracking DSS state");
if (stb0899_track_carrier(state) == CARRIEROK) {
params->frequency =
internal->freq;
params->inversion =
internal->inversion;
@@ -1954,7 +1954,7 @@ static int stb0899_track(struct dvb_fron
}
break;
case DVBFE_DELSYS_DVBS2:
- dprintk(verbose, FE_DEBUG, 1, "Tracking DVB-S2 state");
+ dprintk(state->verbose, FE_DEBUG, 1, "Tracking DVB-S2 state");
if (stb0899_get_ifagc(state) == AGC1OK) {
params->frequency =
internal->freq;
params->inversion =
internal->inversion;
@@ -1973,12 +1973,12 @@ static int stb0899_track(struct dvb_fron
params->delsys.dvbs2.syncd_2 =
stb0899_read_reg(state, STB0899_SYNCDSTRM);
}
lock_lost = STB0899_READ_S2REG(STB0899_S2DEMOD, LOCK_LOST);
- dprintk(verbose, FE_DEBUG, 1, "Lock Lost=[0x%02x]\n",
lock_lost);
+ dprintk(state->verbose, FE_DEBUG, 1, "Lock Lost=[0x%02x]\n",
lock_lost);
if (STB0899_GETFIELD(LOCK_LOST, lock_lost))
- dprintk(verbose, FE_ERROR, 1, "Demodulator LOST LOCK
!\n");
+ dprintk(state->verbose, FE_ERROR, 1, "Demodulator LOST
LOCK !\n");
break;
default:
- dprintk(verbose, FE_ERROR, 1, "Unsupported delivery system");
+ dprintk(state->verbose, FE_ERROR, 1, "Unsupported delivery
system");
return -EINVAL;
}
#endif
@@ -1998,21 +1998,21 @@ static int stb0899_get_params(struct dvb
params->delivery = state->delsys;
switch (state->delsys) {
case DVBFE_DELSYS_DVBS:
- dprintk(verbose, FE_DEBUG, 1, "Get DVB-S params");
+ dprintk(state->verbose, FE_DEBUG, 1, "Get DVB-S params");
params->delsys.dvbs.symbol_rate = internal->srate;
params->delsys.dvbs.modulation = DVBFE_MOD_QPSK;
break;
case DVBFE_DELSYS_DSS:
- dprintk(verbose, FE_DEBUG, 1, "Get DSS params");
+ dprintk(state->verbose, FE_DEBUG, 1, "Get DSS params");
params->delsys.dss.symbol_rate = internal->srate;
params->delsys.dss.modulation = DVBFE_MOD_QPSK;
break;
case DVBFE_DELSYS_DVBS2:
- dprintk(verbose, FE_DEBUG, 1, "Get DVB-S2 params");
+ dprintk(state->verbose, FE_DEBUG, 1, "Get DVB-S2 params");
params->delsys.dvbs2.symbol_rate = internal->srate;
break;
default:
- dprintk(verbose, FE_ERROR, 1, "Unsupported delivery system");
+ dprintk(state->verbose, FE_ERROR, 1, "Unsupported delivery
system");
return -EINVAL;
}
@@ -2077,7 +2077,7 @@ struct dvb_frontend *stb0899_attach(stru
goto error;
inversion = config->inversion;
- state->verbose = verbose;
+ state->verbose = &verbose;
state->config = config;
state->i2c = i2c;
state->frontend.ops = stb0899_ops;
diff -r ea89d07df694 -r 634f33fade82
linux/drivers/media/dvb/frontends/stb0899_priv.h
--- a/linux/drivers/media/dvb/frontends/stb0899_priv.h Wed May 28 12:08:48
2008 +0400
+++ b/linux/drivers/media/dvb/frontends/stb0899_priv.h Wed Jul 09 22:33:38
2008 +0400
@@ -33,16 +33,16 @@
#define dprintk(x, y, z, format, arg...) do {
\
if (z) {
\
- if ((x > FE_ERROR) && (x > y))
\
+ if ((*x > FE_ERROR) && (*x > y))
\
printk(KERN_ERR "%s: " format "\n", __func__ , ##arg);
\
- else if ((x > FE_NOTICE) && (x > y))
\
+ else if ((*x > FE_NOTICE) && (*x > y))
\
printk(KERN_NOTICE "%s: " format "\n", __func__ ,
##arg); \
- else if ((x > FE_INFO) && (x > y))
\
+ else if ((*x > FE_INFO) && (*x > y))
\
printk(KERN_INFO "%s: " format "\n", __func__ , ##arg);
\
- else if ((x > FE_DEBUG) && (x > y))
\
+ else if ((*x > FE_DEBUG) && (*x > y))
\
printk(KERN_DEBUG "%s: " format "\n", __func__ ,
##arg); \
} else {
\
- if (x > y)
\
+ if (*x > y)
\
printk(format, ##arg);
\
}
\
} while(0)
@@ -215,7 +215,7 @@ struct stb0899_state {
struct stb0899_config *config;
struct dvb_frontend frontend;
- u32 verbose; /* Cached module
verbosity level */
+ u32 *verbose; /* Cached module
verbosity level */
struct stb0899_internal internal; /* Device internal
parameters */
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/634f33fade821320280d81bd9510f6d3398e6476
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
