Skip to content

L
linux-davinci
Commit a427de6f authored by Manu Abraham's avatar Manu Abraham Committed by Linus Torvalds
Browse files
Options

[PATCH] dvb: dst: dprrintk cleanup 

Code Cleanup:
o Remove debug noise
o Remove debug module parameter
  debug level is achieved using the verbosity level
o Updated to kernel coding style
  (case labels should not be indented)
Signed-off-by: default avatarManu Abraham <manu@linuxtv.org>
Signed-off-by: default avatarJohannes Stezenbach <js@linuxtv.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 94b7410c
Show whitespace changes
Inline Side-by-side
Showing with 461 additions and 635 deletions
drivers/media/dvb/bt8xx/dst.c
View file @ a427de6f
/* /*
Frontend/Card driver for TwinHan DST Frontend Frontend/Card driver for TwinHan DST Frontend
Copyright (C) 2003 Jamie Honan Copyright (C) 2003 Jamie Honan
Copyright (C) 2004, 2005 Manu Abraham (manu@kromtek.com) Copyright (C) 2004, 2005 Manu Abraham (manu@kromtek.com)
...@@ -19,7 +18,6 @@ ...@@ -19,7 +18,6 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -28,31 +26,45 @@ ...@@ -28,31 +26,45 @@
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <asm/div64.h> #include <asm/div64.h>
#include "dvb_frontend.h" #include "dvb_frontend.h"
#include "dst_priv.h" #include "dst_priv.h"
#include "dst_common.h" #include "dst_common.h"
static unsigned int verbose = 1; static unsigned int verbose = 1;
module_param(verbose, int, 0644); module_param(verbose, int, 0644);
MODULE_PARM_DESC(verbose, "verbose startup messages, default is 1 (yes)"); MODULE_PARM_DESC(verbose, "verbose startup messages, default is 1 (yes)");
static unsigned int debug = 1;
module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "debug messages, default is 0 (yes)");
static unsigned int dst_addons; static unsigned int dst_addons;
module_param(dst_addons, int, 0644); module_param(dst_addons, int, 0644);
MODULE_PARM_DESC(dst_addons, "CA daughterboard, default is 0 (No addons)"); MODULE_PARM_DESC(dst_addons, "CA daughterboard, default is 0 (No addons)");
#define dprintk if (debug) printk
#define HAS_LOCK 1 #define HAS_LOCK 1
#define ATTEMPT_TUNE 2 #define ATTEMPT_TUNE 2
#define HAS_POWER 4 #define HAS_POWER 4
static void dst_packsize(struct dst_state* state, int psize) #define DST_ERROR 0
#define DST_NOTICE 1
#define DST_INFO 2
#define DST_DEBUG 3
#define dprintk(x, y, z, format, arg...) do { \
if (z) { \
if ((x > DST_ERROR) && (x > y)) \
printk(KERN_ERR "%s: " format "\n", __FUNCTION__ , ##arg); \
else if ((x > DST_NOTICE) && (x > y)) \
printk(KERN_NOTICE "%s: " format "\n", __FUNCTION__ , ##arg); \
else if ((x > DST_INFO) && (x > y)) \
printk(KERN_INFO "%s: " format "\n", __FUNCTION__ , ##arg); \
else if ((x > DST_DEBUG) && (x > y)) \
printk(KERN_DEBUG "%s: " format "\n", __FUNCTION__ , ##arg); \
} else { \
if (x > y) \
printk(format, ##arg); \
} \
} while(0)
static void dst_packsize(struct dst_state *state, int psize)
{ {
union dst_gpio_packet bits; union dst_gpio_packet bits;
...@@ -60,7 +72,7 @@ static void dst_packsize(struct dst_state* state, int psize) ...@@ -60,7 +72,7 @@ static void dst_packsize(struct dst_state* state, int psize)
bt878_device_control(state->bt, DST_IG_TS, &bits); bt878_device_control(state->bt, DST_IG_TS, &bits);
} }
int dst_gpio_outb(struct dst_state* state, u32 mask, u32 enbb, u32 outhigh, int delay) int dst_gpio_outb(struct dst_state *state, u32 mask, u32 enbb, u32 outhigh, int delay)
{ {
union dst_gpio_packet enb; union dst_gpio_packet enb;
union dst_gpio_packet bits; union dst_gpio_packet bits;
...@@ -68,63 +80,55 @@ int dst_gpio_outb(struct dst_state* state, u32 mask, u32 enbb, u32 outhigh, int ...@@ -68,63 +80,55 @@ int dst_gpio_outb(struct dst_state* state, u32 mask, u32 enbb, u32 outhigh, int
enb.enb.mask = mask; enb.enb.mask = mask;
enb.enb.enable = enbb; enb.enb.enable = enbb;
if (verbose > 4)
dprintk("%s: mask=[%04x], enbb=[%04x], outhigh=[%04x]\n", __FUNCTION__, mask, enbb, outhigh);
dprintk(verbose, DST_INFO, 1, "mask=[%04x], enbb=[%04x], outhigh=[%04x]", mask, enbb, outhigh);
if ((err = bt878_device_control(state->bt, DST_IG_ENABLE, &enb)) < 0) { 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); dprintk(verbose, DST_INFO, 1, "dst_gpio_enb error (err == %i, mask == %02x, enb == %02x)", err, mask, enbb);
return -EREMOTEIO; return -EREMOTEIO;
} }
udelay(1000); udelay(1000);
/* because complete disabling means no output, no need to do output packet */ /* because complete disabling means no output, no need to do output packet */
if (enbb == 0) if (enbb == 0)
return 0; return 0;
if (delay) if (delay)
msleep(10); msleep(10);
bits.outp.mask = enbb; bits.outp.mask = enbb;
bits.outp.highvals = outhigh; bits.outp.highvals = outhigh;
if ((err = bt878_device_control(state->bt, DST_IG_WRITE, &bits)) < 0) { if ((err = bt878_device_control(state->bt, DST_IG_WRITE, &bits)) < 0) {
dprintk("%s: dst_gpio_outb error (err == %i, enbb == %02x, outhigh == %02x)\n", __FUNCTION__, err, enbb, outhigh); dprintk(verbose, DST_INFO, 1, "dst_gpio_outb error (err == %i, enbb == %02x, outhigh == %02x)", err, enbb, outhigh);
return -EREMOTEIO; return -EREMOTEIO;
} }
return 0; return 0;
} }
EXPORT_SYMBOL(dst_gpio_outb); EXPORT_SYMBOL(dst_gpio_outb);
int dst_gpio_inb(struct dst_state *state, u8 * result) int dst_gpio_inb(struct dst_state *state, u8 *result)
{ {
union dst_gpio_packet rd_packet; union dst_gpio_packet rd_packet;
int err; int err;
*result = 0; *result = 0;
if ((err = bt878_device_control(state->bt, DST_IG_READ, &rd_packet)) < 0) { if ((err = bt878_device_control(state->bt, DST_IG_READ, &rd_packet)) < 0) {
dprintk("%s: dst_gpio_inb error (err == %i)\n", __FUNCTION__, err); dprintk(verbose, DST_ERROR, 1, "dst_gpio_inb error (err == %i)\n", err);
return -EREMOTEIO; return -EREMOTEIO;
} }
*result = (u8) rd_packet.rd.value; *result = (u8) rd_packet.rd.value;
return 0; return 0;
} }
EXPORT_SYMBOL(dst_gpio_inb); EXPORT_SYMBOL(dst_gpio_inb);
int rdc_reset_state(struct dst_state *state) int rdc_reset_state(struct dst_state *state)
{ {
if (verbose > 1) dprintk(verbose, DST_INFO, 1, "Resetting state machine");
dprintk("%s: Resetting state machine\n", __FUNCTION__);
if (dst_gpio_outb(state, RDC_8820_INT, RDC_8820_INT, 0, NO_DELAY) < 0) { if (dst_gpio_outb(state, RDC_8820_INT, RDC_8820_INT, 0, NO_DELAY) < 0) {
dprintk("%s: dst_gpio_outb ERROR !\n", __FUNCTION__); dprintk(verbose, DST_ERROR, 1, "dst_gpio_outb ERROR !");
return -1; return -1;
} }
msleep(10); msleep(10);
if (dst_gpio_outb(state, RDC_8820_INT, RDC_8820_INT, RDC_8820_INT, NO_DELAY) < 0) { if (dst_gpio_outb(state, RDC_8820_INT, RDC_8820_INT, RDC_8820_INT, NO_DELAY) < 0) {
dprintk("%s: dst_gpio_outb ERROR !\n", __FUNCTION__); dprintk(verbose, DST_ERROR, 1, "dst_gpio_outb ERROR !");
msleep(10); msleep(10);
return -1; return -1;
} }
...@@ -135,16 +139,14 @@ EXPORT_SYMBOL(rdc_reset_state); ...@@ -135,16 +139,14 @@ EXPORT_SYMBOL(rdc_reset_state);
int rdc_8820_reset(struct dst_state *state) int rdc_8820_reset(struct dst_state *state)
{ {
if (verbose > 1) dprintk(verbose, DST_DEBUG, 1, "Resetting DST");
dprintk("%s: Resetting DST\n", __FUNCTION__);
if (dst_gpio_outb(state, RDC_8820_RESET, RDC_8820_RESET, 0, NO_DELAY) < 0) { if (dst_gpio_outb(state, RDC_8820_RESET, RDC_8820_RESET, 0, NO_DELAY) < 0) {
dprintk("%s: dst_gpio_outb ERROR !\n", __FUNCTION__); dprintk(verbose, DST_ERROR, 1, "dst_gpio_outb ERROR !");
return -1; return -1;
} }
udelay(1000); udelay(1000);
if (dst_gpio_outb(state, RDC_8820_RESET, RDC_8820_RESET, RDC_8820_RESET, DELAY) < 0) { if (dst_gpio_outb(state, RDC_8820_RESET, RDC_8820_RESET, RDC_8820_RESET, DELAY) < 0) {
dprintk("%s: dst_gpio_outb ERROR !\n", __FUNCTION__); dprintk(verbose, DST_ERROR, 1, "dst_gpio_outb ERROR !");
return -1; return -1;
} }
...@@ -155,10 +157,11 @@ EXPORT_SYMBOL(rdc_8820_reset); ...@@ -155,10 +157,11 @@ EXPORT_SYMBOL(rdc_8820_reset);
int dst_pio_enable(struct dst_state *state) int dst_pio_enable(struct dst_state *state)
{ {
if (dst_gpio_outb(state, ~0, RDC_8820_PIO_0_ENABLE, 0, NO_DELAY) < 0) { if (dst_gpio_outb(state, ~0, RDC_8820_PIO_0_ENABLE, 0, NO_DELAY) < 0) {
dprintk("%s: dst_gpio_outb ERROR !\n", __FUNCTION__); dprintk(verbose, DST_ERROR, 1, "dst_gpio_outb ERROR !");
return -1; return -1;
} }
udelay(1000); udelay(1000);
return 0; return 0;
} }
EXPORT_SYMBOL(dst_pio_enable); EXPORT_SYMBOL(dst_pio_enable);
...@@ -166,7 +169,7 @@ EXPORT_SYMBOL(dst_pio_enable); ...@@ -166,7 +169,7 @@ EXPORT_SYMBOL(dst_pio_enable);
int dst_pio_disable(struct dst_state *state) int dst_pio_disable(struct dst_state *state)
{ {
if (dst_gpio_outb(state, ~0, RDC_8820_PIO_0_DISABLE, RDC_8820_PIO_0_DISABLE, NO_DELAY) < 0) { if (dst_gpio_outb(state, ~0, RDC_8820_PIO_0_DISABLE, RDC_8820_PIO_0_DISABLE, NO_DELAY) < 0) {
dprintk("%s: dst_gpio_outb ERROR !\n", __FUNCTION__); dprintk(verbose, DST_ERROR, 1, "dst_gpio_outb ERROR !");
return -1; return -1;
} }
if (state->type_flags & DST_TYPE_HAS_FW_1) if (state->type_flags & DST_TYPE_HAS_FW_1)
...@@ -183,19 +186,16 @@ int dst_wait_dst_ready(struct dst_state *state, u8 delay_mode) ...@@ -183,19 +186,16 @@ int dst_wait_dst_ready(struct dst_state *state, u8 delay_mode)
for (i = 0; i < 200; i++) { for (i = 0; i < 200; i++) {
if (dst_gpio_inb(state, &reply) < 0) { if (dst_gpio_inb(state, &reply) < 0) {
dprintk("%s: dst_gpio_inb ERROR !\n", __FUNCTION__); dprintk(verbose, DST_ERROR, 1, "dst_gpio_inb ERROR !");
return -1; return -1;
} }
if ((reply & RDC_8820_PIO_0_ENABLE) == 0) { if ((reply & RDC_8820_PIO_0_ENABLE) == 0) {
if (verbose > 4) dprintk(verbose, DST_INFO, 1, "dst wait ready after %d", i);
dprintk("%s: dst wait ready after %d\n", __FUNCTION__, i);
return 1; return 1;
} }
msleep(10); msleep(10);
} }
if (verbose > 1) dprintk(verbose, DST_NOTICE, 1, "dst wait NOT ready after %d", i);
dprintk("%s: dst wait NOT ready after %d\n", __FUNCTION__, i);
return 0; return 0;
} }
...@@ -203,7 +203,7 @@ EXPORT_SYMBOL(dst_wait_dst_ready); ...@@ -203,7 +203,7 @@ EXPORT_SYMBOL(dst_wait_dst_ready);
int dst_error_recovery(struct dst_state *state) int dst_error_recovery(struct dst_state *state)
{ {
dprintk("%s: Trying to return from previous errors...\n", __FUNCTION__); dprintk(verbose, DST_NOTICE, 1, "Trying to return from previous errors.");
dst_pio_disable(state); dst_pio_disable(state);
msleep(10); msleep(10);
dst_pio_enable(state); dst_pio_enable(state);
...@@ -215,7 +215,7 @@ EXPORT_SYMBOL(dst_error_recovery); ...@@ -215,7 +215,7 @@ EXPORT_SYMBOL(dst_error_recovery);
int dst_error_bailout(struct dst_state *state) int dst_error_bailout(struct dst_state *state)
{ {
dprintk("%s: Trying to bailout from previous error...\n", __FUNCTION__); dprintk(verbose, DST_INFO, 1, "Trying to bailout from previous error.");
rdc_8820_reset(state); rdc_8820_reset(state);
dst_pio_disable(state); dst_pio_disable(state);
msleep(10); msleep(10);
...@@ -224,17 +224,15 @@ int dst_error_bailout(struct dst_state *state) ...@@ -224,17 +224,15 @@ int dst_error_bailout(struct dst_state *state)
} }
EXPORT_SYMBOL(dst_error_bailout); EXPORT_SYMBOL(dst_error_bailout);
int dst_comm_init(struct dst_state *state)
int dst_comm_init(struct dst_state* state)
{ {
if (verbose > 1) dprintk(verbose, DST_INFO, 1, "Initializing DST.");
dprintk ("%s: Initializing DST..\n", __FUNCTION__);
if ((dst_pio_enable(state)) < 0) { if ((dst_pio_enable(state)) < 0) {
dprintk("%s: PIO Enable Failed.\n", __FUNCTION__); dprintk(verbose, DST_ERROR, 1, "PIO Enable Failed");
return -1; return -1;
} }
if ((rdc_reset_state(state)) < 0) { if ((rdc_reset_state(state)) < 0) {
dprintk("%s: RDC 8820 State RESET Failed.\n", __FUNCTION__); dprintk(verbose, DST_ERROR, 1, "RDC 8820 State RESET Failed.");
return -1; return -1;
} }
if (state->type_flags & DST_TYPE_HAS_FW_1) if (state->type_flags & DST_TYPE_HAS_FW_1)
...@@ -246,36 +244,33 @@ int dst_comm_init(struct dst_state* state) ...@@ -246,36 +244,33 @@ int dst_comm_init(struct dst_state* state)
} }
EXPORT_SYMBOL(dst_comm_init); EXPORT_SYMBOL(dst_comm_init);
int write_dst(struct dst_state *state, u8 *data, u8 len) int write_dst(struct dst_state *state, u8 *data, u8 len)
{ {
struct i2c_msg msg = { struct i2c_msg msg = {
.addr = state->config->demod_address,.flags = 0,.buf = data,.len = len .addr = state->config->demod_address,
.flags = 0,
.buf = data,
.len = len
}; };
int err; int err;
int cnt; u8 cnt, i;
if (debug && (verbose > 4)) {
u8 i; dprintk(verbose, DST_NOTICE, 0, "writing [ ");
if (verbose > 4) {
dprintk("%s writing [ ", __FUNCTION__);
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
dprintk("%02x ", data[i]); dprintk(verbose, DST_NOTICE, 0, "%02x ", data[i]);
dprintk("]\n"); dprintk(verbose, DST_NOTICE, 0, "]\n");
}
}
for (cnt = 0; cnt < 2; cnt++) { for (cnt = 0; cnt < 2; cnt++) {
if ((err = i2c_transfer(state->i2c, &msg, 1)) < 0) { if ((err = i2c_transfer(state->i2c, &msg, 1)) < 0) {
dprintk("%s: _write_dst error (err == %i, len == 0x%02x, b0 == 0x%02x)\n", __FUNCTION__, err, len, data[0]); dprintk(verbose, DST_INFO, 1, "_write_dst error (err == %i, len == 0x%02x, b0 == 0x%02x)", err, len, data[0]);
dst_error_recovery(state); dst_error_recovery(state);
continue; continue;
} else } else
break; break;
} }
if (cnt >= 2) { if (cnt >= 2) {
if (verbose > 1) dprintk(verbose, DST_INFO, 1, "RDC 8820 RESET");
printk("%s: RDC 8820 RESET...\n", __FUNCTION__);
dst_error_bailout(state); dst_error_bailout(state);
return -1; return -1;
...@@ -285,36 +280,37 @@ int write_dst(struct dst_state *state, u8 *data, u8 len) ...@@ -285,36 +280,37 @@ int write_dst(struct dst_state *state, u8 *data, u8 len)
} }
EXPORT_SYMBOL(write_dst); EXPORT_SYMBOL(write_dst);
int read_dst(struct dst_state *state, u8 * ret, u8 len) int read_dst(struct dst_state *state, u8 *ret, u8 len)
{ {
struct i2c_msg msg = {.addr = state->config->demod_address,.flags = I2C_M_RD,.buf = ret,.len = len }; struct i2c_msg msg = {
.addr = state->config->demod_address,
.flags = I2C_M_RD,
.buf = ret,
.len = len
};
int err; int err;
int cnt; int cnt;
for (cnt = 0; cnt < 2; cnt++) { for (cnt = 0; cnt < 2; cnt++) {
if ((err = i2c_transfer(state->i2c, &msg, 1)) < 0) { if ((err = i2c_transfer(state->i2c, &msg, 1)) < 0) {
dprintk(verbose, DST_INFO, 1, "read_dst error (err == %i, len == 0x%02x, b0 == 0x%02x)", err, len, ret[0]);
dprintk("%s: read_dst error (err == %i, len == 0x%02x, b0 == 0x%02x)\n", __FUNCTION__, err, len, ret[0]);
dst_error_recovery(state); dst_error_recovery(state);
continue; continue;
} else } else
break; break;
} }
if (cnt >= 2) { if (cnt >= 2) {
if (verbose > 1) dprintk(verbose, DST_INFO, 1, "RDC 8820 RESET");
printk("%s: RDC 8820 RESET...\n", __FUNCTION__);
dst_error_bailout(state); dst_error_bailout(state);
return -1; return -1;
} }
if (debug && (verbose > 4)) { dprintk(verbose, DST_DEBUG, 1, "reply is 0x%x", ret[0]);
dprintk("%s reply is 0x%x\n", __FUNCTION__, ret[0]);
for (err = 1; err < len; err++) for (err = 1; err < len; err++)
dprintk(" 0x%x", ret[err]); dprintk(verbose, DST_DEBUG, 0, " 0x%x", ret[err]);
if (err > 1) if (err > 1)
dprintk("\n"); dprintk(verbose, DST_DEBUG, 0, "\n");
}
return 0; return 0;
} }
...@@ -323,18 +319,15 @@ EXPORT_SYMBOL(read_dst); ...@@ -323,18 +319,15 @@ EXPORT_SYMBOL(read_dst);
static int dst_set_polarization(struct dst_state *state) static int dst_set_polarization(struct dst_state *state)
{ {
switch (state->voltage) { switch (state->voltage) {
case SEC_VOLTAGE_13: // vertical case SEC_VOLTAGE_13: /* Vertical */
dprintk("%s: Polarization=[Vertical]\n", __FUNCTION__); dprintk(verbose, DST_INFO, 1, "Polarization=[Vertical]");
state->tx_tuna[8] &= ~0x40; //1 state->tx_tuna[8] &= ~0x40;
break; break;
case SEC_VOLTAGE_18: /* Horizontal */
case SEC_VOLTAGE_18: // horizontal dprintk(verbose, DST_INFO, 1, "Polarization=[Horizontal]");
dprintk("%s: Polarization=[Horizontal]\n", __FUNCTION__); state->tx_tuna[8] |= 0x40;
state->tx_tuna[8] |= 0x40; // 0
break; break;
case SEC_VOLTAGE_OFF: case SEC_VOLTAGE_OFF:
break; break;
} }
...@@ -344,14 +337,12 @@ static int dst_set_polarization(struct dst_state *state) ...@@ -344,14 +337,12 @@ static int dst_set_polarization(struct dst_state *state)
static int dst_set_freq(struct dst_state *state, u32 freq) static int dst_set_freq(struct dst_state *state, u32 freq)
{ {
state->frequency = freq; state->frequency = freq;
if (verbose > 4) dprintk(verbose, DST_INFO, 1, "set Frequency %u", freq);
dprintk("%s: set Frequency %u\n", __FUNCTION__, freq);
if (state->dst_type == DST_TYPE_IS_SAT) { if (state->dst_type == DST_TYPE_IS_SAT) {
freq = freq / 1000; freq = freq / 1000;
if (freq < 950 || freq > 2150) if (freq < 950 || freq > 2150)
return -EINVAL; return -EINVAL;
state->tx_tuna[2] = (freq >> 8); state->tx_tuna[2] = (freq >> 8);
state->tx_tuna[3] = (u8) freq; state->tx_tuna[3] = (u8) freq;
state->tx_tuna[4] = 0x01; state->tx_tuna[4] = 0x01;
...@@ -360,27 +351,24 @@ static int dst_set_freq(struct dst_state *state, u32 freq) ...@@ -360,27 +351,24 @@ static int dst_set_freq(struct dst_state *state, u32 freq)
if (freq < 1531) if (freq < 1531)
state->tx_tuna[8] |= 0x04; state->tx_tuna[8] |= 0x04;
} }
} else if (state->dst_type == DST_TYPE_IS_TERR) { } else if (state->dst_type == DST_TYPE_IS_TERR) {
freq = freq / 1000; freq = freq / 1000;
if (freq < 137000 || freq > 858000) if (freq < 137000 || freq > 858000)
return -EINVAL; return -EINVAL;
state->tx_tuna[2] = (freq >> 16) & 0xff; state->tx_tuna[2] = (freq >> 16) & 0xff;
state->tx_tuna[3] = (freq >> 8) & 0xff; state->tx_tuna[3] = (freq >> 8) & 0xff;
state->tx_tuna[4] = (u8) freq; state->tx_tuna[4] = (u8) freq;
} else if (state->dst_type == DST_TYPE_IS_CABLE) { } else if (state->dst_type == DST_TYPE_IS_CABLE) {
state->tx_tuna[2] = (freq >> 16) & 0xff; state->tx_tuna[2] = (freq >> 16) & 0xff;
state->tx_tuna[3] = (freq >> 8) & 0xff; state->tx_tuna[3] = (freq >> 8) & 0xff;
state->tx_tuna[4] = (u8) freq; state->tx_tuna[4] = (u8) freq;
} else } else
return -EINVAL; return -EINVAL;
return 0; return 0;
} }
static int dst_set_bandwidth(struct dst_state* state, fe_bandwidth_t bandwidth) static int dst_set_bandwidth(struct dst_state *state, fe_bandwidth_t bandwidth)
{ {
state->bandwidth = bandwidth; state->bandwidth = bandwidth;
...@@ -396,7 +384,6 @@ static int dst_set_bandwidth(struct dst_state* state, fe_bandwidth_t bandwidth) ...@@ -396,7 +384,6 @@ static int dst_set_bandwidth(struct dst_state* state, fe_bandwidth_t bandwidth)
state->tx_tuna[7] = 0x00; state->tx_tuna[7] = 0x00;
} }
break; break;
case BANDWIDTH_7_MHZ: case BANDWIDTH_7_MHZ:
if (state->dst_hw_cap & DST_TYPE_HAS_CA) if (state->dst_hw_cap & DST_TYPE_HAS_CA)
state->tx_tuna[7] = 0x07; state->tx_tuna[7] = 0x07;
...@@ -405,7 +392,6 @@ static int dst_set_bandwidth(struct dst_state* state, fe_bandwidth_t bandwidth) ...@@ -405,7 +392,6 @@ static int dst_set_bandwidth(struct dst_state* state, fe_bandwidth_t bandwidth)
state->tx_tuna[7] = 0x00; state->tx_tuna[7] = 0x00;
} }
break; break;
case BANDWIDTH_8_MHZ: case BANDWIDTH_8_MHZ:
if (state->dst_hw_cap & DST_TYPE_HAS_CA) if (state->dst_hw_cap & DST_TYPE_HAS_CA)
state->tx_tuna[7] = 0x08; state->tx_tuna[7] = 0x08;
...@@ -414,64 +400,58 @@ static int dst_set_bandwidth(struct dst_state* state, fe_bandwidth_t bandwidth) ...@@ -414,64 +400,58 @@ static int dst_set_bandwidth(struct dst_state* state, fe_bandwidth_t bandwidth)
state->tx_tuna[7] = 0x00; state->tx_tuna[7] = 0x00;
} }
break; break;
default: default:
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
} }
static int dst_set_inversion(struct dst_state* state, fe_spectral_inversion_t inversion) static int dst_set_inversion(struct dst_state *state, fe_spectral_inversion_t inversion)
{ {
state->inversion = inversion; state->inversion = inversion;
switch (inversion) { switch (inversion) {
case INVERSION_OFF: // Inversion = Normal case INVERSION_OFF: /* Inversion = Normal */
state->tx_tuna[8] &= ~0x80; state->tx_tuna[8] &= ~0x80;
break; break;
case INVERSION_ON: case INVERSION_ON:
state->tx_tuna[8] |= 0x80; state->tx_tuna[8] |= 0x80;
break; break;
default: default:
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
} }
static int dst_set_fec(struct dst_state* state, fe_code_rate_t fec) static int dst_set_fec(struct dst_state *state, fe_code_rate_t fec)
{ {
state->fec = fec; state->fec = fec;
return 0; return 0;
} }
static fe_code_rate_t dst_get_fec(struct dst_state* state) static fe_code_rate_t dst_get_fec(struct dst_state *state)
{ {
return state->fec; return state->fec;
} }
static int dst_set_symbolrate(struct dst_state* state, u32 srate) static int dst_set_symbolrate(struct dst_state *state, u32 srate)
{ {
u32 symcalc; u32 symcalc;
u64 sval; u64 sval;
state->symbol_rate = srate; state->symbol_rate = srate;
if (state->dst_type == DST_TYPE_IS_TERR) { if (state->dst_type == DST_TYPE_IS_TERR) {
return 0; return 0;
} }
if (debug > 4) dprintk(verbose, DST_INFO, 1, "set symrate %u", srate);
dprintk("%s: set symrate %u\n", __FUNCTION__, srate);
srate /= 1000; srate /= 1000;
if (state->type_flags & DST_TYPE_HAS_SYMDIV) { if (state->type_flags & DST_TYPE_HAS_SYMDIV) {
sval = srate; sval = srate;
sval <<= 20; sval <<= 20;
do_div(sval, 88000); do_div(sval, 88000);
symcalc = (u32) sval; symcalc = (u32) sval;
dprintk(verbose, DST_INFO, 1, "set symcalc %u", symcalc);
if (debug > 4)
dprintk("%s: set symcalc %u\n", __FUNCTION__, symcalc);
state->tx_tuna[5] = (u8) (symcalc >> 12); state->tx_tuna[5] = (u8) (symcalc >> 12);
state->tx_tuna[6] = (u8) (symcalc >> 4); state->tx_tuna[6] = (u8) (symcalc >> 4);
state->tx_tuna[7] = (u8) (symcalc << 4); state->tx_tuna[7] = (u8) (symcalc << 4);
...@@ -499,23 +479,18 @@ static int dst_set_modulation(struct dst_state *state, fe_modulation_t modulatio ...@@ -499,23 +479,18 @@ static int dst_set_modulation(struct dst_state *state, fe_modulation_t modulatio
case QAM_16: case QAM_16:
state->tx_tuna[8] = 0x10; state->tx_tuna[8] = 0x10;
break; break;
case QAM_32: case QAM_32:
state->tx_tuna[8] = 0x20; state->tx_tuna[8] = 0x20;
break; break;
case QAM_64: case QAM_64:
state->tx_tuna[8] = 0x40; state->tx_tuna[8] = 0x40;
break; break;
case QAM_128: case QAM_128:
state->tx_tuna[8] = 0x80; state->tx_tuna[8] = 0x80;
break; break;
case QAM_256: case QAM_256:
state->tx_tuna[8] = 0x00; state->tx_tuna[8] = 0x00;
break; break;
case QPSK: case QPSK:
case QAM_AUTO: case QAM_AUTO:
case VSB_8: case VSB_8:
...@@ -534,7 +509,7 @@ static fe_modulation_t dst_get_modulation(struct dst_state *state) ...@@ -534,7 +509,7 @@ static fe_modulation_t dst_get_modulation(struct dst_state *state)
} }
u8 dst_check_sum(u8 * buf, u32 len) u8 dst_check_sum(u8 *buf, u32 len)
{ {
u32 i; u32 i;
u8 val = 0; u8 val = 0;
...@@ -549,26 +524,24 @@ EXPORT_SYMBOL(dst_check_sum); ...@@ -549,26 +524,24 @@ EXPORT_SYMBOL(dst_check_sum);
static void dst_type_flags_print(u32 type_flags) static void dst_type_flags_print(u32 type_flags)
{ {
printk("DST type flags :"); dprintk(verbose, DST_ERROR, 0, "DST type flags :");
if (type_flags & DST_TYPE_HAS_NEWTUNE) if (type_flags & DST_TYPE_HAS_NEWTUNE)
printk(" 0x%x newtuner", DST_TYPE_HAS_NEWTUNE); dprintk(verbose, DST_ERROR, 0, " 0x%x newtuner", DST_TYPE_HAS_NEWTUNE);
if (type_flags & DST_TYPE_HAS_TS204) if (type_flags & DST_TYPE_HAS_TS204)
printk(" 0x%x ts204", DST_TYPE_HAS_TS204); dprintk(verbose, DST_ERROR, 0, " 0x%x ts204", DST_TYPE_HAS_TS204);
if (type_flags & DST_TYPE_HAS_SYMDIV) if (type_flags & DST_TYPE_HAS_SYMDIV)
printk(" 0x%x symdiv", DST_TYPE_HAS_SYMDIV); dprintk(verbose, DST_ERROR, 0, " 0x%x symdiv", DST_TYPE_HAS_SYMDIV);
if (type_flags & DST_TYPE_HAS_FW_1) if (type_flags & DST_TYPE_HAS_FW_1)
printk(" 0x%x firmware version = 1", DST_TYPE_HAS_FW_1); dprintk(verbose, DST_ERROR, 0, " 0x%x firmware version = 1", DST_TYPE_HAS_FW_1);
if (type_flags & DST_TYPE_HAS_FW_2) if (type_flags & DST_TYPE_HAS_FW_2)
printk(" 0x%x firmware version = 2", DST_TYPE_HAS_FW_2); dprintk(verbose, DST_ERROR, 0, " 0x%x firmware version = 2", DST_TYPE_HAS_FW_2);
if (type_flags & DST_TYPE_HAS_FW_3) if (type_flags & DST_TYPE_HAS_FW_3)
printk(" 0x%x firmware version = 3", DST_TYPE_HAS_FW_3); dprintk(verbose, DST_ERROR, 0, " 0x%x firmware version = 3", DST_TYPE_HAS_FW_3);
// if ((type_flags & DST_TYPE_HAS_FW_BUILD) && new_fw) dprintk(verbose, DST_ERROR, 0, "\n");
printk("\n");
} }
static int dst_type_print (u8 type) static int dst_type_print(u8 type)
{ {
char *otype; char *otype;
switch (type) { switch (type) {
...@@ -585,10 +558,10 @@ static int dst_type_print (u8 type) ...@@ -585,10 +558,10 @@ static int dst_type_print (u8 type)
break; break;
default: default:
printk("%s: invalid dst type %d\n", __FUNCTION__, type); dprintk(verbose, DST_INFO, 1, "invalid dst type %d", type);
return -EINVAL; return -EINVAL;
} }
printk("DST type : %s\n", otype); dprintk(verbose, DST_INFO, 1, "DST type: %s", otype);
return 0; return 0;
} }
...@@ -772,53 +745,45 @@ static int dst_get_device_id(struct dst_state *state) ...@@ -772,53 +745,45 @@ static int dst_get_device_id(struct dst_state *state)
if (write_dst(state, device_type, FIXED_COMM)) if (write_dst(state, device_type, FIXED_COMM))
return -1; /* Write failed */ return -1; /* Write failed */
if ((dst_pio_disable(state)) < 0) if ((dst_pio_disable(state)) < 0)
return -1; return -1;
if (read_dst(state, &reply, GET_ACK)) if (read_dst(state, &reply, GET_ACK))
return -1; /* Read failure */ return -1; /* Read failure */
if (reply != ACK) { if (reply != ACK) {
dprintk("%s: Write not Acknowledged! [Reply=0x%02x]\n", __FUNCTION__, reply); dprintk(verbose, DST_INFO, 1, "Write not Acknowledged! [Reply=0x%02x]", reply);
return -1; /* Unack'd write */ return -1; /* Unack'd write */
} }
if (!dst_wait_dst_ready(state, DEVICE_INIT)) if (!dst_wait_dst_ready(state, DEVICE_INIT))
return -1; /* DST not ready yet */ return -1; /* DST not ready yet */
if (read_dst(state, state->rxbuffer, FIXED_COMM)) if (read_dst(state, state->rxbuffer, FIXED_COMM))
return -1; return -1;
dst_pio_disable(state); dst_pio_disable(state);
if (state->rxbuffer[7] != dst_check_sum(state->rxbuffer, 7)) { if (state->rxbuffer[7] != dst_check_sum(state->rxbuffer, 7)) {
dprintk("%s: Checksum failure! \n", __FUNCTION__); dprintk(verbose, DST_INFO, 1, "Checksum failure!");
return -1; /* Checksum failure */ return -1; /* Checksum failure */
} }
state->rxbuffer[7] = '\0'; state->rxbuffer[7] = '\0';
for (i = 0, p_dst_type = dst_tlist; i < ARRAY_SIZE (dst_tlist); i++, p_dst_type++) { for (i = 0, p_dst_type = dst_tlist; i < ARRAY_SIZE(dst_tlist); i++, p_dst_type++) {
if (!strncmp (&state->rxbuffer[p_dst_type->offset], p_dst_type->device_id, strlen (p_dst_type->device_id))) { if (!strncmp (&state->rxbuffer[p_dst_type->offset], p_dst_type->device_id, strlen (p_dst_type->device_id))) {
use_type_flags = p_dst_type->type_flags; use_type_flags = p_dst_type->type_flags;
use_dst_type = p_dst_type->dst_type; use_dst_type = p_dst_type->dst_type;
/* Card capabilities */ /* Card capabilities */
state->dst_hw_cap = p_dst_type->dst_feature; state->dst_hw_cap = p_dst_type->dst_feature;
printk ("%s: Recognise [%s]\n", __FUNCTION__, p_dst_type->device_id); dprintk(verbose, DST_ERROR, 1, "Recognise [%s]\n", p_dst_type->device_id);
break; break;
} }
} }
if (i >= sizeof (dst_tlist) / sizeof (dst_tlist [0])) { if (i >= sizeof (dst_tlist) / sizeof (dst_tlist [0])) {
printk("%s: Unable to recognize %s or %s\n", __FUNCTION__, &state->rxbuffer[0], &state->rxbuffer[1]); dprintk(verbose, DST_ERROR, 1, "Unable to recognize %s or %s", &state->rxbuffer[0], &state->rxbuffer[1]);
printk("%s: please email linux-dvb@linuxtv.org with this type in\n", __FUNCTION__); dprintk(verbose, DST_ERROR, 1, "please email linux-dvb@linuxtv.org with this type in");
use_dst_type = DST_TYPE_IS_SAT; use_dst_type = DST_TYPE_IS_SAT;
use_type_flags = DST_TYPE_HAS_SYMDIV; use_type_flags = DST_TYPE_HAS_SYMDIV;
} }
dst_type_print(use_dst_type); dst_type_print(use_dst_type);
state->type_flags = use_type_flags; state->type_flags = use_type_flags;
state->dst_type = use_dst_type; state->dst_type = use_dst_type;
...@@ -834,7 +799,7 @@ static int dst_get_device_id(struct dst_state *state) ...@@ -834,7 +799,7 @@ static int dst_get_device_id(struct dst_state *state)
static int dst_probe(struct dst_state *state) static int dst_probe(struct dst_state *state)
{ {
if ((rdc_8820_reset(state)) < 0) { if ((rdc_8820_reset(state)) < 0) {
dprintk("%s: RDC 8820 RESET Failed.\n", __FUNCTION__); dprintk(verbose, DST_ERROR, 1, "RDC 8820 RESET Failed.");
return -1; return -1;
} }
if (dst_addons & DST_TYPE_HAS_CA) if (dst_addons & DST_TYPE_HAS_CA)
...@@ -843,80 +808,69 @@ static int dst_probe(struct dst_state *state) ...@@ -843,80 +808,69 @@ static int dst_probe(struct dst_state *state)
msleep(100); msleep(100);
if ((dst_comm_init(state)) < 0) { if ((dst_comm_init(state)) < 0) {
dprintk("%s: DST Initialization Failed.\n", __FUNCTION__); dprintk(verbose, DST_ERROR, 1, "DST Initialization Failed.");
return -1; return -1;
} }
msleep(100); msleep(100);
if (dst_get_device_id(state) < 0) { if (dst_get_device_id(state) < 0) {
dprintk("%s: unknown device.\n", __FUNCTION__); dprintk(verbose, DST_ERROR, 1, "unknown device.");
return -1; return -1;
} }
return 0; return 0;
} }
int dst_command(struct dst_state* state, u8 * data, u8 len) int dst_command(struct dst_state *state, u8 *data, u8 len)
{ {
u8 reply; u8 reply;
if ((dst_comm_init(state)) < 0) { if ((dst_comm_init(state)) < 0) {
dprintk("%s: DST Communication Initialization Failed.\n", __FUNCTION__); dprintk(verbose, DST_NOTICE, 1, "DST Communication Initialization Failed.");
return -1; return -1;
} }
if (write_dst(state, data, len)) { if (write_dst(state, data, len)) {
if (verbose > 1) dprintk(verbose, DST_INFO, 1, "Tring to recover.. ");
dprintk("%s: Tring to recover.. \n", __FUNCTION__);
if ((dst_error_recovery(state)) < 0) { if ((dst_error_recovery(state)) < 0) {
dprintk("%s: Recovery Failed.\n", __FUNCTION__); dprintk(verbose, DST_ERROR, 1, "Recovery Failed.");
return -1; return -1;
} }
return -1; return -1;
} }
if ((dst_pio_disable(state)) < 0) { if ((dst_pio_disable(state)) < 0) {
dprintk("%s: PIO Disable Failed.\n", __FUNCTION__); dprintk(verbose, DST_ERROR, 1, "PIO Disable Failed.");
return -1; return -1;
} }
if (state->type_flags & DST_TYPE_HAS_FW_1) if (state->type_flags & DST_TYPE_HAS_FW_1)
udelay(3000); udelay(3000);
if (read_dst(state, &reply, GET_ACK)) { if (read_dst(state, &reply, GET_ACK)) {
if (verbose > 1) dprintk(verbose, DST_DEBUG, 1, "Trying to recover.. ");
dprintk("%s: Trying to recover.. \n", __FUNCTION__);
if ((dst_error_recovery(state)) < 0) { if ((dst_error_recovery(state)) < 0) {
dprintk("%s: Recovery Failed.\n", __FUNCTION__); dprintk(verbose, DST_INFO, 1, "Recovery Failed.");
return -1; return -1;
} }
return -1; return -1;
} }
if (reply != ACK) { if (reply != ACK) {
dprintk("%s: write not acknowledged 0x%02x \n", __FUNCTION__, reply); dprintk(verbose, DST_INFO, 1, "write not acknowledged 0x%02x ", reply);
return -1; return -1;
} }
if (len >= 2 && data[0] == 0 && (data[1] == 1 || data[1] == 3)) if (len >= 2 && data[0] == 0 && (data[1] == 1 || data[1] == 3))
return 0; return 0;
// udelay(3000);
if (state->type_flags & DST_TYPE_HAS_FW_1) if (state->type_flags & DST_TYPE_HAS_FW_1)
udelay(3000); udelay(3000);
else else
udelay(2000); udelay(2000);
if (!dst_wait_dst_ready(state, NO_DELAY)) if (!dst_wait_dst_ready(state, NO_DELAY))
return -1; return -1;
if (read_dst(state, state->rxbuffer, FIXED_COMM)) { if (read_dst(state, state->rxbuffer, FIXED_COMM)) {
if (verbose > 1) dprintk(verbose, DST_DEBUG, 1, "Trying to recover.. ");
dprintk("%s: Trying to recover.. \n", __FUNCTION__);
if ((dst_error_recovery(state)) < 0) { if ((dst_error_recovery(state)) < 0) {
dprintk("%s: Recovery failed.\n", __FUNCTION__); dprintk(verbose, DST_INFO, 1, "Recovery failed.");
return -1; return -1;
} }
return -1; return -1;
} }
if (state->rxbuffer[7] != dst_check_sum(state->rxbuffer, 7)) { if (state->rxbuffer[7] != dst_check_sum(state->rxbuffer, 7)) {
dprintk("%s: checksum failure\n", __FUNCTION__); dprintk(verbose, DST_INFO, 1, "checksum failure");
return -1; return -1;
} }
...@@ -924,7 +878,7 @@ int dst_command(struct dst_state* state, u8 * data, u8 len) ...@@ -924,7 +878,7 @@ int dst_command(struct dst_state* state, u8 * data, u8 len)
} }
EXPORT_SYMBOL(dst_command); EXPORT_SYMBOL(dst_command);
static int dst_get_signal(struct dst_state* state) static int dst_get_signal(struct dst_state *state)
{ {
int retval; int retval;
u8 get_signal[] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb }; u8 get_signal[] = { 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb };
...@@ -955,13 +909,12 @@ static int dst_get_signal(struct dst_state* state) ...@@ -955,13 +909,12 @@ static int dst_get_signal(struct dst_state* state)
return 0; return 0;
} }
static int dst_tone_power_cmd(struct dst_state* state) static int dst_tone_power_cmd(struct dst_state *state)
{ {
u8 paket[8] = { 0x00, 0x09, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00 }; u8 paket[8] = { 0x00, 0x09, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00 };
if (state->dst_type == DST_TYPE_IS_TERR) if (state->dst_type == DST_TYPE_IS_TERR)
return 0; return 0;
paket[4] = state->tx_tuna[4]; paket[4] = state->tx_tuna[4];
paket[2] = state->tx_tuna[2]; paket[2] = state->tx_tuna[2];
paket[3] = state->tx_tuna[3]; paket[3] = state->tx_tuna[3];
...@@ -971,61 +924,53 @@ static int dst_tone_power_cmd(struct dst_state* state) ...@@ -971,61 +924,53 @@ static int dst_tone_power_cmd(struct dst_state* state)
return 0; return 0;
} }
static int dst_get_tuna(struct dst_state* state) static int dst_get_tuna(struct dst_state *state)
{ {
int retval; int retval;
if ((state->diseq_flags & ATTEMPT_TUNE) == 0) if ((state->diseq_flags & ATTEMPT_TUNE) == 0)
return 0; return 0;
state->diseq_flags &= ~(HAS_LOCK); state->diseq_flags &= ~(HAS_LOCK);
if (!dst_wait_dst_ready(state, NO_DELAY)) if (!dst_wait_dst_ready(state, NO_DELAY))
return 0; return 0;
if (state->type_flags & DST_TYPE_HAS_NEWTUNE)
if (state->type_flags & DST_TYPE_HAS_NEWTUNE) {
/* how to get variable length reply ???? */ /* how to get variable length reply ???? */
retval = read_dst(state, state->rx_tuna, 10); retval = read_dst(state, state->rx_tuna, 10);
} else { else
retval = read_dst(state, &state->rx_tuna[2], FIXED_COMM); retval = read_dst(state, &state->rx_tuna[2], FIXED_COMM);
}
if (retval < 0) { if (retval < 0) {
dprintk("%s: read not successful\n", __FUNCTION__); dprintk(verbose, DST_DEBUG, 1, "read not successful");
return 0; return 0;
} }
if (state->type_flags & DST_TYPE_HAS_NEWTUNE) { if (state->type_flags & DST_TYPE_HAS_NEWTUNE) {
if (state->rx_tuna[9] != dst_check_sum(&state->rx_tuna[0], 9)) { if (state->rx_tuna[9] != dst_check_sum(&state->rx_tuna[0], 9)) {
dprintk("%s: checksum failure?\n", __FUNCTION__); dprintk(verbose, DST_INFO, 1, "checksum failure ? ");
return 0; return 0;
} }
} else { } else {
if (state->rx_tuna[9] != dst_check_sum(&state->rx_tuna[2], 7)) { if (state->rx_tuna[9] != dst_check_sum(&state->rx_tuna[2], 7)) {
dprintk("%s: checksum failure?\n", __FUNCTION__); dprintk(verbose, DST_INFO, 1, "checksum failure? ");
return 0; return 0;
} }
} }
if (state->rx_tuna[2] == 0 && state->rx_tuna[3] == 0) if (state->rx_tuna[2] == 0 && state->rx_tuna[3] == 0)
return 0; return 0;
state->decode_freq = ((state->rx_tuna[2] & 0x7f) << 8) + state->rx_tuna[3]; state->decode_freq = ((state->rx_tuna[2] & 0x7f) << 8) + state->rx_tuna[3];
state->decode_lock = 1; state->decode_lock = 1;
state->diseq_flags |= HAS_LOCK; state->diseq_flags |= HAS_LOCK;
return 1; return 1;
} }
static int dst_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage); static int dst_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage);
static int dst_write_tuna(struct dvb_frontend* fe) static int dst_write_tuna(struct dvb_frontend *fe)
{ {
struct dst_state* state = fe->demodulator_priv; struct dst_state *state = fe->demodulator_priv;
int retval; int retval;
u8 reply; u8 reply;
if (debug > 4) dprintk(verbose, DST_INFO, 1, "type_flags 0x%x ", state->type_flags);
dprintk("%s: type_flags 0x%x \n", __FUNCTION__, state->type_flags);
state->decode_freq = 0; state->decode_freq = 0;
state->decode_lock = state->decode_strength = state->decode_snr = 0; state->decode_lock = state->decode_strength = state->decode_snr = 0;
if (state->dst_type == DST_TYPE_IS_SAT) { if (state->dst_type == DST_TYPE_IS_SAT) {
...@@ -1035,35 +980,31 @@ static int dst_write_tuna(struct dvb_frontend* fe) ...@@ -1035,35 +980,31 @@ static int dst_write_tuna(struct dvb_frontend* fe)
state->diseq_flags &= ~(HAS_LOCK | ATTEMPT_TUNE); state->diseq_flags &= ~(HAS_LOCK | ATTEMPT_TUNE);
if ((dst_comm_init(state)) < 0) { if ((dst_comm_init(state)) < 0) {
dprintk("%s: DST Communication initialization failed.\n", __FUNCTION__); dprintk(verbose, DST_DEBUG, 1, "DST Communication initialization failed.");
return -1; return -1;
} }
if (state->type_flags & DST_TYPE_HAS_NEWTUNE) { if (state->type_flags & DST_TYPE_HAS_NEWTUNE) {
state->tx_tuna[9] = dst_check_sum(&state->tx_tuna[0], 9); state->tx_tuna[9] = dst_check_sum(&state->tx_tuna[0], 9);
retval = write_dst(state, &state->tx_tuna[0], 10); retval = write_dst(state, &state->tx_tuna[0], 10);
} else { } else {
state->tx_tuna[9] = dst_check_sum(&state->tx_tuna[2], 7); state->tx_tuna[9] = dst_check_sum(&state->tx_tuna[2], 7);
retval = write_dst(state, &state->tx_tuna[2], FIXED_COMM); retval = write_dst(state, &state->tx_tuna[2], FIXED_COMM);
} }
if (retval < 0) { if (retval < 0) {
dst_pio_disable(state); dst_pio_disable(state);
dprintk("%s: write not successful\n", __FUNCTION__); dprintk(verbose, DST_DEBUG, 1, "write not successful");
return retval; return retval;
} }
if ((dst_pio_disable(state)) < 0) { if ((dst_pio_disable(state)) < 0) {
dprintk("%s: DST PIO disable failed !\n", __FUNCTION__); dprintk(verbose, DST_DEBUG, 1, "DST PIO disable failed !");
return -1; return -1;
} }
if ((read_dst(state, &reply, GET_ACK) < 0)) { if ((read_dst(state, &reply, GET_ACK) < 0)) {
dprintk("%s: read verify not successful.\n", __FUNCTION__); dprintk(verbose, DST_DEBUG, 1, "read verify not successful.");
return -1; return -1;
} }
if (reply != ACK) { if (reply != ACK) {
dprintk("%s: write not acknowledged 0x%02x \n", __FUNCTION__, reply); dprintk(verbose, DST_DEBUG, 1, "write not acknowledged 0x%02x ", reply);
return 0; return 0;
} }
state->diseq_flags |= ATTEMPT_TUNE; state->diseq_flags |= ATTEMPT_TUNE;
...@@ -1085,14 +1026,13 @@ static int dst_write_tuna(struct dvb_frontend* fe) ...@@ -1085,14 +1026,13 @@ static int dst_write_tuna(struct dvb_frontend* fe)
* Diseqc 4 0x00, 0x08, 0x04, 0xe0, 0x10, 0x38, 0xfc, 0xe0 * Diseqc 4 0x00, 0x08, 0x04, 0xe0, 0x10, 0x38, 0xfc, 0xe0
*/ */
static int dst_set_diseqc(struct dvb_frontend* fe, struct dvb_diseqc_master_cmd* cmd) static int dst_set_diseqc(struct dvb_frontend *fe, struct dvb_diseqc_master_cmd *cmd)
{ {
struct dst_state* state = fe->demodulator_priv; struct dst_state *state = fe->demodulator_priv;
u8 paket[8] = { 0x00, 0x08, 0x04, 0xe0, 0x10, 0x38, 0xf0, 0xec }; u8 paket[8] = { 0x00, 0x08, 0x04, 0xe0, 0x10, 0x38, 0xf0, 0xec };
if (state->dst_type != DST_TYPE_IS_SAT) if (state->dst_type != DST_TYPE_IS_SAT)
return 0; return 0;
if (cmd->msg_len == 0 || cmd->msg_len > 4) if (cmd->msg_len == 0 || cmd->msg_len > 4)
return -EINVAL; return -EINVAL;
memcpy(&paket[3], cmd->msg, cmd->msg_len); memcpy(&paket[3], cmd->msg, cmd->msg_len);
...@@ -1101,17 +1041,17 @@ static int dst_set_diseqc(struct dvb_frontend* fe, struct dvb_diseqc_master_cmd* ...@@ -1101,17 +1041,17 @@ static int dst_set_diseqc(struct dvb_frontend* fe, struct dvb_diseqc_master_cmd*
return 0; return 0;
} }
static int dst_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage) static int dst_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
{ {
int need_cmd; int need_cmd;
struct dst_state* state = fe->demodulator_priv; struct dst_state *state = fe->demodulator_priv;
state->voltage = voltage; state->voltage = voltage;
if (state->dst_type != DST_TYPE_IS_SAT) if (state->dst_type != DST_TYPE_IS_SAT)
return 0; return 0;
need_cmd = 0; need_cmd = 0;
switch (voltage) { switch (voltage) {
case SEC_VOLTAGE_13: case SEC_VOLTAGE_13:
case SEC_VOLTAGE_18: case SEC_VOLTAGE_18:
...@@ -1120,28 +1060,26 @@ static int dst_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage) ...@@ -1120,28 +1060,26 @@ static int dst_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)
state->diseq_flags |= HAS_POWER; state->diseq_flags |= HAS_POWER;
state->tx_tuna[4] = 0x01; state->tx_tuna[4] = 0x01;
break; break;
case SEC_VOLTAGE_OFF: case SEC_VOLTAGE_OFF:
need_cmd = 1; need_cmd = 1;
state->diseq_flags &= ~(HAS_POWER | HAS_LOCK | ATTEMPT_TUNE); state->diseq_flags &= ~(HAS_POWER | HAS_LOCK | ATTEMPT_TUNE);
state->tx_tuna[4] = 0x00; state->tx_tuna[4] = 0x00;
break; break;
default: default:
return -EINVAL; return -EINVAL;
} }
if (need_cmd) if (need_cmd)
dst_tone_power_cmd(state); dst_tone_power_cmd(state);
return 0; return 0;
} }
static int dst_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone) static int dst_set_tone(struct dvb_frontend *fe, fe_sec_tone_mode_t tone)
{ {
struct dst_state* state = fe->demodulator_priv; struct dst_state *state = fe->demodulator_priv;
state->tone = tone; state->tone = tone;
if (state->dst_type != DST_TYPE_IS_SAT) if (state->dst_type != DST_TYPE_IS_SAT)
return 0; return 0;
...@@ -1151,13 +1089,11 @@ static int dst_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone) ...@@ -1151,13 +1089,11 @@ static int dst_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
state->tx_tuna[2] = 0x00; state->tx_tuna[2] = 0x00;
else else
state->tx_tuna[2] = 0xff; state->tx_tuna[2] = 0xff;
break; break;
case SEC_TONE_ON: case SEC_TONE_ON:
state->tx_tuna[2] = 0x02; state->tx_tuna[2] = 0x02;
break; break;
default: default:
return -EINVAL; return -EINVAL;
} }
...@@ -1172,9 +1108,7 @@ static int dst_send_burst(struct dvb_frontend *fe, fe_sec_mini_cmd_t minicmd) ...@@ -1172,9 +1108,7 @@ static int dst_send_burst(struct dvb_frontend *fe, fe_sec_mini_cmd_t minicmd)
if (state->dst_type != DST_TYPE_IS_SAT) if (state->dst_type != DST_TYPE_IS_SAT)
return 0; return 0;
state->minicmd = minicmd; state->minicmd = minicmd;
switch (minicmd) { switch (minicmd) {
case SEC_MINI_A: case SEC_MINI_A:
state->tx_tuna[3] = 0x02; state->tx_tuna[3] = 0x02;
...@@ -1189,42 +1123,37 @@ static int dst_send_burst(struct dvb_frontend *fe, fe_sec_mini_cmd_t minicmd) ...@@ -1189,42 +1123,37 @@ static int dst_send_burst(struct dvb_frontend *fe, fe_sec_mini_cmd_t minicmd)
} }
static int dst_init(struct dvb_frontend* fe) static int dst_init(struct dvb_frontend *fe)
{ {
struct dst_state* state = fe->demodulator_priv; struct dst_state *state = fe->demodulator_priv;
static u8 ini_satci_tuna[] = { 9, 0, 3, 0xb6, 1, 0, 0x73, 0x21, 0, 0 };
static u8 ini_satfta_tuna[] = { 0, 0, 3, 0xb6, 1, 0x55, 0xbd, 0x50, 0, 0 }; static u8 sat_tuna_188[] = { 0x09, 0x00, 0x03, 0xb6, 0x01, 0x00, 0x73, 0x21, 0x00, 0x00 };
static u8 ini_tvfta_tuna[] = { 0, 0, 3, 0xb6, 1, 7, 0x0, 0x0, 0, 0 }; static u8 sat_tuna_204[] = { 0x00, 0x00, 0x03, 0xb6, 0x01, 0x55, 0xbd, 0x50, 0x00, 0x00 };
static u8 ini_tvci_tuna[] = { 9, 0, 3, 0xb6, 1, 7, 0x0, 0x0, 0, 0 }; static u8 ter_tuna_188[] = { 0x09, 0x00, 0x03, 0xb6, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00 };
static u8 ini_cabfta_tuna[] = { 0, 0, 3, 0xb6, 1, 7, 0x0, 0x0, 0, 0 }; static u8 ter_tuna_204[] = { 0x00, 0x00, 0x03, 0xb6, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00 };
static u8 ini_cabci_tuna[] = { 9, 0, 3, 0xb6, 1, 7, 0x0, 0x0, 0, 0 }; static u8 cab_tuna_204[] = { 0x00, 0x00, 0x03, 0xb6, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00 };
// state->inversion = INVERSION_ON; static u8 cab_tuna_188[] = { 0x09, 0x00, 0x03, 0xb6, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00 };
state->inversion = INVERSION_OFF; state->inversion = INVERSION_OFF;
state->voltage = SEC_VOLTAGE_13; state->voltage = SEC_VOLTAGE_13;
state->tone = SEC_TONE_OFF; state->tone = SEC_TONE_OFF;
state->symbol_rate = 29473000;
state->fec = FEC_AUTO;
state->diseq_flags = 0; state->diseq_flags = 0;
state->k22 = 0x02; state->k22 = 0x02;
state->bandwidth = BANDWIDTH_7_MHZ; state->bandwidth = BANDWIDTH_7_MHZ;
state->cur_jiff = jiffies; state->cur_jiff = jiffies;
if (state->dst_type == DST_TYPE_IS_SAT) { if (state->dst_type == DST_TYPE_IS_SAT)
state->frequency = 950000; memcpy(state->tx_tuna, ((state->type_flags & DST_TYPE_HAS_NEWTUNE) ? sat_tuna_188 : sat_tuna_204), sizeof (sat_tuna_204));
memcpy(state->tx_tuna, ((state->type_flags & DST_TYPE_HAS_NEWTUNE) ? ini_satci_tuna : ini_satfta_tuna), sizeof(ini_satfta_tuna)); else if (state->dst_type == DST_TYPE_IS_TERR)
} else if (state->dst_type == DST_TYPE_IS_TERR) { memcpy(state->tx_tuna, ((state->type_flags & DST_TYPE_HAS_NEWTUNE) ? ter_tuna_188 : ter_tuna_204), sizeof (ter_tuna_204));
state->frequency = 137000000; else if (state->dst_type == DST_TYPE_IS_CABLE)
memcpy(state->tx_tuna, ((state->type_flags & DST_TYPE_HAS_NEWTUNE) ? ini_tvci_tuna : ini_tvfta_tuna), sizeof(ini_tvfta_tuna)); memcpy(state->tx_tuna, ((state->type_flags & DST_TYPE_HAS_NEWTUNE) ? cab_tuna_188 : cab_tuna_204), sizeof (cab_tuna_204));
} else if (state->dst_type == DST_TYPE_IS_CABLE) {
state->frequency = 51000000;
memcpy(state->tx_tuna, ((state->type_flags & DST_TYPE_HAS_NEWTUNE) ? ini_cabci_tuna : ini_cabfta_tuna), sizeof(ini_cabfta_tuna));
}
return 0; return 0;
} }
static int dst_read_status(struct dvb_frontend* fe, fe_status_t* status) static int dst_read_status(struct dvb_frontend *fe, fe_status_t *status)
{ {
struct dst_state* state = fe->demodulator_priv; struct dst_state *state = fe->demodulator_priv;
*status = 0; *status = 0;
if (state->diseq_flags & HAS_LOCK) { if (state->diseq_flags & HAS_LOCK) {
...@@ -1236,9 +1165,9 @@ static int dst_read_status(struct dvb_frontend* fe, fe_status_t* status) ...@@ -1236,9 +1165,9 @@ static int dst_read_status(struct dvb_frontend* fe, fe_status_t* status)
return 0; return 0;
} }
static int dst_read_signal_strength(struct dvb_frontend* fe, u16* strength) static int dst_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
{ {
struct dst_state* state = fe->demodulator_priv; struct dst_state *state = fe->demodulator_priv;
dst_get_signal(state); dst_get_signal(state);
*strength = state->decode_strength; *strength = state->decode_strength;
...@@ -1246,9 +1175,9 @@ static int dst_read_signal_strength(struct dvb_frontend* fe, u16* strength) ...@@ -1246,9 +1175,9 @@ static int dst_read_signal_strength(struct dvb_frontend* fe, u16* strength)
return 0; return 0;
} }
static int dst_read_snr(struct dvb_frontend* fe, u16* snr) static int dst_read_snr(struct dvb_frontend *fe, u16 *snr)
{ {
struct dst_state* state = fe->demodulator_priv; struct dst_state *state = fe->demodulator_priv;
dst_get_signal(state); dst_get_signal(state);
*snr = state->decode_snr; *snr = state->decode_snr;
...@@ -1256,28 +1185,24 @@ static int dst_read_snr(struct dvb_frontend* fe, u16* snr) ...@@ -1256,28 +1185,24 @@ static int dst_read_snr(struct dvb_frontend* fe, u16* snr)
return 0; return 0;
} }
static int dst_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p) static int dst_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)
{ {
struct dst_state* state = fe->demodulator_priv; struct dst_state *state = fe->demodulator_priv;
dst_set_freq(state, p->frequency); dst_set_freq(state, p->frequency);
if (verbose > 4) dprintk(verbose, DST_DEBUG, 1, "Set Frequency=[%d]", p->frequency);
dprintk("Set Frequency=[%d]\n", p->frequency);
// dst_set_inversion(state, p->inversion);
if (state->dst_type == DST_TYPE_IS_SAT) { if (state->dst_type == DST_TYPE_IS_SAT) {
if (state->type_flags & DST_TYPE_HAS_OBS_REGS) if (state->type_flags & DST_TYPE_HAS_OBS_REGS)
dst_set_inversion(state, p->inversion); dst_set_inversion(state, p->inversion);
dst_set_fec(state, p->u.qpsk.fec_inner); dst_set_fec(state, p->u.qpsk.fec_inner);
dst_set_symbolrate(state, p->u.qpsk.symbol_rate); dst_set_symbolrate(state, p->u.qpsk.symbol_rate);
dst_set_polarization(state); dst_set_polarization(state);
if (verbose > 4) dprintk(verbose, DST_DEBUG, 1, "Set Symbolrate=[%d]", p->u.qpsk.symbol_rate);
dprintk("Set Symbolrate=[%d]\n", p->u.qpsk.symbol_rate);
} else if (state->dst_type == DST_TYPE_IS_TERR) { } else if (state->dst_type == DST_TYPE_IS_TERR)
dst_set_bandwidth(state, p->u.ofdm.bandwidth); dst_set_bandwidth(state, p->u.ofdm.bandwidth);
} else if (state->dst_type == DST_TYPE_IS_CABLE) { else if (state->dst_type == DST_TYPE_IS_CABLE) {
dst_set_fec(state, p->u.qam.fec_inner); dst_set_fec(state, p->u.qam.fec_inner);
dst_set_symbolrate(state, p->u.qam.symbol_rate); dst_set_symbolrate(state, p->u.qam.symbol_rate);
dst_set_modulation(state, p->u.qam.modulation); dst_set_modulation(state, p->u.qam.modulation);
...@@ -1287,16 +1212,14 @@ static int dst_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_paramet ...@@ -1287,16 +1212,14 @@ static int dst_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_paramet
return 0; return 0;
} }
static int dst_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p) static int dst_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_parameters *p)
{ {
struct dst_state* state = fe->demodulator_priv; struct dst_state *state = fe->demodulator_priv;
p->frequency = state->decode_freq; p->frequency = state->decode_freq;
// p->inversion = state->inversion;
if (state->dst_type == DST_TYPE_IS_SAT) { if (state->dst_type == DST_TYPE_IS_SAT) {
if (state->type_flags & DST_TYPE_HAS_OBS_REGS) if (state->type_flags & DST_TYPE_HAS_OBS_REGS)
p->inversion = state->inversion; p->inversion = state->inversion;
p->u.qpsk.symbol_rate = state->symbol_rate; p->u.qpsk.symbol_rate = state->symbol_rate;
p->u.qpsk.fec_inner = dst_get_fec(state); p->u.qpsk.fec_inner = dst_get_fec(state);
} else if (state->dst_type == DST_TYPE_IS_TERR) { } else if (state->dst_type == DST_TYPE_IS_TERR) {
...@@ -1304,16 +1227,15 @@ static int dst_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_paramet ...@@ -1304,16 +1227,15 @@ static int dst_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_paramet
} else if (state->dst_type == DST_TYPE_IS_CABLE) { } else if (state->dst_type == DST_TYPE_IS_CABLE) {
p->u.qam.symbol_rate = state->symbol_rate; p->u.qam.symbol_rate = state->symbol_rate;
p->u.qam.fec_inner = dst_get_fec(state); p->u.qam.fec_inner = dst_get_fec(state);
// p->u.qam.modulation = QAM_AUTO;
p->u.qam.modulation = dst_get_modulation(state); p->u.qam.modulation = dst_get_modulation(state);
} }
return 0; return 0;
} }
static void dst_release(struct dvb_frontend* fe) static void dst_release(struct dvb_frontend *fe)
{ {
struct dst_state* state = fe->demodulator_priv; struct dst_state *state = fe->demodulator_priv;
kfree(state); kfree(state);
} }
...@@ -1321,9 +1243,8 @@ static struct dvb_frontend_ops dst_dvbt_ops; ...@@ -1321,9 +1243,8 @@ static struct dvb_frontend_ops dst_dvbt_ops;
static struct dvb_frontend_ops dst_dvbs_ops; static struct dvb_frontend_ops dst_dvbs_ops;
static struct dvb_frontend_ops dst_dvbc_ops; static struct dvb_frontend_ops dst_dvbc_ops;
struct dst_state* dst_attach(struct dst_state *state, struct dvb_adapter *dvb_adapter) struct dst_state *dst_attach(struct dst_state *state, struct dvb_adapter *dvb_adapter)
{ {
/* check if the ASIC is there */ /* check if the ASIC is there */
if (dst_probe(state) < 0) { if (dst_probe(state) < 0) {
if (state) if (state)
...@@ -1336,17 +1257,14 @@ struct dst_state* dst_attach(struct dst_state *state, struct dvb_adapter *dvb_ad ...@@ -1336,17 +1257,14 @@ struct dst_state* dst_attach(struct dst_state *state, struct dvb_adapter *dvb_ad
case DST_TYPE_IS_TERR: case DST_TYPE_IS_TERR:
memcpy(&state->ops, &dst_dvbt_ops, sizeof(struct dvb_frontend_ops)); memcpy(&state->ops, &dst_dvbt_ops, sizeof(struct dvb_frontend_ops));
break; break;
case DST_TYPE_IS_CABLE: case DST_TYPE_IS_CABLE:
memcpy(&state->ops, &dst_dvbc_ops, sizeof(struct dvb_frontend_ops)); memcpy(&state->ops, &dst_dvbc_ops, sizeof(struct dvb_frontend_ops));
break; break;
case DST_TYPE_IS_SAT: case DST_TYPE_IS_SAT:
memcpy(&state->ops, &dst_dvbs_ops, sizeof(struct dvb_frontend_ops)); memcpy(&state->ops, &dst_dvbs_ops, sizeof(struct dvb_frontend_ops));
break; break;
default: default:
printk("%s: unknown DST type. please report to the LinuxTV.org DVB mailinglist.\n", __FUNCTION__); dprintk(verbose, DST_ERROR, 1, "unknown DST type. please report to the LinuxTV.org DVB mailinglist.");
if (state) if (state)
kfree(state); kfree(state);
...@@ -1374,12 +1292,9 @@ static struct dvb_frontend_ops dst_dvbt_ops = { ...@@ -1374,12 +1292,9 @@ static struct dvb_frontend_ops dst_dvbt_ops = {
}, },
.release = dst_release, .release = dst_release,
.init = dst_init, .init = dst_init,
.set_frontend = dst_set_frontend, .set_frontend = dst_set_frontend,
.get_frontend = dst_get_frontend, .get_frontend = dst_get_frontend,
.read_status = dst_read_status, .read_status = dst_read_status,
.read_signal_strength = dst_read_signal_strength, .read_signal_strength = dst_read_signal_strength,
.read_snr = dst_read_snr, .read_snr = dst_read_snr,
...@@ -1401,16 +1316,12 @@ static struct dvb_frontend_ops dst_dvbs_ops = { ...@@ -1401,16 +1316,12 @@ static struct dvb_frontend_ops dst_dvbs_ops = {
}, },
.release = dst_release, .release = dst_release,
.init = dst_init, .init = dst_init,
.set_frontend = dst_set_frontend, .set_frontend = dst_set_frontend,
.get_frontend = dst_get_frontend, .get_frontend = dst_get_frontend,
.read_status = dst_read_status, .read_status = dst_read_status,
.read_signal_strength = dst_read_signal_strength, .read_signal_strength = dst_read_signal_strength,
.read_snr = dst_read_snr, .read_snr = dst_read_snr,
.diseqc_send_burst = dst_send_burst, .diseqc_send_burst = dst_send_burst,
.diseqc_send_master_cmd = dst_set_diseqc, .diseqc_send_master_cmd = dst_set_diseqc,
.set_voltage = dst_set_voltage, .set_voltage = dst_set_voltage,
...@@ -1432,18 +1343,14 @@ static struct dvb_frontend_ops dst_dvbc_ops = { ...@@ -1432,18 +1343,14 @@ static struct dvb_frontend_ops dst_dvbc_ops = {
}, },
.release = dst_release, .release = dst_release,
.init = dst_init, .init = dst_init,
.set_frontend = dst_set_frontend, .set_frontend = dst_set_frontend,
.get_frontend = dst_get_frontend, .get_frontend = dst_get_frontend,
.read_status = dst_read_status, .read_status = dst_read_status,
.read_signal_strength = dst_read_signal_strength, .read_signal_strength = dst_read_signal_strength,
.read_snr = dst_read_snr, .read_snr = dst_read_snr,
}; };
MODULE_DESCRIPTION("DST DVB-S/T/C Combo Frontend driver"); MODULE_DESCRIPTION("DST DVB-S/T/C Combo Frontend driver");
MODULE_AUTHOR("Jamie Honan, Manu Abraham"); MODULE_AUTHOR("Jamie Honan, Manu Abraham");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
drivers/media/dvb/bt8xx/dst_ca.c
View file @ a427de6f
...@@ -18,30 +18,42 @@ ...@@ -18,30 +18,42 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/dvb/ca.h> #include <linux/dvb/ca.h>
#include "dvbdev.h" #include "dvbdev.h"
#include "dvb_frontend.h" #include "dvb_frontend.h"
#include "dst_ca.h" #include "dst_ca.h"
#include "dst_common.h" #include "dst_common.h"
#define DST_CA_ERROR 0
#define DST_CA_NOTICE 1
#define DST_CA_INFO 2
#define DST_CA_DEBUG 3
#define dprintk(x, y, z, format, arg...) do { \
if (z) { \
if ((x > DST_CA_ERROR) && (x > y)) \
printk(KERN_ERR "%s: " format "\n", __FUNCTION__ , ##arg); \
else if ((x > DST_CA_NOTICE) && (x > y)) \
printk(KERN_NOTICE "%s: " format "\n", __FUNCTION__ , ##arg); \
else if ((x > DST_CA_INFO) && (x > y)) \
printk(KERN_INFO "%s: " format "\n", __FUNCTION__ , ##arg); \
else if ((x > DST_CA_DEBUG) && (x > y)) \
printk(KERN_DEBUG "%s: " format "\n", __FUNCTION__ , ##arg); \
} else { \
if (x > y) \
printk(format, ## arg); \
} \
} while(0)
static unsigned int verbose = 5; static unsigned int verbose = 5;
module_param(verbose, int, 0644); module_param(verbose, int, 0644);
MODULE_PARM_DESC(verbose, "verbose startup messages, default is 1 (yes)"); MODULE_PARM_DESC(verbose, "verbose startup messages, default is 1 (yes)");
static unsigned int debug = 1;
module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "debug messages, default is 1 (yes)");
#define dprintk if (debug) printk
/* Need some more work */ /* Need some more work */
static int ca_set_slot_descr(void) static int ca_set_slot_descr(void)
{ {
...@@ -61,27 +73,20 @@ static int put_checksum(u8 *check_string, int length) ...@@ -61,27 +73,20 @@ static int put_checksum(u8 *check_string, int length)
{ {
u8 i = 0, checksum = 0; u8 i = 0, checksum = 0;
if (verbose > 3) { dprintk(verbose, DST_CA_DEBUG, 1, " ========================= Checksum calculation ===========================");
dprintk("%s: ========================= Checksum calculation ===========================\n", __FUNCTION__); dprintk(verbose, DST_CA_DEBUG, 1, " String Length=[0x%02x]", length);
dprintk("%s: String Length=[0x%02x]\n", __FUNCTION__, length); dprintk(verbose, DST_CA_DEBUG, 1, " String=[");
dprintk("%s: String=[", __FUNCTION__);
}
while (i < length) { while (i < length) {
if (verbose > 3) dprintk(verbose, DST_CA_DEBUG, 0, " %02x", check_string[i]);
dprintk(" %02x", check_string[i]);
checksum += check_string[i]; checksum += check_string[i];
i++; i++;
} }
if (verbose > 3) { dprintk(verbose, DST_CA_DEBUG, 0, " ]\n");
dprintk(" ]\n"); dprintk(verbose, DST_CA_DEBUG, 1, "Sum=[%02x]\n", checksum);
dprintk("%s: Sum=[%02x]\n", __FUNCTION__, checksum);
}
check_string[length] = ~checksum + 1; check_string[length] = ~checksum + 1;
if (verbose > 3) { dprintk(verbose, DST_CA_DEBUG, 1, " Checksum=[%02x]", check_string[length]);
dprintk("%s: Checksum=[%02x]\n", __FUNCTION__, check_string[length]); dprintk(verbose, DST_CA_DEBUG, 1, " ==========================================================================");
dprintk("%s: ==========================================================================\n", __FUNCTION__);
}
return 0; return 0;
} }
...@@ -94,30 +99,26 @@ static int dst_ci_command(struct dst_state* state, u8 * data, u8 *ca_string, u8 ...@@ -94,30 +99,26 @@ static int dst_ci_command(struct dst_state* state, u8 * data, u8 *ca_string, u8
msleep(65); msleep(65);
if (write_dst(state, data, len)) { if (write_dst(state, data, len)) {
dprintk("%s: Write not successful, trying to recover\n", __FUNCTION__); dprintk(verbose, DST_CA_INFO, 1, " Write not successful, trying to recover");
dst_error_recovery(state); dst_error_recovery(state);
return -1; return -1;
} }
if ((dst_pio_disable(state)) < 0) { if ((dst_pio_disable(state)) < 0) {
dprintk("%s: DST PIO disable failed.\n", __FUNCTION__); dprintk(verbose, DST_CA_ERROR, 1, " DST PIO disable failed.");
return -1; return -1;
} }
if (read_dst(state, &reply, GET_ACK) < 0) { if (read_dst(state, &reply, GET_ACK) < 0) {
dprintk("%s: Read not successful, trying to recover\n", __FUNCTION__); dprintk(verbose, DST_CA_INFO, 1, " Read not successful, trying to recover");
dst_error_recovery(state); dst_error_recovery(state);
return -1; return -1;
} }
if (read) { if (read) {
if (! dst_wait_dst_ready(state, LONG_DELAY)) { if (! dst_wait_dst_ready(state, LONG_DELAY)) {
dprintk("%s: 8820 not ready\n", __FUNCTION__); dprintk(verbose, DST_CA_NOTICE, 1, " 8820 not ready");
return -1; return -1;
} }
if (read_dst(state, ca_string, 128) < 0) { /* Try to make this dynamic */ if (read_dst(state, ca_string, 128) < 0) { /* Try to make this dynamic */
dprintk("%s: Read not successful, trying to recover\n", __FUNCTION__); dprintk(verbose, DST_CA_INFO, 1, " Read not successful, trying to recover");
dst_error_recovery(state); dst_error_recovery(state);
return -1; return -1;
} }
...@@ -133,8 +134,7 @@ static int dst_put_ci(struct dst_state *state, u8 *data, int len, u8 *ca_string, ...@@ -133,8 +134,7 @@ static int dst_put_ci(struct dst_state *state, u8 *data, int len, u8 *ca_string,
while (dst_ca_comm_err < RETRIES) { while (dst_ca_comm_err < RETRIES) {
dst_comm_init(state); dst_comm_init(state);
if (verbose > 2) dprintk(verbose, DST_CA_NOTICE, 1, " Put Command");
dprintk("%s: Put Command\n", __FUNCTION__);
if (dst_ci_command(state, data, ca_string, len, read)) { // If error if (dst_ci_command(state, data, ca_string, len, read)) { // If error
dst_error_recovery(state); dst_error_recovery(state);
dst_ca_comm_err++; // work required here. dst_ca_comm_err++; // work required here.
...@@ -153,18 +153,15 @@ static int ca_get_app_info(struct dst_state *state) ...@@ -153,18 +153,15 @@ static int ca_get_app_info(struct dst_state *state)
put_checksum(&command[0], command[0]); put_checksum(&command[0], command[0]);
if ((dst_put_ci(state, command, sizeof(command), state->messages, GET_REPLY)) < 0) { if ((dst_put_ci(state, command, sizeof(command), state->messages, GET_REPLY)) < 0) {
dprintk("%s: -->dst_put_ci FAILED !\n", __FUNCTION__); dprintk(verbose, DST_CA_ERROR, 1, " -->dst_put_ci FAILED !");
return -1; return -1;
} }
if (verbose > 1) { dprintk(verbose, DST_CA_INFO, 1, " -->dst_put_ci SUCCESS !");
dprintk("%s: -->dst_put_ci SUCCESS !\n", __FUNCTION__); dprintk(verbose, DST_CA_INFO, 1, " ================================ CI Module Application Info ======================================");
dprintk(verbose, DST_CA_INFO, 1, " Application Type=[%d], Application Vendor=[%d], Vendor Code=[%d]\n%s: Application info=[%s]",
dprintk("%s: ================================ CI Module Application Info ======================================\n", __FUNCTION__); state->messages[7], (state->messages[8] << 8) | state->messages[9],
dprintk("%s: Application Type=[%d], Application Vendor=[%d], Vendor Code=[%d]\n%s: Application info=[%s]\n",
__FUNCTION__, state->messages[7], (state->messages[8] << 8) | state->messages[9],
(state->messages[10] << 8) | state->messages[11], __FUNCTION__, (char *)(&state->messages[12])); (state->messages[10] << 8) | state->messages[11], __FUNCTION__, (char *)(&state->messages[12]));
dprintk("%s: ==================================================================================================\n", __FUNCTION__); dprintk(verbose, DST_CA_INFO, 1, " ==================================================================================================");
}
return 0; return 0;
} }
...@@ -177,31 +174,26 @@ static int ca_get_slot_caps(struct dst_state *state, struct ca_caps *p_ca_caps, ...@@ -177,31 +174,26 @@ static int ca_get_slot_caps(struct dst_state *state, struct ca_caps *p_ca_caps,
put_checksum(&slot_command[0], slot_command[0]); put_checksum(&slot_command[0], slot_command[0]);
if ((dst_put_ci(state, slot_command, sizeof (slot_command), slot_cap, GET_REPLY)) < 0) { if ((dst_put_ci(state, slot_command, sizeof (slot_command), slot_cap, GET_REPLY)) < 0) {
dprintk("%s: -->dst_put_ci FAILED !\n", __FUNCTION__); dprintk(verbose, DST_CA_ERROR, 1, " -->dst_put_ci FAILED !");
return -1; return -1;
} }
if (verbose > 1) dprintk(verbose, DST_CA_NOTICE, 1, " -->dst_put_ci SUCCESS !");
dprintk("%s: -->dst_put_ci SUCCESS !\n", __FUNCTION__);
/* Will implement the rest soon */ /* Will implement the rest soon */
if (verbose > 1) { dprintk(verbose, DST_CA_INFO, 1, " Slot cap = [%d]", slot_cap[7]);
dprintk("%s: Slot cap = [%d]\n", __FUNCTION__, slot_cap[7]); dprintk(verbose, DST_CA_INFO, 0, "===================================\n");
dprintk("===================================\n");
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
dprintk(" %d", slot_cap[i]); dprintk(verbose, DST_CA_INFO, 0, " %d", slot_cap[i]);
dprintk("\n"); dprintk(verbose, DST_CA_INFO, 0, "\n");
}
p_ca_caps->slot_num = 1; p_ca_caps->slot_num = 1;
p_ca_caps->slot_type = 1; p_ca_caps->slot_type = 1;
p_ca_caps->descr_num = slot_cap[7]; p_ca_caps->descr_num = slot_cap[7];
p_ca_caps->descr_type = 1; p_ca_caps->descr_type = 1;
if (copy_to_user((struct ca_caps *)arg, p_ca_caps, sizeof (struct ca_caps)))
if (copy_to_user((struct ca_caps *)arg, p_ca_caps, sizeof (struct ca_caps))) {
return -EFAULT; return -EFAULT;
}
return 0; return 0;
} }
...@@ -222,39 +214,32 @@ static int ca_get_slot_info(struct dst_state *state, struct ca_slot_info *p_ca_s ...@@ -222,39 +214,32 @@ static int ca_get_slot_info(struct dst_state *state, struct ca_slot_info *p_ca_s
put_checksum(&slot_command[0], 7); put_checksum(&slot_command[0], 7);
if ((dst_put_ci(state, slot_command, sizeof (slot_command), slot_info, GET_REPLY)) < 0) { if ((dst_put_ci(state, slot_command, sizeof (slot_command), slot_info, GET_REPLY)) < 0) {
dprintk("%s: -->dst_put_ci FAILED !\n", __FUNCTION__); dprintk(verbose, DST_CA_ERROR, 1, " -->dst_put_ci FAILED !");
return -1; return -1;
} }
if (verbose > 1) dprintk(verbose, DST_CA_INFO, 1, " -->dst_put_ci SUCCESS !");
dprintk("%s: -->dst_put_ci SUCCESS !\n", __FUNCTION__);
/* Will implement the rest soon */ /* Will implement the rest soon */
if (verbose > 1) { dprintk(verbose, DST_CA_INFO, 1, " Slot info = [%d]", slot_info[3]);
dprintk("%s: Slot info = [%d]\n", __FUNCTION__, slot_info[3]); dprintk(verbose, DST_CA_INFO, 0, "===================================\n");
dprintk("===================================\n");
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
dprintk(" %d", slot_info[i]); dprintk(verbose, DST_CA_INFO, 0, " %d", slot_info[i]);
dprintk("\n"); dprintk(verbose, DST_CA_INFO, 0, "\n");
}
if (slot_info[4] & 0x80) { if (slot_info[4] & 0x80) {
p_ca_slot_info->flags = CA_CI_MODULE_PRESENT; p_ca_slot_info->flags = CA_CI_MODULE_PRESENT;
p_ca_slot_info->num = 1; p_ca_slot_info->num = 1;
p_ca_slot_info->type = CA_CI; p_ca_slot_info->type = CA_CI;
} } else if (slot_info[4] & 0x40) {
else if (slot_info[4] & 0x40) {
p_ca_slot_info->flags = CA_CI_MODULE_READY; p_ca_slot_info->flags = CA_CI_MODULE_READY;
p_ca_slot_info->num = 1; p_ca_slot_info->num = 1;
p_ca_slot_info->type = CA_CI; p_ca_slot_info->type = CA_CI;
} } else
else {
p_ca_slot_info->flags = 0; p_ca_slot_info->flags = 0;
}
if (copy_to_user((struct ca_slot_info *)arg, p_ca_slot_info, sizeof (struct ca_slot_info))) { if (copy_to_user((struct ca_slot_info *)arg, p_ca_slot_info, sizeof (struct ca_slot_info)))
return -EFAULT; return -EFAULT;
}
return 0; return 0;
} }
...@@ -268,18 +253,15 @@ static int ca_get_message(struct dst_state *state, struct ca_msg *p_ca_message, ...@@ -268,18 +253,15 @@ static int ca_get_message(struct dst_state *state, struct ca_msg *p_ca_message,
if (copy_from_user(p_ca_message, (void *)arg, sizeof (struct ca_msg))) if (copy_from_user(p_ca_message, (void *)arg, sizeof (struct ca_msg)))
return -EFAULT; return -EFAULT;
if (p_ca_message->msg) { if (p_ca_message->msg) {
if (verbose > 3) dprintk(verbose, DST_CA_NOTICE, 1, " Message = [%02x %02x %02x]", p_ca_message->msg[0], p_ca_message->msg[1], p_ca_message->msg[2]);
dprintk("Message = [%02x %02x %02x]\n", p_ca_message->msg[0], p_ca_message->msg[1], p_ca_message->msg[2]);
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
command = command | p_ca_message->msg[i]; command = command | p_ca_message->msg[i];
if (i < 2) if (i < 2)
command = command << 8; command = command << 8;
} }
if (verbose > 3) dprintk(verbose, DST_CA_NOTICE, 1, " Command=[0x%x]", command);
dprintk("%s:Command=[0x%x]\n", __FUNCTION__, command);
switch (command) { switch (command) {
case CA_APP_INFO: case CA_APP_INFO:
...@@ -300,10 +282,9 @@ static int handle_dst_tag(struct dst_state *state, struct ca_msg *p_ca_message, ...@@ -300,10 +282,9 @@ static int handle_dst_tag(struct dst_state *state, struct ca_msg *p_ca_message,
hw_buffer->msg[3] = p_ca_message->msg[2]; /* LSB */ hw_buffer->msg[3] = p_ca_message->msg[2]; /* LSB */
} else { } else {
if (length > 247) { if (length > 247) {
dprintk("%s: Message too long ! *** Bailing Out *** !\n", __FUNCTION__); dprintk(verbose, DST_CA_ERROR, 1, " Message too long ! *** Bailing Out *** !");
return -1; return -1;
} }
hw_buffer->msg[0] = (length & 0xff) + 7; hw_buffer->msg[0] = (length & 0xff) + 7;
hw_buffer->msg[1] = 0x40; hw_buffer->msg[1] = 0x40;
hw_buffer->msg[2] = 0x03; hw_buffer->msg[2] = 0x03;
...@@ -324,13 +305,12 @@ static int handle_dst_tag(struct dst_state *state, struct ca_msg *p_ca_message, ...@@ -324,13 +305,12 @@ static int handle_dst_tag(struct dst_state *state, struct ca_msg *p_ca_message,
static int write_to_8820(struct dst_state *state, struct ca_msg *hw_buffer, u8 length, u8 reply) static int write_to_8820(struct dst_state *state, struct ca_msg *hw_buffer, u8 length, u8 reply)
{ {
if ((dst_put_ci(state, hw_buffer->msg, length, hw_buffer->msg, reply)) < 0) { if ((dst_put_ci(state, hw_buffer->msg, length, hw_buffer->msg, reply)) < 0) {
dprintk("%s: DST-CI Command failed.\n", __FUNCTION__); dprintk(verbose, DST_CA_ERROR, 1, " DST-CI Command failed.");
dprintk("%s: Resetting DST.\n", __FUNCTION__); dprintk(verbose, DST_CA_NOTICE, 1, " Resetting DST.");
rdc_reset_state(state); rdc_reset_state(state);
return -1; return -1;
} }
if (verbose > 2) dprintk(verbose, DST_CA_NOTICE, 1, " DST-CI Command succes.");
dprintk("%s: DST-CI Command succes.\n", __FUNCTION__);
return 0; return 0;
} }
...@@ -341,15 +321,15 @@ u32 asn_1_decode(u8 *asn_1_array) ...@@ -341,15 +321,15 @@ u32 asn_1_decode(u8 *asn_1_array)
u32 length = 0; u32 length = 0;
length_field = asn_1_array[0]; length_field = asn_1_array[0];
dprintk("%s: Length field=[%02x]\n", __FUNCTION__, length_field); dprintk(verbose, DST_CA_DEBUG, 1, " Length field=[%02x]", length_field);
if (length_field < 0x80) { if (length_field < 0x80) {
length = length_field & 0x7f; length = length_field & 0x7f;
dprintk("%s: Length=[%02x]\n", __FUNCTION__, length); dprintk(verbose, DST_CA_DEBUG, 1, " Length=[%02x]\n", length);
} else { } else {
word_count = length_field & 0x7f; word_count = length_field & 0x7f;
for (count = 0; count < word_count; count++) { for (count = 0; count < word_count; count++) {
length = (length | asn_1_array[count + 1]) << 8; length = (length | asn_1_array[count + 1]) << 8;
dprintk("%s: Length=[%04x]\n", __FUNCTION__, length); dprintk(verbose, DST_CA_DEBUG, 1, " Length=[%04x]", length);
} }
} }
return length; return length;
...@@ -359,10 +339,10 @@ static int debug_string(u8 *msg, u32 length, u32 offset) ...@@ -359,10 +339,10 @@ static int debug_string(u8 *msg, u32 length, u32 offset)
{ {
u32 i; u32 i;
dprintk(" String=[ "); dprintk(verbose, DST_CA_DEBUG, 0, " String=[ ");
for (i = offset; i < length; i++) for (i = offset; i < length; i++)
dprintk("%02x ", msg[i]); dprintk(verbose, DST_CA_DEBUG, 0, "%02x ", msg[i]);
dprintk("]\n"); dprintk(verbose, DST_CA_DEBUG, 0, "]\n");
return 0; return 0;
} }
...@@ -373,8 +353,7 @@ static int ca_set_pmt(struct dst_state *state, struct ca_msg *p_ca_message, stru ...@@ -373,8 +353,7 @@ static int ca_set_pmt(struct dst_state *state, struct ca_msg *p_ca_message, stru
u8 tag_length = 8; u8 tag_length = 8;
length = asn_1_decode(&p_ca_message->msg[3]); length = asn_1_decode(&p_ca_message->msg[3]);
dprintk("%s: CA Message length=[%d]\n", __FUNCTION__, length); dprintk(verbose, DST_CA_DEBUG, 1, " CA Message length=[%d]", length);
dprintk("%s: ASN.1 ", __FUNCTION__);
debug_string(&p_ca_message->msg[4], length, 0); /* length is excluding tag & length */ debug_string(&p_ca_message->msg[4], length, 0); /* length is excluding tag & length */
memset(hw_buffer->msg, '\0', length); memset(hw_buffer->msg, '\0', length);
...@@ -396,26 +375,24 @@ static int dst_check_ca_pmt(struct dst_state *state, struct ca_msg *p_ca_message ...@@ -396,26 +375,24 @@ static int dst_check_ca_pmt(struct dst_state *state, struct ca_msg *p_ca_message
/* Do test board */ /* Do test board */
/* Not there yet but soon */ /* Not there yet but soon */
/* CA PMT Reply capable */ /* CA PMT Reply capable */
if (ca_pmt_reply_test) { if (ca_pmt_reply_test) {
if ((ca_set_pmt(state, p_ca_message, hw_buffer, 1, GET_REPLY)) < 0) { if ((ca_set_pmt(state, p_ca_message, hw_buffer, 1, GET_REPLY)) < 0) {
dprintk("%s: ca_set_pmt.. failed !\n", __FUNCTION__); dprintk(verbose, DST_CA_ERROR, 1, " ca_set_pmt.. failed !");
return -1; return -1;
} }
/* Process CA PMT Reply */ /* Process CA PMT Reply */
/* will implement soon */ /* will implement soon */
dprintk("%s: Not there yet\n", __FUNCTION__); dprintk(verbose, DST_CA_ERROR, 1, " Not there yet");
} }
/* CA PMT Reply not capable */ /* CA PMT Reply not capable */
if (!ca_pmt_reply_test) { if (!ca_pmt_reply_test) {
if ((ca_set_pmt(state, p_ca_message, hw_buffer, 0, NO_REPLY)) < 0) { if ((ca_set_pmt(state, p_ca_message, hw_buffer, 0, NO_REPLY)) < 0) {
dprintk("%s: ca_set_pmt.. failed !\n", __FUNCTION__); dprintk(verbose, DST_CA_ERROR, 1, " ca_set_pmt.. failed !");
return -1; return -1;
} }
if (verbose > 3) dprintk(verbose, DST_CA_NOTICE, 1, " ca_set_pmt.. success !");
dprintk("%s: ca_set_pmt.. success !\n", __FUNCTION__);
/* put a dummy message */ /* put a dummy message */
} }
...@@ -431,11 +408,10 @@ static int ca_send_message(struct dst_state *state, struct ca_msg *p_ca_message, ...@@ -431,11 +408,10 @@ static int ca_send_message(struct dst_state *state, struct ca_msg *p_ca_message,
struct ca_msg *hw_buffer; struct ca_msg *hw_buffer;
if ((hw_buffer = (struct ca_msg *) kmalloc(sizeof (struct ca_msg), GFP_KERNEL)) == NULL) { if ((hw_buffer = (struct ca_msg *) kmalloc(sizeof (struct ca_msg), GFP_KERNEL)) == NULL) {
dprintk("%s: Memory allocation failure\n", __FUNCTION__); dprintk(verbose, DST_CA_ERROR, 1, " Memory allocation failure");
return -ENOMEM; return -ENOMEM;
} }
if (verbose > 3) dprintk(verbose, DST_CA_DEBUG, 1, " ");
dprintk("%s\n", __FUNCTION__);
if (copy_from_user(p_ca_message, (void *)arg, sizeof (struct ca_msg))) if (copy_from_user(p_ca_message, (void *)arg, sizeof (struct ca_msg)))
return -EFAULT; return -EFAULT;
...@@ -450,50 +426,34 @@ static int ca_send_message(struct dst_state *state, struct ca_msg *p_ca_message, ...@@ -450,50 +426,34 @@ static int ca_send_message(struct dst_state *state, struct ca_msg *p_ca_message,
if (i < 2) if (i < 2)
command = command << 8; command = command << 8;
} }
if (verbose > 3) dprintk(verbose, DST_CA_DEBUG, 1, " Command=[0x%x]\n", command);
dprintk("%s:Command=[0x%x]\n", __FUNCTION__, command);
switch (command) { switch (command) {
case CA_PMT: case CA_PMT:
if (verbose > 3) dprintk(verbose, DST_CA_DEBUG, 1, "Command = SEND_CA_PMT");
// dprintk("Command = SEND_CA_PMT\n");
dprintk("Command = SEND_CA_PMT\n");
// if ((ca_set_pmt(state, p_ca_message, hw_buffer, 0, 0)) < 0) {
if ((ca_set_pmt(state, p_ca_message, hw_buffer, 0, 0)) < 0) { // code simplification started if ((ca_set_pmt(state, p_ca_message, hw_buffer, 0, 0)) < 0) { // code simplification started
dprintk("%s: -->CA_PMT Failed !\n", __FUNCTION__); dprintk(verbose, DST_CA_ERROR, 1, " -->CA_PMT Failed !");
return -1; return -1;
} }
if (verbose > 3) dprintk(verbose, DST_CA_INFO, 1, " -->CA_PMT Success !");
dprintk("%s: -->CA_PMT Success !\n", __FUNCTION__);
// retval = dummy_set_pmt(state, p_ca_message, hw_buffer, 0, 0);
break; break;
case CA_PMT_REPLY: case CA_PMT_REPLY:
if (verbose > 3) dprintk(verbose, DST_CA_INFO, 1, "Command = CA_PMT_REPLY");
dprintk("Command = CA_PMT_REPLY\n");
/* Have to handle the 2 basic types of cards here */ /* Have to handle the 2 basic types of cards here */
if ((dst_check_ca_pmt(state, p_ca_message, hw_buffer)) < 0) { if ((dst_check_ca_pmt(state, p_ca_message, hw_buffer)) < 0) {
dprintk("%s: -->CA_PMT_REPLY Failed !\n", __FUNCTION__); dprintk(verbose, DST_CA_ERROR, 1, " -->CA_PMT_REPLY Failed !");
return -1; return -1;
} }
if (verbose > 3) dprintk(verbose, DST_CA_INFO, 1, " -->CA_PMT_REPLY Success !");
dprintk("%s: -->CA_PMT_REPLY Success !\n", __FUNCTION__); break;
/* Certain boards do behave different ? */
// retval = ca_set_pmt(state, p_ca_message, hw_buffer, 1, 1);
case CA_APP_INFO_ENQUIRY: // only for debugging case CA_APP_INFO_ENQUIRY: // only for debugging
if (verbose > 3) dprintk(verbose, DST_CA_INFO, 1, " Getting Cam Application information");
dprintk("%s: Getting Cam Application information\n", __FUNCTION__);
if ((ca_get_app_info(state)) < 0) { if ((ca_get_app_info(state)) < 0) {
dprintk("%s: -->CA_APP_INFO_ENQUIRY Failed !\n", __FUNCTION__); dprintk(verbose, DST_CA_ERROR, 1, " -->CA_APP_INFO_ENQUIRY Failed !");
return -1; return -1;
} }
if (verbose > 3) dprintk(verbose, DST_CA_INFO, 1, " -->CA_APP_INFO_ENQUIRY Success !");
dprintk("%s: -->CA_APP_INFO_ENQUIRY Success !\n", __FUNCTION__);
break; break;
} }
} }
...@@ -509,110 +469,78 @@ static int dst_ca_ioctl(struct inode *inode, struct file *file, unsigned int cmd ...@@ -509,110 +469,78 @@ static int dst_ca_ioctl(struct inode *inode, struct file *file, unsigned int cmd
struct ca_msg *p_ca_message; struct ca_msg *p_ca_message;
if ((p_ca_message = (struct ca_msg *) kmalloc(sizeof (struct ca_msg), GFP_KERNEL)) == NULL) { if ((p_ca_message = (struct ca_msg *) kmalloc(sizeof (struct ca_msg), GFP_KERNEL)) == NULL) {
dprintk("%s: Memory allocation failure\n", __FUNCTION__); dprintk(verbose, DST_CA_ERROR, 1, " Memory allocation failure");
return -ENOMEM; return -ENOMEM;
} }
if ((p_ca_slot_info = (struct ca_slot_info *) kmalloc(sizeof (struct ca_slot_info), GFP_KERNEL)) == NULL) { if ((p_ca_slot_info = (struct ca_slot_info *) kmalloc(sizeof (struct ca_slot_info), GFP_KERNEL)) == NULL) {
dprintk("%s: Memory allocation failure\n", __FUNCTION__); dprintk(verbose, DST_CA_ERROR, 1, " Memory allocation failure");
return -ENOMEM; return -ENOMEM;
} }
if ((p_ca_caps = (struct ca_caps *) kmalloc(sizeof (struct ca_caps), GFP_KERNEL)) == NULL) { if ((p_ca_caps = (struct ca_caps *) kmalloc(sizeof (struct ca_caps), GFP_KERNEL)) == NULL) {
dprintk("%s: Memory allocation failure\n", __FUNCTION__); dprintk(verbose, DST_CA_ERROR, 1, " Memory allocation failure");
return -ENOMEM; return -ENOMEM;
} }
/* We have now only the standard ioctl's, the driver is upposed to handle internals. */ /* We have now only the standard ioctl's, the driver is upposed to handle internals. */
switch (cmd) { switch (cmd) {
case CA_SEND_MSG: case CA_SEND_MSG:
if (verbose > 1) dprintk(verbose, DST_CA_INFO, 1, " Sending message");
dprintk("%s: Sending message\n", __FUNCTION__);
if ((ca_send_message(state, p_ca_message, arg)) < 0) { if ((ca_send_message(state, p_ca_message, arg)) < 0) {
dprintk("%s: -->CA_SEND_MSG Failed !\n", __FUNCTION__); dprintk(verbose, DST_CA_ERROR, 1, " -->CA_SEND_MSG Failed !");
return -1; return -1;
} }
break; break;
case CA_GET_MSG: case CA_GET_MSG:
if (verbose > 1) dprintk(verbose, DST_CA_INFO, 1, " Getting message");
dprintk("%s: Getting message\n", __FUNCTION__);
if ((ca_get_message(state, p_ca_message, arg)) < 0) { if ((ca_get_message(state, p_ca_message, arg)) < 0) {
dprintk("%s: -->CA_GET_MSG Failed !\n", __FUNCTION__); dprintk(verbose, DST_CA_ERROR, 1, " -->CA_GET_MSG Failed !");
return -1; return -1;
} }
if (verbose > 1) dprintk(verbose, DST_CA_INFO, 1, " -->CA_GET_MSG Success !");
dprintk("%s: -->CA_GET_MSG Success !\n", __FUNCTION__);
break; break;
case CA_RESET: case CA_RESET:
if (verbose > 1) dprintk(verbose, DST_CA_ERROR, 1, " Resetting DST");
dprintk("%s: Resetting DST\n", __FUNCTION__);
dst_error_bailout(state); dst_error_bailout(state);
msleep(4000); msleep(4000);
break; break;
case CA_GET_SLOT_INFO: case CA_GET_SLOT_INFO:
if (verbose > 1) dprintk(verbose, DST_CA_INFO, 1, " Getting Slot info");
dprintk("%s: Getting Slot info\n", __FUNCTION__);
if ((ca_get_slot_info(state, p_ca_slot_info, arg)) < 0) { if ((ca_get_slot_info(state, p_ca_slot_info, arg)) < 0) {
dprintk("%s: -->CA_GET_SLOT_INFO Failed !\n", __FUNCTION__); dprintk(verbose, DST_CA_ERROR, 1, " -->CA_GET_SLOT_INFO Failed !");
return -1; return -1;
} }
if (verbose > 1) dprintk(verbose, DST_CA_INFO, 1, " -->CA_GET_SLOT_INFO Success !");
dprintk("%s: -->CA_GET_SLOT_INFO Success !\n", __FUNCTION__);
break; break;
case CA_GET_CAP: case CA_GET_CAP:
if (verbose > 1) dprintk(verbose, DST_CA_INFO, 1, " Getting Slot capabilities");
dprintk("%s: Getting Slot capabilities\n", __FUNCTION__);
if ((ca_get_slot_caps(state, p_ca_caps, arg)) < 0) { if ((ca_get_slot_caps(state, p_ca_caps, arg)) < 0) {
dprintk("%s: -->CA_GET_CAP Failed !\n", __FUNCTION__); dprintk(verbose, DST_CA_ERROR, 1, " -->CA_GET_CAP Failed !");
return -1; return -1;
} }
if (verbose > 1) dprintk(verbose, DST_CA_INFO, 1, " -->CA_GET_CAP Success !");
dprintk("%s: -->CA_GET_CAP Success !\n", __FUNCTION__);
break; break;
case CA_GET_DESCR_INFO: case CA_GET_DESCR_INFO:
if (verbose > 1) dprintk(verbose, DST_CA_INFO, 1, " Getting descrambler description");
dprintk("%s: Getting descrambler description\n", __FUNCTION__);
if ((ca_get_slot_descr(state, p_ca_message, arg)) < 0) { if ((ca_get_slot_descr(state, p_ca_message, arg)) < 0) {
dprintk("%s: -->CA_GET_DESCR_INFO Failed !\n", __FUNCTION__); dprintk(verbose, DST_CA_ERROR, 1, " -->CA_GET_DESCR_INFO Failed !");
return -1; return -1;
} }
if (verbose > 1) dprintk(verbose, DST_CA_INFO, 1, " -->CA_GET_DESCR_INFO Success !");
dprintk("%s: -->CA_GET_DESCR_INFO Success !\n", __FUNCTION__);
break; break;
case CA_SET_DESCR: case CA_SET_DESCR:
if (verbose > 1) dprintk(verbose, DST_CA_INFO, 1, " Setting descrambler");
dprintk("%s: Setting descrambler\n", __FUNCTION__);
if ((ca_set_slot_descr()) < 0) { if ((ca_set_slot_descr()) < 0) {
dprintk("%s: -->CA_SET_DESCR Failed !\n", __FUNCTION__); dprintk(verbose, DST_CA_ERROR, 1, " -->CA_SET_DESCR Failed !");
return -1; return -1;
} }
if (verbose > 1) dprintk(verbose, DST_CA_INFO, 1, " -->CA_SET_DESCR Success !");
dprintk("%s: -->CA_SET_DESCR Success !\n", __FUNCTION__);
break; break;
case CA_SET_PID: case CA_SET_PID:
if (verbose > 1) dprintk(verbose, DST_CA_INFO, 1, " Setting PID");
dprintk("%s: Setting PID\n", __FUNCTION__);
if ((ca_set_pid()) < 0) { if ((ca_set_pid()) < 0) {
dprintk("%s: -->CA_SET_PID Failed !\n", __FUNCTION__); dprintk(verbose, DST_CA_ERROR, 1, " -->CA_SET_PID Failed !");
return -1; return -1;
} }
if (verbose > 1) dprintk(verbose, DST_CA_INFO, 1, " -->CA_SET_PID Success !");
dprintk("%s: -->CA_SET_PID Success !\n", __FUNCTION__);
default: default:
return -EOPNOTSUPP; return -EOPNOTSUPP;
}; };
...@@ -622,8 +550,7 @@ static int dst_ca_ioctl(struct inode *inode, struct file *file, unsigned int cmd ...@@ -622,8 +550,7 @@ static int dst_ca_ioctl(struct inode *inode, struct file *file, unsigned int cmd
static int dst_ca_open(struct inode *inode, struct file *file) static int dst_ca_open(struct inode *inode, struct file *file)
{ {
if (verbose > 4) dprintk(verbose, DST_CA_DEBUG, 1, " Device opened [%p] ", file);
dprintk("%s:Device opened [%p]\n", __FUNCTION__, file);
try_module_get(THIS_MODULE); try_module_get(THIS_MODULE);
return 0; return 0;
...@@ -631,27 +558,24 @@ static int dst_ca_open(struct inode *inode, struct file *file) ...@@ -631,27 +558,24 @@ static int dst_ca_open(struct inode *inode, struct file *file)
static int dst_ca_release(struct inode *inode, struct file *file) static int dst_ca_release(struct inode *inode, struct file *file)
{ {
if (verbose > 4) dprintk(verbose, DST_CA_DEBUG, 1, " Device closed.");
dprintk("%s:Device closed.\n", __FUNCTION__);
module_put(THIS_MODULE); module_put(THIS_MODULE);
return 0; return 0;
} }
static int dst_ca_read(struct file *file, char __user * buffer, size_t length, loff_t * offset) static int dst_ca_read(struct file *file, char __user *buffer, size_t length, loff_t *offset)
{ {
int bytes_read = 0; int bytes_read = 0;
if (verbose > 4) dprintk(verbose, DST_CA_DEBUG, 1, " Device read.");
dprintk("%s:Device read.\n", __FUNCTION__);
return bytes_read; return bytes_read;
} }
static int dst_ca_write(struct file *file, const char __user * buffer, size_t length, loff_t * offset) static int dst_ca_write(struct file *file, const char __user *buffer, size_t length, loff_t *offset)
{ {
if (verbose > 4) dprintk(verbose, DST_CA_DEBUG, 1, " Device write.");
dprintk("%s:Device write.\n", __FUNCTION__);
return 0; return 0;
} }
...@@ -676,8 +600,7 @@ static struct dvb_device dvbdev_ca = { ...@@ -676,8 +600,7 @@ static struct dvb_device dvbdev_ca = {
int dst_ca_attach(struct dst_state *dst, struct dvb_adapter *dvb_adapter) int dst_ca_attach(struct dst_state *dst, struct dvb_adapter *dvb_adapter)
{ {
struct dvb_device *dvbdev; struct dvb_device *dvbdev;
if (verbose > 4) dprintk(verbose, DST_CA_ERROR, 1, "registering DST-CA device");
dprintk("%s:registering DST-CA device\n", __FUNCTION__);
dvb_register_device(dvb_adapter, &dvbdev, &dvbdev_ca, dst, DVB_DEVICE_CA); dvb_register_device(dvb_adapter, &dvbdev, &dvbdev_ca, dst, DVB_DEVICE_CA);
return 0; return 0;
} }
......
drivers/media/dvb/bt8xx/dst_common.h
View file @ a427de6f
...@@ -61,7 +61,6 @@ ...@@ -61,7 +61,6 @@
#define DST_TYPE_HAS_ANALOG 64 /* Analog inputs */ #define DST_TYPE_HAS_ANALOG 64 /* Analog inputs */
#define DST_TYPE_HAS_SESSION 128 #define DST_TYPE_HAS_SESSION 128
#define RDC_8820_PIO_0_DISABLE 0 #define RDC_8820_PIO_0_DISABLE 0
#define RDC_8820_PIO_0_ENABLE 1 #define RDC_8820_PIO_0_ENABLE 1
#define RDC_8820_INT 2 #define RDC_8820_INT 2
...@@ -124,15 +123,12 @@ struct dst_types { ...@@ -124,15 +123,12 @@ struct dst_types {
u32 dst_feature; u32 dst_feature;
}; };
struct dst_config struct dst_config
{ {
/* the ASIC i2c address */ /* the ASIC i2c address */
u8 demod_address; u8 demod_address;
}; };
int rdc_reset_state(struct dst_state *state); int rdc_reset_state(struct dst_state *state);
int rdc_8820_reset(struct dst_state *state); int rdc_8820_reset(struct dst_state *state);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment