summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/frontends/ves1x93.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/dvb/frontends/ves1x93.c')
-rw-r--r--linux/drivers/media/dvb/frontends/ves1x93.c28
1 files changed, 2 insertions, 26 deletions
diff --git a/linux/drivers/media/dvb/frontends/ves1x93.c b/linux/drivers/media/dvb/frontends/ves1x93.c
index 1c511ef6b..b97861c5a 100644
--- a/linux/drivers/media/dvb/frontends/ves1x93.c
+++ b/linux/drivers/media/dvb/frontends/ves1x93.c
@@ -35,14 +35,10 @@
struct ves1x93_state {
-
struct i2c_adapter* i2c;
-
struct dvb_frontend_ops ops;
-
/* configuration settings */
const struct ves1x93_config* config;
-
struct dvb_frontend frontend;
/* previous uncorrected block counter */
@@ -69,7 +65,6 @@ static u8 init_1893_tab [] = {
0x00, 0x55, 0x00, 0x00, 0x7f, 0x00
};
-
static u8 init_1993_tab [] = {
0x00, 0x9c, 0x35, 0x80, 0x6a, 0x09, 0x72, 0x8c,
0x09, 0x6b, 0x00, 0x00, 0x4c, 0x08, 0x00, 0x00,
@@ -89,7 +84,6 @@ static u8 init_1893_wtab[] =
1,1,1,0,1,1
};
-
static u8 init_1993_wtab[] =
{
1,1,1,1,1,1,1,1, 1,1,0,0,1,1,0,0,
@@ -112,7 +106,6 @@ static int ves1x93_writereg (struct ves1x93_state* state, u8 reg, u8 data)
return 0;
}
-
static u8 ves1x93_readreg (struct ves1x93_state* state, u8 reg)
{
int ret;
@@ -163,7 +156,6 @@ static int ves1x93_set_inversion (struct ves1x93_state* state, fe_spectral_inver
return ves1x93_writereg (state, 0x0c, (state->init_1x93_tab[0x0c] & 0x3f) | val);
}
-
static int ves1x93_set_fec (struct ves1x93_state* state, fe_code_rate_t fec)
{
if (fec == FEC_AUTO)
@@ -174,13 +166,11 @@ static int ves1x93_set_fec (struct ves1x93_state* state, fe_code_rate_t fec)
return ves1x93_writereg (state, 0x0d, fec - FEC_1_2);
}
-
static fe_code_rate_t ves1x93_get_fec (struct ves1x93_state* state)
{
return FEC_1_2 + ((ves1x93_readreg (state, 0x0d) >> 4) & 0x7);
}
-
static int ves1x93_set_symbolrate (struct ves1x93_state* state, u32 srate)
{
u32 BDR;
@@ -256,7 +246,7 @@ static int ves1x93_set_symbolrate (struct ves1x93_state* state, u32 srate)
AGCR = state->init_1x93_tab[0x05];
if (state->config->invert_pwm)
AGCR |= 0x20;
-
+
if (srate < 6000000)
AGCR |= 0x80;
else
@@ -271,20 +261,6 @@ static int ves1x93_set_symbolrate (struct ves1x93_state* state, u32 srate)
return 0;
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
static int ves1x93_init (struct dvb_frontend* fe)
{
struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
@@ -349,6 +325,7 @@ static int ves1x93_read_status(struct dvb_frontend* fe, fe_status_t* status)
}
*status = 0;
+
if (sync & 1)
*status |= FE_HAS_SIGNAL;
@@ -367,7 +344,6 @@ static int ves1x93_read_status(struct dvb_frontend* fe, fe_status_t* status)
return 0;
}
-
static int ves1x93_read_ber(struct dvb_frontend* fe, u32* ber)
{
struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;