/*
- Driver for VES1893 and VES1993 QPSK Frontends
+ Driver for VES1893 and VES1993 QPSK Demodulators
Copyright (C) 1999 Convergence Integrated Media GmbH <ralph@convergence.de>
Copyright (C) 2001 Ronny Strutz <3des@elitedvb.de>
#include <linux/init.h>
#include <linux/string.h>
#include <linux/slab.h>
+#include <linux/delay.h>
#include "dvb_frontend.h"
-#include "dvb_functions.h"
+#include "ves1x93.h"
-static int debug = 0;
-#define dprintk if (debug) printk
-static int board_type = 0;
-#define BOARD_SIEMENS_PCI 0
-#define BOARD_NOKIA_DBOX2 1
-#define BOARD_SAGEM_DBOX2 2
+struct ves1x93_state {
+
+ struct i2c_adapter* i2c;
-static int demod_type = 0;
-#define DEMOD_VES1893 0
-#define DEMOD_VES1993 1
+ struct dvb_frontend_ops ops;
-static struct dvb_frontend_info ves1x93_info = {
- .name = "VES1x93",
- .type = FE_QPSK,
- .frequency_min = 950000,
- .frequency_max = 2150000,
- .frequency_stepsize = 250, /* kHz for QPSK frontends */
- .frequency_tolerance = 29500,
- .symbol_rate_min = 1000000,
- .symbol_rate_max = 45000000,
-/* .symbol_rate_tolerance = ???,*/
- .notifier_delay = 50, /* 1/20 s */
- .caps = FE_CAN_INVERSION_AUTO |
- FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
- FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
- FE_CAN_QPSK
+ /* configuration settings */
+ const struct ves1x93_config* config;
+
+ struct dvb_frontend frontend;
+
+ /* previous uncorrected block counter */
+ fe_spectral_inversion_t inversion;
+ u8 *init_1x93_tab;
+ u8 *init_1x93_wtab;
+ u8 tab_size;
+ u8 demod_type;
};
+static int debug = 0;
+#define dprintk if (debug) printk
-/**
- * nokia dbox2 (ves1893) and sagem dbox2 (ves1993)
- * need bit AGCR[PWMS] set to 1
- */
+#define DEMOD_VES1893 0
+#define DEMOD_VES1993 1
static u8 init_1893_tab [] = {
0x01, 0xa4, 0x35, 0x80, 0x2a, 0x0b, 0x55, 0xc4,
0x00, 0x00, 0x0e, 0x80, 0x00
};
-
-static u8 * init_1x93_tab;
-
-
static u8 init_1893_wtab[] =
{
1,1,1,1,1,1,1,1, 1,1,0,0,1,1,0,0,
1,1,1,0,1,1,1,1, 1,1,1,1,1
};
-struct ves1x93_state {
- fe_spectral_inversion_t inversion;
-};
-
-
-
-static int ves1x93_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
+static int ves1x93_writereg (struct ves1x93_state* state, u8 reg, u8 data)
{
u8 buf [] = { 0x00, reg, data };
- struct i2c_msg msg = { .addr = 0x08, .flags = 0, .buf = buf, .len = 3 };
+ struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 3 };
int err;
- if ((err = i2c->xfer (i2c, &msg, 1)) != 1) {
+ if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
dprintk ("%s: writereg error (err == %i, reg == 0x%02x, data == 0x%02x)\n", __FUNCTION__, err, reg, data);
return -EREMOTEIO;
}
}
-static u8 ves1x93_readreg (struct dvb_i2c_bus *i2c, u8 reg)
+static u8 ves1x93_readreg (struct ves1x93_state* state, u8 reg)
{
int ret;
u8 b0 [] = { 0x00, reg };
u8 b1 [] = { 0 };
- struct i2c_msg msg [] = { { .addr = 0x08, .flags = 0, .buf = b0, .len = 2 },
- { .addr = 0x08, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
+ struct i2c_msg msg [] = { { .addr = state->config->demod_address, .flags = 0, .buf = b0, .len = 2 },
+ { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
- ret = i2c->xfer (i2c, msg, 2);
+ ret = i2c_transfer (state->i2c, msg, 2);
- if (ret != 2)
- dprintk("%s: readreg error (ret == %i)\n", __FUNCTION__, ret);
+ if (ret != 2) return ret;
return b1[0];
}
-
-static int tuner_write (struct dvb_i2c_bus *i2c, u8 *data, u8 len)
-{
- int ret;
- struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = len };
-
- ves1x93_writereg(i2c, 0x00, 0x11);
- ret = i2c->xfer (i2c, &msg, 1);
- ves1x93_writereg(i2c, 0x00, 0x01);
-
- if (ret != 1)
- printk("%s: i/o error (ret == %i)\n", __FUNCTION__, ret);
-
- return (ret != 1) ? -1 : 0;
-}
-
-
-
-/**
- * set up the downconverter frequency divisor for a
- * reference clock comparision frequency of 125 kHz.
- */
-static int sp5659_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq, u8 pwr)
-{
- u32 div = (freq + 479500) / 125;
- u8 buf [4] = { (div >> 8) & 0x7f, div & 0xff, 0x95, (pwr << 5) | 0x30 };
-
- return tuner_write (i2c, buf, sizeof(buf));
-}
-
-
-static int tsa5059_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq)
-{
- int ret;
- u8 buf [2];
-
- freq /= 1000;
-
- buf[0] = (freq >> 8) & 0x7F;
- buf[1] = freq & 0xFF;
-
- ret = tuner_write(i2c, buf, sizeof(buf));
-
- return ret;
-}
-
-
-static int tuner_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq, u8 pwr)
-{
- if ((demod_type == DEMOD_VES1893) && (board_type == BOARD_SIEMENS_PCI))
- return sp5659_set_tv_freq (i2c, freq, pwr);
- else if (demod_type == DEMOD_VES1993)
- return tsa5059_set_tv_freq (i2c, freq);
-
- return -EINVAL;
-}
-
-
-static int ves1x93_init (struct dvb_i2c_bus *i2c)
-{
- int i;
- int size;
- u8 *init_1x93_wtab;
-
- dprintk("%s: init chip\n", __FUNCTION__);
-
- switch (demod_type) {
- case DEMOD_VES1893:
- init_1x93_tab = init_1893_tab;
- init_1x93_wtab = init_1893_wtab;
- size = sizeof(init_1893_tab);
- if (board_type == BOARD_NOKIA_DBOX2)
- init_1x93_tab[0x05] |= 0x20; /* invert PWM */
- break;
-
- case DEMOD_VES1993:
- init_1x93_tab = init_1993_tab;
- init_1x93_wtab = init_1993_wtab;
- size = sizeof(init_1993_tab);
- if (board_type == BOARD_SAGEM_DBOX2)
- init_1x93_tab[0x05] |= 0x20; /* invert PWM */
- break;
-
- default:
- return -EINVAL;
- }
-
- for (i = 0; i < size; i++)
- if (init_1x93_wtab[i])
- ves1x93_writereg (i2c, i, init_1x93_tab[i]);
-
- if (demod_type == DEMOD_VES1993) {
- if (board_type == BOARD_NOKIA_DBOX2)
- tuner_write(i2c, "\x06\x5c\x83\x60", 4);
- else if (board_type == BOARD_SAGEM_DBOX2)
- tuner_write(i2c, "\x25\x70\x92\x40", 4);
- }
-
- return 0;
-}
-
-
-static int ves1x93_clr_bit (struct dvb_i2c_bus *i2c)
+static int ves1x93_clr_bit (struct ves1x93_state* state)
{
- ves1x93_writereg (i2c, 0, init_1x93_tab[0] & 0xfe);
- ves1x93_writereg (i2c, 0, init_1x93_tab[0]);
- dvb_delay(5);
+ msleep(10);
+ ves1x93_writereg (state, 0, state->init_1x93_tab[0] & 0xfe);
+ ves1x93_writereg (state, 0, state->init_1x93_tab[0]);
+ msleep(50);
return 0;
}
-static int ves1x93_init_aquire (struct dvb_i2c_bus *i2c)
-{
- ves1x93_writereg (i2c, 3, 0x00);
- ves1x93_writereg (i2c, 3, init_1x93_tab[3]);
- dvb_delay(5);
- return 0;
-}
-
-
-static int ves1x93_set_inversion (struct dvb_i2c_bus *i2c, fe_spectral_inversion_t inversion)
+static int ves1x93_set_inversion (struct ves1x93_state* state, fe_spectral_inversion_t inversion)
{
u8 val;
return -EINVAL;
}
- return ves1x93_writereg (i2c, 0x0c, (init_1x93_tab[0x0c] & 0x3f) | val);
+ return ves1x93_writereg (state, 0x0c, (state->init_1x93_tab[0x0c] & 0x3f) | val);
}
-static int ves1x93_set_fec (struct dvb_i2c_bus *i2c, fe_code_rate_t fec)
+static int ves1x93_set_fec (struct ves1x93_state* state, fe_code_rate_t fec)
{
if (fec == FEC_AUTO)
- return ves1x93_writereg (i2c, 0x0d, 0x08);
+ return ves1x93_writereg (state, 0x0d, 0x08);
else if (fec < FEC_1_2 || fec > FEC_8_9)
return -EINVAL;
else
- return ves1x93_writereg (i2c, 0x0d, fec - FEC_1_2);
+ return ves1x93_writereg (state, 0x0d, fec - FEC_1_2);
}
-static fe_code_rate_t ves1x93_get_fec (struct dvb_i2c_bus *i2c)
+static fe_code_rate_t ves1x93_get_fec (struct ves1x93_state* state)
{
- return FEC_1_2 + ((ves1x93_readreg (i2c, 0x0d) >> 4) & 0x7);
+ return FEC_1_2 + ((ves1x93_readreg (state, 0x0d) >> 4) & 0x7);
}
-static int ves1x93_set_symbolrate (struct dvb_i2c_bus *i2c, u32 srate)
+static int ves1x93_set_symbolrate (struct ves1x93_state* state, u32 srate)
{
u32 BDR;
u32 ratio;
u8 ADCONF, FCONF, FNR;
u32 BDRI;
u32 tmp;
- u32 XIN, FIN;
+ u32 FIN;
dprintk("%s: srate == %d\n", __FUNCTION__, (unsigned int) srate);
- switch (board_type) {
- case BOARD_SIEMENS_PCI:
- XIN = 90100000UL;
- break;
- case BOARD_NOKIA_DBOX2:
- if (demod_type == DEMOD_VES1893)
- XIN = 91000000UL;
- else if (demod_type == DEMOD_VES1993)
- XIN = 96000000UL;
- else
- return -EINVAL;
- break;
- case BOARD_SAGEM_DBOX2:
- XIN = 92160000UL;
- break;
- default:
- return -EINVAL;
- }
-
- if (srate > XIN/2)
- srate = XIN/2;
+ if (srate > state->config->xin/2)
+ srate = state->config->xin/2;
if (srate < 500000)
srate = 500000;
#define MUL (1UL<<26)
- FIN = (XIN + 6000) >> 4;
+ FIN = (state->config->xin + 6000) >> 4;
tmp = srate << 6;
ratio = tmp / FIN;
if (BDRI > 0xff)
BDRI = 0xff;
- ves1x93_writereg (i2c, 0x06, 0xff & BDR);
- ves1x93_writereg (i2c, 0x07, 0xff & (BDR >> 8));
- ves1x93_writereg (i2c, 0x08, 0x0f & (BDR >> 16));
+ ves1x93_writereg (state, 0x06, 0xff & BDR);
+ ves1x93_writereg (state, 0x07, 0xff & (BDR >> 8));
+ ves1x93_writereg (state, 0x08, 0x0f & (BDR >> 16));
- ves1x93_writereg (i2c, 0x09, BDRI);
- ves1x93_writereg (i2c, 0x20, ADCONF);
- ves1x93_writereg (i2c, 0x21, FCONF);
+ ves1x93_writereg (state, 0x09, BDRI);
+ ves1x93_writereg (state, 0x20, ADCONF);
+ ves1x93_writereg (state, 0x21, FCONF);
if (srate < 6000000)
- ves1x93_writereg (i2c, 0x05, init_1x93_tab[0x05] | 0x80);
+ ves1x93_writereg (state, 0x05, state->init_1x93_tab[0x05] | 0x80);
else
- ves1x93_writereg (i2c, 0x05, init_1x93_tab[0x05] & 0x7f);
+ ves1x93_writereg (state, 0x05, state->init_1x93_tab[0x05] & 0x7f);
/* ves1993 hates this, will lose lock */
- if (demod_type != DEMOD_VES1993)
- ves1x93_clr_bit (i2c);
+ if (state->demod_type != DEMOD_VES1993)
+ ves1x93_clr_bit (state);
return 0;
}
-static int ves1x93_afc (struct dvb_i2c_bus *i2c, u32 freq, u32 srate)
+
+
+
+
+
+
+
+
+
+
+
+
+
+static int ves1x93_init (struct dvb_frontend* fe)
{
- int afc;
+ struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
+ int i;
+ int val;
- afc = ((int)((ves1x93_readreg (i2c, 0x0a) << 1) & 0xff))/2;
- afc = (afc * (int)(srate/1000/8))/16;
-
- if (afc) {
-
- freq -= afc;
+ dprintk("%s: init chip\n", __FUNCTION__);
- tuner_set_tv_freq (i2c, freq, 0);
+ for (i = 0; i < state->tab_size; i++) {
+ if (state->init_1x93_wtab[i]) {
+ val = state->init_1x93_tab[i];
+
+ if (state->config->invert_pwm && (i == 0x05)) val |= 0x20; /* invert PWM */
+ ves1x93_writereg (state, i, val);
+ }
+ }
- ves1x93_init_aquire (i2c);
+ if (state->config->pll_init) {
+ ves1x93_writereg(state, 0x00, 0x11);
+ state->config->pll_init(fe);
+ ves1x93_writereg(state, 0x00, 0x01);
}
-
+
return 0;
}
-static int ves1x93_set_voltage (struct dvb_i2c_bus *i2c, fe_sec_voltage_t voltage)
+static int ves1x93_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltage)
{
+ struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
+
switch (voltage) {
case SEC_VOLTAGE_13:
- return ves1x93_writereg (i2c, 0x1f, 0x20);
+ return ves1x93_writereg (state, 0x1f, 0x20);
case SEC_VOLTAGE_18:
- return ves1x93_writereg (i2c, 0x1f, 0x30);
+ return ves1x93_writereg (state, 0x1f, 0x30);
case SEC_VOLTAGE_OFF:
- return ves1x93_writereg (i2c, 0x1f, 0x00);
+ return ves1x93_writereg (state, 0x1f, 0x00);
default:
return -EINVAL;
}
}
-
-static int ves1x93_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
+static int ves1x93_read_status(struct dvb_frontend* fe, fe_status_t* status)
{
- struct dvb_i2c_bus *i2c = fe->i2c;
- struct ves1x93_state *state = (struct ves1x93_state*) fe->data;
+ struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
- switch (cmd) {
- case FE_GET_INFO:
- memcpy (arg, &ves1x93_info, sizeof(struct dvb_frontend_info));
- break;
+ u8 sync = ves1x93_readreg (state, 0x0e);
- case FE_READ_STATUS:
- {
- fe_status_t *status = arg;
- u8 sync = ves1x93_readreg (i2c, 0x0e);
+ /*
+ * The ves1893 sometimes returns sync values that make no sense,
+ * because, e.g., the SIGNAL bit is 0, while some of the higher
+ * bits are 1 (and how can there be a CARRIER w/o a SIGNAL?).
+ * Tests showed that the the VITERBI and SYNC bits are returned
+ * reliably, while the SIGNAL and CARRIER bits ar sometimes wrong.
+ * If such a case occurs, we read the value again, until we get a
+ * valid value.
+ */
+ int maxtry = 10; /* just for safety - let's not get stuck here */
+ while ((sync & 0x03) != 0x03 && (sync & 0x0c) && maxtry--) {
+ msleep(10);
+ sync = ves1x93_readreg (state, 0x0e);
+ }
*status = 0;
if ((sync & 0x1f) == 0x1f)
*status |= FE_HAS_LOCK;
- break;
+ return 0;
}
- case FE_READ_BER:
+
+static int ves1x93_read_ber(struct dvb_frontend* fe, u32* ber)
{
- u32 *ber = (u32 *) arg;
+ struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
- *ber = ves1x93_readreg (i2c, 0x15);
- *ber |= (ves1x93_readreg (i2c, 0x16) << 8);
- *ber |= ((ves1x93_readreg (i2c, 0x17) & 0x0F) << 16);
+ *ber = ves1x93_readreg (state, 0x15);
+ *ber |= (ves1x93_readreg (state, 0x16) << 8);
+ *ber |= ((ves1x93_readreg (state, 0x17) & 0x0F) << 16);
*ber *= 10;
- break;
+
+ return 0;
}
- case FE_READ_SIGNAL_STRENGTH:
+static int ves1x93_read_signal_strength(struct dvb_frontend* fe, u16* strength)
{
- u8 signal = ~ves1x93_readreg (i2c, 0x0b);
- *((u16*) arg) = (signal << 8) | signal;
- break;
+ struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
+
+ u8 signal = ~ves1x93_readreg (state, 0x0b);
+ *strength = (signal << 8) | signal;
+
+ return 0;
}
- case FE_READ_SNR:
+static int ves1x93_read_snr(struct dvb_frontend* fe, u16* snr)
{
- u8 snr = ~ves1x93_readreg (i2c, 0x1c);
- *(u16*) arg = (snr << 8) | snr;
- break;
+ struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
+
+ u8 _snr = ~ves1x93_readreg (state, 0x1c);
+ *snr = (_snr << 8) | _snr;
+
+ return 0;
}
- case FE_READ_UNCORRECTED_BLOCKS:
+static int ves1x93_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
{
- *(u32*) arg = ves1x93_readreg (i2c, 0x18) & 0x7f;
+ struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
- if (*(u32*) arg == 0x7f)
- *(u32*) arg = 0xffffffff; /* counter overflow... */
+ *ucblocks = ves1x93_readreg (state, 0x18) & 0x7f;
- ves1x93_writereg (i2c, 0x18, 0x00); /* reset the counter */
- ves1x93_writereg (i2c, 0x18, 0x80); /* dto. */
- break;
+ if (*ucblocks == 0x7f)
+ *ucblocks = 0xffffffff; /* counter overflow... */
+
+ ves1x93_writereg (state, 0x18, 0x00); /* reset the counter */
+ ves1x93_writereg (state, 0x18, 0x80); /* dto. */
+
+ return 0;
}
- case FE_SET_FRONTEND:
+static int ves1x93_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
{
- struct dvb_frontend_parameters *p = arg;
-
- tuner_set_tv_freq (i2c, p->frequency, 0);
- ves1x93_set_inversion (i2c, p->inversion);
- ves1x93_set_fec (i2c, p->u.qpsk.fec_inner);
- ves1x93_set_symbolrate (i2c, p->u.qpsk.symbol_rate);
- ves1x93_afc (i2c, p->frequency, p->u.qpsk.symbol_rate);
+ struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
+
+ ves1x93_writereg(state, 0x00, 0x11);
+ state->config->pll_set(fe, p);
+ ves1x93_writereg(state, 0x00, 0x01);
+ ves1x93_set_inversion (state, p->inversion);
+ ves1x93_set_fec (state, p->u.qpsk.fec_inner);
+ ves1x93_set_symbolrate (state, p->u.qpsk.symbol_rate);
state->inversion = p->inversion;
- break;
+
+ return 0;
}
- case FE_GET_FRONTEND:
+static int ves1x93_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
{
- struct dvb_frontend_parameters *p = arg;
+ struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
int afc;
- afc = ((int)((char)(ves1x93_readreg (i2c, 0x0a) << 1)))/2;
+ afc = ((int)((char)(ves1x93_readreg (state, 0x0a) << 1)))/2;
afc = (afc * (int)(p->u.qpsk.symbol_rate/1000/8))/16;
p->frequency -= afc;
* if auto inversion was used
*/
if (state->inversion == INVERSION_AUTO)
- p->inversion = (ves1x93_readreg (i2c, 0x0f) & 2) ?
+ p->inversion = (ves1x93_readreg (state, 0x0f) & 2) ?
INVERSION_OFF : INVERSION_ON;
- p->u.qpsk.fec_inner = ves1x93_get_fec (i2c);
+ p->u.qpsk.fec_inner = ves1x93_get_fec (state);
/* XXX FIXME: timing offset !! */
- break;
- }
-
- case FE_SLEEP:
- if (board_type == BOARD_SIEMENS_PCI)
- ves1x93_writereg (i2c, 0x1f, 0x00); /* LNB power off */
- return ves1x93_writereg (i2c, 0x00, 0x08);
-
- case FE_INIT:
- return ves1x93_init (i2c);
- case FE_SET_TONE:
- return -EOPNOTSUPP; /* the ves1893 can generate the 22k */
- /* let's implement this when we have */
- /* a box that uses the 22K_0 pin... */
+ return 0;
+}
- case FE_SET_VOLTAGE:
- return ves1x93_set_voltage (i2c, (fe_sec_voltage_t) arg);
+static int ves1x93_sleep(struct dvb_frontend* fe)
+{
+ struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
- default:
- return -EOPNOTSUPP;
- };
+ return ves1x93_writereg (state, 0x00, 0x08);
+}
- return 0;
+static void ves1x93_release(struct dvb_frontend* fe)
+{
+ struct ves1x93_state* state = (struct ves1x93_state*) fe->demodulator_priv;
+ kfree(state);
}
+static struct dvb_frontend_ops ves1x93_ops;
-static int ves1x93_attach (struct dvb_i2c_bus *i2c, void **data)
+struct dvb_frontend* ves1x93_attach(const struct ves1x93_config* config,
+ struct i2c_adapter* i2c)
{
- u8 identity = ves1x93_readreg(i2c, 0x1e);
- struct ves1x93_state* state;
+ struct ves1x93_state* state = NULL;
+ u8 identity;
+
+ /* allocate memory for the internal state */
+ state = (struct ves1x93_state*) kmalloc(sizeof(struct ves1x93_state), GFP_KERNEL);
+ if (state == NULL) goto error;
+
+ /* setup the state */
+ state->config = config;
+ state->i2c = i2c;
+ memcpy(&state->ops, &ves1x93_ops, sizeof(struct dvb_frontend_ops));
+ state->inversion = INVERSION_OFF;
+ /* check if the demod is there + identify it */
+ identity = ves1x93_readreg(state, 0x1e);
switch (identity) {
case 0xdc: /* VES1893A rev1 */
printk("ves1x93: Detected ves1893a rev1\n");
- demod_type = DEMOD_VES1893;
- ves1x93_info.name[4] = '8';
+ state->demod_type = DEMOD_VES1893;
+ state->init_1x93_tab = init_1893_tab;
+ state->init_1x93_wtab = init_1893_wtab;
+ state->tab_size = sizeof(init_1893_tab);
break;
+
case 0xdd: /* VES1893A rev2 */
printk("ves1x93: Detected ves1893a rev2\n");
- demod_type = DEMOD_VES1893;
- ves1x93_info.name[4] = '8';
+ state->demod_type = DEMOD_VES1893;
+ state->init_1x93_tab = init_1893_tab;
+ state->init_1x93_wtab = init_1893_wtab;
+ state->tab_size = sizeof(init_1893_tab);
break;
+
case 0xde: /* VES1993 */
printk("ves1x93: Detected ves1993\n");
- demod_type = DEMOD_VES1993;
- ves1x93_info.name[4] = '9';
+ state->demod_type = DEMOD_VES1993;
+ state->init_1x93_tab = init_1993_tab;
+ state->init_1x93_wtab = init_1993_wtab;
+ state->tab_size = sizeof(init_1993_tab);
break;
- default:
- dprintk("VES1x93 not found (identity %02x)\n", identity);
- return -ENODEV;
- }
- if ((state = kmalloc(sizeof(struct ves1x93_state), GFP_KERNEL)) == NULL) {
- return -ENOMEM;
- }
- state->inversion = INVERSION_OFF;
- *data = state;
-
- return dvb_register_frontend (ves1x93_ioctl, i2c, (void*) state, &ves1x93_info);
-}
-
-
-static void ves1x93_detach (struct dvb_i2c_bus *i2c, void *data)
-{
- kfree(data);
- dvb_unregister_frontend (ves1x93_ioctl, i2c);
-}
-
-
-static int __init init_ves1x93 (void)
-{
- switch (board_type) {
- case BOARD_NOKIA_DBOX2:
- dprintk("%s: NOKIA_DBOX2\n", __FILE__);
- break;
- case BOARD_SAGEM_DBOX2:
- dprintk("%s: SAGEM_DBOX2\n", __FILE__);
- break;
- case BOARD_SIEMENS_PCI:
- dprintk("%s: SIEMENS_PCI\n", __FILE__);
- break;
default:
- return -EIO;
+ goto error;
}
- return dvb_register_i2c_device (THIS_MODULE, ves1x93_attach, ves1x93_detach);
-}
-
-
-static void __exit exit_ves1x93 (void)
-{
- dvb_unregister_i2c_device (ves1x93_attach);
-}
+ /* create dvb_frontend */
+ state->frontend.ops = &state->ops;
+ state->frontend.demodulator_priv = state;
+ return &state->frontend;
+error:
+ if (state) kfree(state);
+ return NULL;
+ }
-module_init(init_ves1x93);
-module_exit(exit_ves1x93);
+static struct dvb_frontend_ops ves1x93_ops = {
+
+ .info = {
+ .name = "VLSI VES1x93 DVB-S",
+ .type = FE_QPSK,
+ .frequency_min = 950000,
+ .frequency_max = 2150000,
+ .frequency_stepsize = 125, /* kHz for QPSK frontends */
+ .frequency_tolerance = 29500,
+ .symbol_rate_min = 1000000,
+ .symbol_rate_max = 45000000,
+ /* .symbol_rate_tolerance = ???,*/
+ .caps = FE_CAN_INVERSION_AUTO |
+ FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
+ FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
+ FE_CAN_QPSK
+ },
+
+ .release = ves1x93_release,
+
+ .init = ves1x93_init,
+ .sleep = ves1x93_sleep,
+
+ .set_frontend = ves1x93_set_frontend,
+ .get_frontend = ves1x93_get_frontend,
+
+ .read_status = ves1x93_read_status,
+ .read_ber = ves1x93_read_ber,
+ .read_signal_strength = ves1x93_read_signal_strength,
+ .read_snr = ves1x93_read_snr,
+ .read_ucblocks = ves1x93_read_ucblocks,
+
+ .set_voltage = ves1x93_set_voltage,
+};
+module_param(debug, int, 0644);
-MODULE_DESCRIPTION("VES1x93 DVB-S Frontend");
+MODULE_DESCRIPTION("VLSI VES1x93 DVB-S Demodulator driver");
MODULE_AUTHOR("Ralph Metzler");
MODULE_LICENSE("GPL");
-MODULE_PARM(debug,"i");
-MODULE_PARM(board_type,"i");
+EXPORT_SYMBOL(ves1x93_attach);
git://git.onelab.eu / linux-2.6.git / blobdiff