summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/bt8xx/dst.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/dvb/bt8xx/dst.c')
-rw-r--r--linux/drivers/media/dvb/bt8xx/dst.c72
1 files changed, 42 insertions, 30 deletions
diff --git a/linux/drivers/media/dvb/bt8xx/dst.c b/linux/drivers/media/dvb/bt8xx/dst.c
index c26e7d017..9da5b2fcb 100644
--- a/linux/drivers/media/dvb/bt8xx/dst.c
+++ b/linux/drivers/media/dvb/bt8xx/dst.c
@@ -34,13 +34,13 @@
#include "dst_common.h"
-static unsigned int dst_verbose = 0;
-module_param(dst_verbose, int, 0644);
-MODULE_PARM_DESC(dst_verbose, "verbose startup messages, default is 1 (yes)");
+static unsigned int verbose = 0;
+module_param(verbose, int, 0644);
+MODULE_PARM_DESC(verbose, "verbose startup messages, default is 1 (yes)");
-static unsigned int dst_debug = 0;
-module_param(dst_debug, int, 0644);
-MODULE_PARM_DESC(dst_debug, "debug messages, default is 0 (no)");
+static unsigned int debug = 0;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "debug messages, default is 0 (no)");
static unsigned int dst_addons = 0;
module_param(dst_addons, int, 0644);
@@ -52,7 +52,7 @@ MODULE_PARM_DESC(new_fw, "Support for the new interface firmware, default 0");
-#define dprintk if (dst_debug) printk
+#define dprintk if (debug) printk
#define HAS_LOCK 1
#define ATTEMPT_TUNE 2
@@ -74,7 +74,8 @@ int dst_gpio_outb(struct dst_state* state, u32 mask, u32 enbb, u32 outhigh, int
enb.enb.mask = mask;
enb.enb.enable = enbb;
- dprintk("%s: mask=[%04x], enbb=[%04x], outhigh=[%04x]\n", __FUNCTION__, mask, enbb, outhigh);
+ if (verbose > 4)
+ dprintk("%s: mask=[%04x], enbb=[%04x], outhigh=[%04x]\n", __FUNCTION__, mask, enbb, outhigh);
if ((err = bt878_device_control(state->bt, DST_IG_ENABLE, &enb)) < 0) {
dprintk("%s: dst_gpio_enb error (err == %i, mask == %02x, enb == %02x)\n", __FUNCTION__, err, mask, enbb);
@@ -120,7 +121,8 @@ EXPORT_SYMBOL(dst_gpio_inb);
int rdc_reset_state(struct dst_state *state)
{
- dprintk("%s: Resetting state machine\n", __FUNCTION__);
+ if (verbose > 1)
+ dprintk("%s: Resetting state machine\n", __FUNCTION__);
if (dst_gpio_outb(state, RDC_8820_INT, RDC_8820_INT, 0, NO_DELAY) < 0) {
dprintk("%s: dst_gpio_outb ERROR !\n", __FUNCTION__);
@@ -141,7 +143,8 @@ EXPORT_SYMBOL(rdc_reset_state);
int rdc_8820_reset(struct dst_state *state)
{
- dprintk("%s: Resetting DST\n", __FUNCTION__);
+ if (verbose > 1)
+ dprintk("%s: Resetting DST\n", __FUNCTION__);
if (dst_gpio_outb(state, RDC_8820_RESET, RDC_8820_RESET, 0, NO_DELAY) < 0) {
dprintk("%s: dst_gpio_outb ERROR !\n", __FUNCTION__);
@@ -193,12 +196,14 @@ int dst_wait_dst_ready(struct dst_state *state, u8 delay_mode)
}
if ((reply & RDC_8820_PIO_0_ENABLE) == 0) {
- dprintk("%s: dst wait ready after %d\n", __FUNCTION__, i);
+ if (verbose > 4)
+ dprintk("%s: dst wait ready after %d\n", __FUNCTION__, i);
return 1;
}
msleep(1);
}
- dprintk("%s: dst wait NOT ready after %d\n", __FUNCTION__, i);
+ if (verbose > 1)
+ dprintk("%s: dst wait NOT ready after %d\n", __FUNCTION__, i);
return 0;
}
@@ -230,7 +235,8 @@ EXPORT_SYMBOL(dst_error_bailout);
int dst_comm_init(struct dst_state* state)
{
- dprintk ("%s: Initializing DST..\n", __FUNCTION__);
+ if (verbose > 1)
+ dprintk ("%s: Initializing DST..\n", __FUNCTION__);
if ((dst_pio_enable(state)) < 0) {
dprintk("%s: PIO Enable Failed.\n", __FUNCTION__);
return -1;
@@ -252,12 +258,14 @@ int write_dst(struct dst_state *state, u8 *data, u8 len)
int err;
int cnt;
- if (dst_debug && dst_verbose) {
+ if (debug && (verbose > 4)) {
u8 i;
- dprintk("%s writing", __FUNCTION__);
- for (i = 0; i < len; i++)
- dprintk(" %02x", data[i]);
- dprintk("\n");
+ if (verbose > 4) {
+ dprintk("%s writing", __FUNCTION__);
+ for (i = 0; i < len; i++)
+ dprintk(" %02x", data[i]);
+ dprintk("\n");
+ }
}
for (cnt = 0; cnt < 2; cnt++) {
if ((err = i2c_transfer(state->i2c, &msg, 1)) < 0) {
@@ -269,7 +277,8 @@ int write_dst(struct dst_state *state, u8 *data, u8 len)
}
if (cnt >= 2) {
- printk("%s: RDC 8820 RESET...\n", __FUNCTION__);
+ if (verbose > 1)
+ printk("%s: RDC 8820 RESET...\n", __FUNCTION__);
dst_error_bailout(state);
return -1;
@@ -296,14 +305,14 @@ int read_dst(struct dst_state *state, u8 * ret, u8 len)
break;
}
if (cnt >= 2) {
- printk("%s: RDC 8820 RESET...\n", __FUNCTION__);
+ if (verbose > 1)
+ printk("%s: RDC 8820 RESET...\n", __FUNCTION__);
dst_error_bailout(state);
return -1;
}
-
- dprintk("%s reply is 0x%x\n", __FUNCTION__, ret[0]);
- if (dst_debug && dst_verbose) {
+ if (debug && (verbose > 4)) {
+ dprintk("%s reply is 0x%x\n", __FUNCTION__, ret[0]);
for (err = 1; err < len; err++)
dprintk(" 0x%x", ret[err]);
if (err > 1)
@@ -783,7 +792,8 @@ int dst_command(struct dst_state* state, u8 * data, u8 len)
}
if (write_dst(state, data, len)) {
- dprintk("%s: Tring to recover.. \n", __FUNCTION__);
+ if (verbose > 1)
+ dprintk("%s: Tring to recover.. \n", __FUNCTION__);
if ((dst_error_recovery(state)) < 0) {
dprintk("%s: Recovery Failed.\n", __FUNCTION__);
return -1;
@@ -796,7 +806,8 @@ int dst_command(struct dst_state* state, u8 * data, u8 len)
}
if (read_dst(state, &reply, GET_ACK)) {
- dprintk("%s: Trying to recover.. \n", __FUNCTION__);
+ if (verbose > 1)
+ dprintk("%s: Trying to recover.. \n", __FUNCTION__);
if ((dst_error_recovery(state)) < 0) {
dprintk("%s: Recovery Failed.\n", __FUNCTION__);
return -1;
@@ -814,7 +825,8 @@ int dst_command(struct dst_state* state, u8 * data, u8 len)
return -1;
if (read_dst(state, state->rxbuffer, FIXED_COMM)) {
- dprintk("%s: Trying to recover.. \n", __FUNCTION__);
+ if (verbose > 1)
+ dprintk("%s: Trying to recover.. \n", __FUNCTION__);
if ((dst_error_recovery(state)) < 0) {
dprintk("%s: Recovery failed.\n", __FUNCTION__);
return -1;
@@ -1168,13 +1180,15 @@ static int dst_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_paramet
struct dst_state* state = (struct dst_state*) fe->demodulator_priv;
dst_set_freq(state, p->frequency);
- dprintk("Set Frequency = [%d]\n", p->frequency);
+ if (verbose > 4)
+ dprintk("Set Frequency = [%d]\n", p->frequency);
dst_set_inversion(state, p->inversion);
if (state->dst_type == DST_TYPE_IS_SAT) {
dst_set_fec(state, p->u.qpsk.fec_inner);
dst_set_symbolrate(state, p->u.qpsk.symbol_rate);
- dprintk("Set Symbolrate = [%d]\n", p->u.qpsk.symbol_rate);
+ if (verbose > 4)
+ dprintk("Set Symbolrate = [%d]\n", p->u.qpsk.symbol_rate);
} else if (state->dst_type == DST_TYPE_IS_TERR) {
dst_set_bandwidth(state, p->u.ofdm.bandwidth);
@@ -1340,8 +1354,6 @@ static struct dvb_frontend_ops dst_dvbc_ops = {
};
-
-
MODULE_DESCRIPTION("DST DVB-S/T/C Combo Frontend driver");
MODULE_AUTHOR("Jamie Honan, Manu Abraham");
MODULE_LICENSE("GPL");
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-06 18:34:51 +0000