Mailing List archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[linux-dvb] Re: cx22702 UCBLOCK problem
On Thursday 09 Sep 2004 22:53, Steve Toth wrote:
> > > Also, that channel gets an absolutely perfect signal with a
> >
> > TDA10045-based
> >
> > > Nova-T.
>
> I'm travelling for the next few days, I'll grab some time asap to look at
> this.
>
> > To follow this up - all transponders work fine, except for the
> > Sky transponder
> > - I get bad glitching on that. And I don't with a TDA10045.
>
> Anything different about the sky transponder that's different to the
> others?
Not that I can see - other channels using those params were ok. my guess is
some frequency related thing.
*However*, I've just been doing some more extensive analysis. I have come up
with a new set of init values, as well as some other tweaks in the attached
patch.
With these new values, AUTO mode works! BUT: manual mode now doesn't work :) I
don't have enough information to work out why. Oh - I also fixed the UCBLOCKS
sticky counter problem - looks like you can't reset it - you just have to
remember the old value and subtract.
My errors appear to have gone with this latest patch. I've not done a soak
test yet though.
I've no idea what any of the init values do now - if you're able to (w.r.t
NDAs etc), please lemme know!
Index: cx22702.c
===================================================================
RCS file: /cvs/linuxtv/dvb-kernel/linux/drivers/media/dvb/frontends/cx22702.c,v
retrieving revision 1.2
diff -a -u -r1.2 cx22702.c
--- cx22702.c 6 Sep 2004 17:00:21 -0000 1.2
+++ cx22702.c 9 Sep 2004 22:08:57 -0000
@@ -36,9 +36,7 @@
#define FRONTEND_NAME "dvbfe_cx22702"
-#define I2C_DEMOD_SLAVE_ADDR 0x43
#define I2C_EEPROM_SLAVE_ADDR 0x50
-#define I2C_PLL_SLAVE_ADDR 0x61
#define PLLTYPE_DTT7592 1
#define PLLTYPE_DTT7595 2
@@ -49,15 +47,16 @@
#define dprintk if (debug) printk
static struct dvb_frontend_info cx22702_info = {
- .name = "CX22702 Demod Thompson 759x/7579 PLL",
+ .name = "CX22702 Demod Thomson 759x/7579 PLL",
.type = FE_OFDM,
.frequency_min = 177000000,
.frequency_max = 858000000,
.frequency_stepsize = 166666,
.caps = 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 | FE_CAN_QAM_16 | FE_CAN_QAM_64 |
- FE_CAN_RECOVER
+ FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
+ FE_CAN_HIERARCHY_AUTO | FE_CAN_GUARD_INTERVAL_AUTO |
+ FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_RECOVER
};
struct cx22702_state {
@@ -65,29 +64,48 @@
struct dvb_adapter *dvb;
struct dvb_frontend_info cx22702_info;
char pll_type;
+ int pll_addr;
+ int demod_addr;
+ u8 prevUCBlocks;
};
/* Register values to initialise the demod */
static u8 init_tab [] = {
0x00, 0x00, /* Stop aquisition */
- 0x09, 0x01, /* Set to software configure */
- 0x0B, 0x04, /* TPS source = user given values */
- 0x0C, 0x00, /* Bandwidth = 8MHz normal spectrum */
- 0x0D, 0x80, /* Serial Bus Control address increment and serial passthru enabled */
- 0x26, 0x80,
- 0x2D, 0xff,
- 0xDC, 0x00, /* Count BER IN AVERAGE MODE */
- 0xE4, 0x00, /* Count BER IN AVERAGE MODE */
- 0xF8, 0x02, /* MPEG Output Interface -- FALLING_CHANGES | SERIAL IO | OUTPUTENABLED */
+ 0x0B, 0x06,
+ 0x09, 0x01,
+ 0x0D, 0x41,
+ 0x16, 0x32,
+ 0x20, 0x0A,
+ 0x21, 0x17,
+ 0x24, 0x3e,
+ 0x26, 0xff,
+ 0x27, 0x10,
+ 0x28, 0x00,
+ 0x29, 0x00,
+ 0x2a, 0x10,
+ 0x2b, 0x00,
+ 0x2c, 0x10,
+ 0x2d, 0x00,
+ 0x48, 0xd4,
+ 0x49, 0x56,
+ 0x6b, 0x1e,
+ 0xc8, 0x02,
+ 0xf8, 0x02,
+ 0xf9, 0x00,
+ 0xfa, 0x00,
+ 0xfb, 0x00,
+ 0xfc, 0x00,
+ 0xfd, 0x00,
};
static struct i2c_client client_template;
-static int cx22702_writereg (struct i2c_adapter *i2c, u8 reg, u8 data)
+static int cx22702_writereg (struct i2c_adapter *i2c, int demod_addr, u8 reg, u8 data)
{
int ret;
u8 buf [] = { reg, data };
- struct i2c_msg msg = { .addr = I2C_DEMOD_SLAVE_ADDR, .flags = 0, .buf = buf, .len = 2 };
+ struct i2c_msg msg = { .addr = demod_addr, .flags = 0, .buf = buf, .len = 2 };
ret = i2c_transfer(i2c, &msg, 1);
@@ -98,15 +116,15 @@
return (ret != 1) ? -1 : 0;
}
-static u8 cx22702_readreg (struct i2c_adapter *i2c, u8 reg)
+static u8 cx22702_readreg (struct i2c_adapter *i2c, int demod_addr, u8 reg)
{
int ret;
u8 b0 [] = { reg };
u8 b1 [] = { 0 };
struct i2c_msg msg [] = {
- { .addr = I2C_DEMOD_SLAVE_ADDR, .flags = 0, .buf = b0, .len = 1 },
- { .addr = I2C_DEMOD_SLAVE_ADDR, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
+ { .addr = demod_addr, .flags = 0, .buf = b0, .len = 1 },
+ { .addr = demod_addr, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
ret = i2c_transfer(i2c, msg, 2);
@@ -116,34 +134,35 @@
return b1[0];
}
-static int pll_readreg(struct i2c_adapter *i2c, u8 reg)
+static int pll_readreg(struct i2c_adapter *i2c, int pll_addr, int demod_addr, u8 reg)
{
u8 b0 [] = { reg };
u8 b1 [] = { 0 };
struct i2c_msg msg [] = {
- { .addr = I2C_PLL_SLAVE_ADDR, .flags = 0, .buf = b0, .len = 1 },
- { .addr = I2C_PLL_SLAVE_ADDR, .flags = I2C_M_RD, .buf = b1, .len = 1 }
+ { .addr = pll_addr, .flags = 0, .buf = b0, .len = 1 },
+ { .addr = pll_addr, .flags = I2C_M_RD, .buf = b1, .len = 1 }
};
- /* cx22702_writereg (i2c, 0x0D, cx22702_readreg(i2c,0x0D) &0xfe); // Enable PLL bus */
+ cx22702_writereg (i2c, demod_addr, 0x0D, cx22702_readreg(i2c,demod_addr,0x0D) &0xfe); // Enable PLL bus
if (i2c_transfer(i2c, msg, 2) != 2) {
printk ("%s i2c pll request failed\n", __FUNCTION__);
+ cx22702_writereg (i2c, demod_addr, 0x0D, cx22702_readreg(i2c,demod_addr,0x0D) | 1); // Disable PLL bus
return -ENODEV;
}
- /* cx22702_writereg (i2c, 0x0D, cx22702_readreg(i2c,0x0D) | 1); // Disable PLL bus */
+ cx22702_writereg (i2c, demod_addr, 0x0D, cx22702_readreg(i2c,demod_addr,0x0D) | 1); // Disable PLL bus
return b1[0];
}
-static int pll_write (struct i2c_adapter *i2c, u8 data [4])
+static int pll_write (struct i2c_adapter *i2c, int pll_addr, int demod_addr, u8 data [4])
{
int ret=0;
- struct i2c_msg msg = { .addr = I2C_PLL_SLAVE_ADDR, .flags = 0, .buf = data, .len = 4 };
+ struct i2c_msg msg = { .addr = pll_addr, .flags = 0, .buf = data, .len = 4 };
- /* cx22702_writereg (i2c, 0x0D, cx22702_readreg(i2c,0x0D) &0xfe); // Enable PLL bus */
+ cx22702_writereg (i2c, demod_addr, 0x0D, cx22702_readreg(i2c,demod_addr,0x0D) &0xfe); // Enable PLL bus
ret = i2c_transfer(i2c, &msg, 1);
- /* cx22702_writereg (i2c, 0x0D, cx22702_readreg(i2c,0x0D) | 1); // Disable PLL bus */
+ cx22702_writereg (i2c, demod_addr, 0x0D, cx22702_readreg(i2c,demod_addr,0x0D) | 1); // Disable PLL bus
if (ret != 1)
printk("%s: i/o error (addr == 0x%02x, ret == %i)\n", __FUNCTION__, msg.addr, ret);
@@ -151,13 +170,13 @@
return (ret != 1) ? -1 : 0;
}
-static int pll_dtt759x_set_tv_freq (struct i2c_adapter *i2c, u32 freq)
+static int pll_dtt759x_set_tv_freq (struct i2c_adapter *i2c, struct cx22702_state *state, u32 freq, int bandwidth)
{
int ret;
u32 div = (freq + 36166667) / 166666;
- /* dividerhigh, divierlow, control, bandwidth switch tuner args */
+ /* dividerhigh, dividerlow, control, bandwidth switch tuner args */
unsigned char buf [4] = {
(div >> 8) & 0x7f,
div & 0xff,
@@ -171,13 +190,11 @@
buf[3] = 0x08;
}
-#if 0
- if(bandw == BANDWIDTH_7MHz) {
- buf[4] |= 0x10;
+ if(bandwidth == BANDWIDTH_7_MHZ) {
+ buf[3] |= 0x10;
}
-#endif
- // Now compensate for the charge pump osc
+ // Now compensate for the charge pump osc
if(freq <= 264000000) {
buf[2] = buf[2] | 0x30;
} else if (freq <= 735000000) {
@@ -187,31 +204,30 @@
} else if (freq <= 896000000) {
buf[2] = buf[2] | 0x78;
}
-
- buf[2]=0xbc;
-
+
dprintk ("%s: freq == %i, div == 0x%04x\n", __FUNCTION__, (int) freq, (int) div);
-
- ret= pll_write (i2c, buf);
+
+ ret= pll_write (i2c, state->pll_addr, state->demod_addr, buf);
if(ret<0) {
dprintk ("%s: first pll_write failed\n",__FUNCTION__);
return ret;
}
- /* Set the AGC to search */
- buf[2]=0x9c;
+ /* Set the AGC during search */
+ buf[2]=(buf[2] & 0xc7) | 0x18;
buf[3]=0xa0;
- ret=pll_write (i2c, buf);
+ ret=pll_write (i2c, state->pll_addr, state->demod_addr, buf);
if(ret<0) {
dprintk ("%s: second pll_write failed\n",__FUNCTION__);
return ret;
}
/* Tuner needs a small amount of time */
- __udelay(100*1000);
+ msleep(100);
+ /* Set the AGC post-search */
buf[3]=0x20;
- ret=pll_write (i2c, buf);
+ ret=pll_write (i2c, state->pll_addr, state->demod_addr, buf);
if(ret<0) {
dprintk ("%s: third pll_write failed\n",__FUNCTION__);
return ret;
@@ -221,13 +237,13 @@
}
-static int pll_dtt7579_set_tv_freq (struct i2c_adapter *i2c, u32 freq)
+static int pll_dtt7579_set_tv_freq (struct i2c_adapter *i2c, struct cx22702_state *state, u32 freq, int bandwidth)
{
int ret;
u32 div = (freq + 36166667) / 166666;
- /* dividerhigh, divierlow */
+ /* dividerhigh, dividerlow */
unsigned char buf [4] = {
div >> 8,
div & 0xff,
@@ -235,6 +251,8 @@
0x00
};
+ // FIXME: bandwidth setting unknown
+
// Now compensate for the charge pump osc
if(freq <= 506000000) {
buf[2] = 0xb4;
@@ -252,7 +270,7 @@
dprintk ("%s: freq == %i, div == 0x%04x\n", __FUNCTION__, (int) freq, (int) div);
- ret= pll_write (i2c, buf);
+ ret= pll_write (i2c, state->pll_addr, state->demod_addr, buf);
if(ret<0) {
dprintk ("%s: first pll_write failed\n",__FUNCTION__);
return ret;
@@ -261,7 +279,7 @@
/* Set the AGC to search */
buf[2]=(buf[2] & 0xdc) | 0x9c;
buf[3]=0xa0;
- ret=pll_write (i2c, buf);
+ ret=pll_write (i2c, state->pll_addr, state->demod_addr, buf);
if(ret<0) {
dprintk ("%s: second pll_write failed\n",__FUNCTION__);
return ret;
@@ -273,23 +291,21 @@
/* Reset the demod hardware and reset all of the configuration registers
to a default state. */
-static int cx22702_init (struct i2c_adapter *i2c)
+static int cx22702_init (struct i2c_adapter *i2c, struct cx22702_state *state)
{
int i;
- cx22702_writereg (i2c, 0x00, 0x02);
- cx22702_writereg (i2c, 0x00, 0x00);
+ cx22702_writereg (i2c, state->demod_addr, 0x00, 0x02);
msleep(10);
for (i=0; i<sizeof(init_tab); i+=2)
- cx22702_writereg (i2c, init_tab[i], init_tab[i+1]);
+ cx22702_writereg (i2c, state->demod_addr, init_tab[i], init_tab[i+1]);
- cx22702_writereg (i2c, 0x00, 0x01);
return 0;
}
-static int cx22702_set_inversion (struct i2c_adapter *i2c, int inversion)
+static int cx22702_set_inversion (struct i2c_adapter *i2c, struct cx22702_state *state, int inversion)
{
u8 val;
@@ -299,12 +315,12 @@
return -EOPNOTSUPP;
case INVERSION_ON:
- val = cx22702_readreg (i2c, 0x0C);
- return cx22702_writereg (i2c, 0x0C, val | 0x01);
+ val = cx22702_readreg (i2c, state->demod_addr, 0x0C);
+ return cx22702_writereg (i2c, state->demod_addr, 0x0C, val | 0x01);
case INVERSION_OFF:
- val = cx22702_readreg (i2c, 0x0C);
- return cx22702_writereg (i2c, 0x0C, val & 0xfe);
+ val = cx22702_readreg (i2c, state->demod_addr, 0x0C);
+ return cx22702_writereg (i2c, state->demod_addr, 0x0C, val & 0xfe);
default:
return -EINVAL;
@@ -314,54 +330,75 @@
}
/* Talk to the demod, set the FEC, GUARD, QAM settings etc */
-static int cx22702_set_tps (struct i2c_adapter *i2c,
- struct dvb_ofdm_parameters *p)
+static int cx22702_set_tps (struct i2c_adapter *i2c, struct cx22702_state *state,
+ struct dvb_frontend_parameters *p)
{
u8 val;
- switch(p->bandwidth) {
- case BANDWIDTH_6_MHZ:
- cx22702_writereg(i2c, 0x0C, cx22702_readreg(i2c, 0x0C) | 0x20 );
- break;
- case BANDWIDTH_7_MHZ:
- cx22702_writereg(i2c, 0x0C, cx22702_readreg(i2c, 0x0C) | 0x10 );
- break;
- case BANDWIDTH_8_MHZ:
- cx22702_writereg(i2c, 0x0C, cx22702_readreg(i2c, 0x0C) &0xcf );
- break;
- default:
- dprintk ("%s: invalid bandwidth\n",__FUNCTION__);
- return -EINVAL;
+ /* set PLL */
+ switch(state->pll_type) {
+ case PLLTYPE_DTT7592:
+ case PLLTYPE_DTT7595:
+ pll_dtt759x_set_tv_freq (i2c, state, p->frequency, p->u.ofdm.bandwidth);
+ break;
+
+ case PLLTYPE_DTT7579:
+ pll_dtt7579_set_tv_freq (i2c, state, p->frequency, p->u.ofdm.bandwidth);
+ break;
+ }
+
+ /* set inversion */
+ cx22702_set_inversion (i2c, state, p->inversion);
+
+ /* set bandwidth */
+ switch(p->u.ofdm.bandwidth) {
+ case BANDWIDTH_6_MHZ:
+ cx22702_writereg(i2c, state->demod_addr, 0x0C, (cx22702_readreg(i2c, state->demod_addr, 0x0C) & 0xcf) | 0x20 );
+ break;
+ case BANDWIDTH_7_MHZ:
+ cx22702_writereg(i2c, state->demod_addr, 0x0C, (cx22702_readreg(i2c, state->demod_addr, 0x0C) & 0xcf) | 0x10 );
+ break;
+ case BANDWIDTH_8_MHZ:
+ cx22702_writereg(i2c, state->demod_addr, 0x0C, cx22702_readreg(i2c, state->demod_addr, 0x0C) &0xcf );
+ break;
+ default:
+ dprintk ("%s: invalid bandwidth\n",__FUNCTION__);
+ return -EINVAL;
}
-#if 0
- /* try an do as much configuration automatically as possible */
- if( (p->bandwidth==BANDWIDTH_AUTO) ||
- (p->hierarchy_information==HIERARCHY_AUTO) ||
- (p->constellation==QAM_AUTO) ||
- (p->code_rate_HP==FEC_AUTO) ||
- (p->code_rate_LP==FEC_AUTO) ||
- (p->guard_interval==GUARD_INTERVAL_AUTO) ||
- (p->transmission_mode==TRANSMISSION_MODE_AUTO) ) {
+
+ p->u.ofdm.code_rate_LP = FEC_AUTO; //temp hack as manual not working
+
+ /* use auto configuration? */
+ if((p->u.ofdm.hierarchy_information==HIERARCHY_AUTO) ||
+ (p->u.ofdm.constellation==QAM_AUTO) ||
+ (p->u.ofdm.code_rate_HP==FEC_AUTO) ||
+ (p->u.ofdm.code_rate_LP==FEC_AUTO) ||
+ (p->u.ofdm.guard_interval==GUARD_INTERVAL_AUTO) ||
+ (p->u.ofdm.transmission_mode==TRANSMISSION_MODE_AUTO) ) {
/* TPS Source - use hardware driven values */
- cx22702_writereg(i2c, 0x0B, cx22702_readreg(i2c, 0x0B) & 0xfd );
- cx22702_writereg(i2c, 0x00, 0x01); /* Begin aquisition */
+ cx22702_writereg(i2c, state->demod_addr, 0x06, 0x10);
+ cx22702_writereg(i2c, state->demod_addr, 0x07, 0x9);
+ cx22702_writereg(i2c, state->demod_addr, 0x08, 0xC1);
+ cx22702_writereg(i2c, state->demod_addr, 0x0B, cx22702_readreg(i2c, state->demod_addr, 0x0B) & 0xfc );
+ cx22702_writereg(i2c, state->demod_addr, 0x0C, (cx22702_readreg(i2c, state->demod_addr, 0x0C) & 0xBF) | 0x40 );
+ cx22702_writereg(i2c, state->demod_addr, 0x00, 0x01); /* Begin aquisition */
printk("%s: Autodetecting\n",__FUNCTION__);
return 0;
}
-#endif
+ /* manually programmed values */
val=0;
- switch(p->constellation) {
- case QPSK: val &= 0xe7; break;
- case QAM_16: val |= 0x08; break;
- case QAM_64: val |= 0x10; break;
+ switch(p->u.ofdm.constellation) {
+ case QPSK: val = (val&0xe7); break;
+ case QAM_16: val = (val&0xe7)|0x08; break;
+ case QAM_64: val = (val&0xe7)|0x10; break;
default:
dprintk ("%s: invalid constellation\n",__FUNCTION__);
return -EINVAL;
}
- switch(p->hierarchy_information) {
+ switch(p->u.ofdm.hierarchy_information) {
case HIERARCHY_NONE: val = (val&0xf8); break;
case HIERARCHY_1: val = (val&0xf8)|1; break;
case HIERARCHY_2: val = (val&0xf8)|2; break;
@@ -370,10 +407,10 @@
dprintk ("%s: invalid hierarchy\n",__FUNCTION__);
return -EINVAL;
}
- cx22702_writereg (i2c, 0x06, val);
+ cx22702_writereg (i2c, state->demod_addr, 0x06, val);
val=0;
- switch(p->code_rate_HP) {
+ switch(p->u.ofdm.code_rate_HP) {
case FEC_NONE:
case FEC_1_2: val = (val&0xc7); break;
case FEC_2_3: val = (val&0xc7)|0x08; break;
@@ -384,9 +421,7 @@
dprintk ("%s: invalid code_rate_HP\n",__FUNCTION__);
return -EINVAL;
}
- /* dvbtune fails to set LP correctly, default to HP */
- /* switch(p->code_rate_LP) { */
- switch(p->code_rate_HP) {
+ switch(p->u.ofdm.code_rate_LP) {
case FEC_NONE:
case FEC_1_2: val = (val&0xf8); break;
case FEC_2_3: val = (val&0xf8)|1; break;
@@ -397,10 +432,10 @@
dprintk ("%s: invalid code_rate_LP\n",__FUNCTION__);
return -EINVAL;
}
- cx22702_writereg (i2c, 0x07, val);
+ cx22702_writereg (i2c, state->demod_addr, 0x07, val);
val=0;
- switch(p->guard_interval) {
+ switch(p->u.ofdm.guard_interval) {
case GUARD_INTERVAL_1_32: val = (val&0xf3); break;
case GUARD_INTERVAL_1_16: val = (val&0xf3)|0x04; break;
case GUARD_INTERVAL_1_8: val = (val&0xf3)|0x08; break;
@@ -409,35 +444,34 @@
dprintk ("%s: invalid guard_interval\n",__FUNCTION__);
return -EINVAL;
}
- switch(p->transmission_mode) {
+ switch(p->u.ofdm.transmission_mode) {
case TRANSMISSION_MODE_2K: val = (val&0xfc); break;
case TRANSMISSION_MODE_8K: val = (val&0xfc)|1; break;
default:
dprintk ("%s: invalid transmission_mode\n",__FUNCTION__);
return -EINVAL;
}
- cx22702_writereg (i2c, 0x08, val);
-
- /* Force TPS Source - use user given values */
- cx22702_writereg(i2c, 0x0B, cx22702_readreg(i2c, 0x0B) | 0x02 );
+ cx22702_writereg (i2c, state->demod_addr, 0x08, val);
+ cx22702_writereg(i2c, state->demod_addr, 0x0B, (cx22702_readreg(i2c, state->demod_addr, 0x0B) & 0xfc) | 0x02 );
+ cx22702_writereg(i2c, state->demod_addr, 0x0C, (cx22702_readreg(i2c, state->demod_addr, 0x0C) & 0xBF) | 0x40 );
/* Begin channel aquisition */
- cx22702_writereg(i2c, 0x00, 0x01);
+ cx22702_writereg(i2c, state->demod_addr, 0x00, 0x01);
return 0;
}
/* Retrieve the demod settings */
-static int cx22702_get_tps (struct i2c_adapter *i2c,
- struct dvb_ofdm_parameters *p)
+static int cx22702_get_tps (struct i2c_adapter *i2c, struct cx22702_state *state,
+ struct dvb_ofdm_parameters *p)
{
u8 val;
/* Make sure the TPS regs are valid */
- if (!(cx22702_readreg(i2c, 0x0A) & 0x20))
+ if (!(cx22702_readreg(i2c, state->demod_addr, 0x0A) & 0x20))
return -EAGAIN;
- val = cx22702_readreg (i2c, 0x01);
+ val = cx22702_readreg (i2c, state->demod_addr, 0x01);
switch( (val&0x18)>>3) {
case 0: p->constellation = QPSK; break;
case 1: p->constellation = QAM_16; break;
@@ -451,7 +485,7 @@
}
- val = cx22702_readreg (i2c, 0x02);
+ val = cx22702_readreg (i2c, state->demod_addr, 0x02);
switch( (val&0x38)>>3 ) {
case 0: p->code_rate_HP = FEC_1_2; break;
case 1: p->code_rate_HP = FEC_2_3; break;
@@ -468,14 +502,14 @@
}
- val = cx22702_readreg (i2c, 0x03);
+ val = cx22702_readreg (i2c, state->demod_addr, 0x03);
switch( (val&0x0c)>>2 ) {
case 0: p->guard_interval = GUARD_INTERVAL_1_32; break;
case 1: p->guard_interval = GUARD_INTERVAL_1_16; break;
case 2: p->guard_interval = GUARD_INTERVAL_1_8; break;
case 3: p->guard_interval = GUARD_INTERVAL_1_4; break;
}
- switch( val&0xfc ) {
+ switch( val&0x03 ) {
case 0: p->transmission_mode = TRANSMISSION_MODE_2K; break;
case 1: p->transmission_mode = TRANSMISSION_MODE_8K; break;
}
@@ -489,6 +523,7 @@
struct i2c_adapter *i2c = state->i2c;
u8 reg0A;
u8 reg23;
+ u8 ucblocks;
switch (cmd) {
case FE_GET_INFO:
@@ -501,11 +536,11 @@
*status = 0;
- reg0A = cx22702_readreg (i2c, 0x0A);
- reg23 = cx22702_readreg (i2c, 0x23);
+ reg0A = cx22702_readreg (i2c, state->demod_addr, 0x0A);
+ reg23 = cx22702_readreg (i2c, state->demod_addr, 0x23);
- dprintk ("%s: status demod=0x%02x agc=0x%02x pll=0x%02x\n"
- ,__FUNCTION__,reg0A,reg23,pll_readreg(i2c,0xc2));
+ dprintk ("%s: status demod=0x%02x agc=0x%02x\n"
+ ,__FUNCTION__,reg0A,reg23);
if(reg0A & 0x10) {
*status |= FE_HAS_LOCK;
@@ -524,20 +559,20 @@
}
case FE_READ_BER:
- if(cx22702_readreg (i2c, 0xE4) & 0x02) {
+ if(cx22702_readreg (i2c, state->demod_addr, 0xE4) & 0x02) {
/* Realtime statistics */
- *((u32*) arg) = (cx22702_readreg (i2c, 0xDE) & 0x7F) << 7
- | (cx22702_readreg (i2c, 0xDF)&0x7F);
+ *((u32*) arg) = (cx22702_readreg (i2c, state->demod_addr, 0xDE) & 0x7F) << 7
+ | (cx22702_readreg (i2c, state->demod_addr, 0xDF)&0x7F);
} else {
/* Averagtine statistics */
- *((u32*) arg) = (cx22702_readreg (i2c, 0xDE) & 0x7F) << 7
- | cx22702_readreg (i2c, 0xDF);
+ *((u32*) arg) = (cx22702_readreg (i2c, state->demod_addr, 0xDE) & 0x7F) << 7
+ | cx22702_readreg (i2c, state->demod_addr, 0xDF);
}
break;
case FE_READ_SIGNAL_STRENGTH:
{
- u16 ss = cx22702_readreg (i2c, 0x23);
+ u16 ss = cx22702_readreg (i2c, state->demod_addr, 0x23);
*((u16*) arg) = ss;
break;
}
@@ -547,14 +582,14 @@
case FE_READ_SNR:
{
u16 rs_ber=0;
- if(cx22702_readreg (i2c, 0xE4) & 0x02) {
+ if(cx22702_readreg (i2c, state->demod_addr, 0xE4) & 0x02) {
/* Realtime statistics */
- rs_ber = (cx22702_readreg (i2c, 0xDE) & 0x7F) << 7
- | (cx22702_readreg (i2c, 0xDF)& 0x7F);
+ rs_ber = (cx22702_readreg (i2c, state->demod_addr, 0xDE) & 0x7F) << 7
+ | (cx22702_readreg (i2c, state->demod_addr, 0xDF)& 0x7F);
} else {
/* Averagine statistics */
- rs_ber = (cx22702_readreg (i2c, 0xDE) & 0x7F) << 8
- | cx22702_readreg (i2c, 0xDF);
+ rs_ber = (cx22702_readreg (i2c, state->demod_addr, 0xDE) & 0x7F) << 8
+ | cx22702_readreg (i2c, state->demod_addr, 0xDF);
}
*((u16*) arg) = ~rs_ber;
break;
@@ -562,8 +597,10 @@
case FE_READ_UNCORRECTED_BLOCKS:
/* RS Uncorrectable Packet Count then reset */
- *((u32*) arg) = cx22702_readreg (i2c, 0xE3);
- cx22702_writereg (i2c, 0xE3, 0x00);
+ ucblocks = cx22702_readreg (i2c, state->demod_addr, 0xE3);
+ if (state->prevUCBlocks < ucblocks) *((u32*) arg) = (ucblocks - state->prevUCBlocks);
+ else *((u32*) arg) = state->prevUCBlocks - ucblocks;
+ state->prevUCBlocks = ucblocks;
break;
case FE_SET_FRONTEND:
@@ -571,41 +608,24 @@
struct dvb_frontend_parameters *p = arg;
int ret;
- /* Disable aquisition */
- cx22702_writereg (i2c, 0x00, 0x00);
-
- switch(state->pll_type) {
- case PLLTYPE_DTT7592:
- case PLLTYPE_DTT7595:
- pll_dtt759x_set_tv_freq (i2c, p->frequency);
- break;
-
- case PLLTYPE_DTT7579:
- pll_dtt7579_set_tv_freq (i2c, p->frequency);
- break;
- }
- cx22702_set_inversion (i2c, p->inversion);
- if((ret=cx22702_set_tps (i2c, &p->u.ofdm))<0) {
+ if((ret=cx22702_set_tps (i2c, state, p))<0) {
dprintk ("%s: set_tps failed ret=%d\n",__FUNCTION__,ret);
return ret;
}
-
- /* Enable aquisition */
- cx22702_writereg (i2c, 0x00, 0x01);
break;
}
case FE_GET_FRONTEND:
{
struct dvb_frontend_parameters *p = arg;
- u8 reg0C = cx22702_readreg (i2c, 0x0C);
+ u8 reg0C = cx22702_readreg (i2c, state->demod_addr, 0x0C);
p->inversion = reg0C & 0x1 ? INVERSION_ON : INVERSION_OFF;
- return cx22702_get_tps (i2c, &p->u.ofdm);
+ return cx22702_get_tps (i2c, state, &p->u.ofdm);
}
case FE_INIT:
- return cx22702_init (i2c);
+ return cx22702_init (i2c, state);
default:
return -EOPNOTSUPP;
@@ -616,7 +636,7 @@
/* Validate the eeprom contents, make sure content look ok.
Get the eeprom data. */
-static int cx22702_validate_eeprom(struct i2c_adapter *i2c, int* minfreq, int* pll_type)
+static int cx22702_validate_eeprom(struct i2c_adapter *i2c, int* minfreq, int* pll_type, int* pll_addr, int* demod_addr)
{
u8 b0 [] = { 0 };
u8 b1 [128];
@@ -669,12 +689,12 @@
tuner = b1[0x2d];
switch(tuner) {
case 0x4B:
- dprintk ("%s: Tuner Thompson DTT 7595\n",__FUNCTION__);
+ dprintk ("%s: Tuner Thomson DTT 7595\n",__FUNCTION__);
*minfreq = 177000000;
*pll_type = PLLTYPE_DTT7595;
break;
case 0x4C:
- dprintk ("%s: Tuner Thompson DTT 7592\n",__FUNCTION__);
+ dprintk ("%s: Tuner Thomson DTT 7592\n",__FUNCTION__);
*minfreq = 474000000;
*pll_type = PLLTYPE_DTT7592;
break;
@@ -682,20 +702,21 @@
printk ("%s: Unknown tuner 0x%02x not supported\n",__FUNCTION__,tuner);
return -ENODEV;
}
-
+ *pll_addr = 0x61;
+ *demod_addr = 0x43;
return 0;
}
/* Validate the demod, make sure we understand the hardware */
-static int cx22702_validate_demod(struct i2c_adapter *i2c)
+static int cx22702_validate_demod(struct i2c_adapter *i2c, int demod_addr)
{
u8 b0 [] = { 0x1f };
u8 b1 [] = { 0 };
struct i2c_msg msg [] = {
- { .addr = I2C_DEMOD_SLAVE_ADDR, .flags = 0, .buf = b0, .len = 1 },
- { .addr = I2C_DEMOD_SLAVE_ADDR, .flags = I2C_M_RD, .buf = b1, .len = 1 }
+ { .addr = demod_addr, .flags = 0, .buf = b0, .len = 1 },
+ { .addr = demod_addr, .flags = I2C_M_RD, .buf = b1, .len = 1 }
};
if (i2c_transfer(i2c, msg, 2) != 2) {
@@ -712,11 +733,11 @@
}
/* Validate the tuner PLL, make sure we understand the hardware */
-static int cx22702_validate_pll(struct i2c_adapter *i2c)
+static int cx22702_validate_pll(struct i2c_adapter *i2c, int pll_addr, int demod_addr)
{
int result=0;
- if( (result=pll_readreg(i2c,0xc2)) < 0)
+ if( (result=pll_readreg(i2c,pll_addr,demod_addr,0xc2)) < 0)
return result;
if( (result >= 0) && (result&0x30) )
@@ -733,26 +754,32 @@
int ret;
int minfreq;
int pll_type;
+ int pll_addr;
+ int demod_addr;
dprintk("Trying to attach to adapter 0x%x:%s.\n",
adapter->id, adapter->name);
- if (!strcmp(adapter->name, "Conexant DVB-t")) {
- printk("cx22702: Detected Conexant DVB-t card - PLL Thomson DTT7579\n");
+ if (!strcmp(adapter->name, "Conexant DVB-T reference design")) {
+ printk("cx22702: Detected Conexant DVB-T card - PLL Thomson DTT7579\n");
pll_type = PLLTYPE_DTT7579;
- minfreq = 474000000; // guess
- } else {
- // FIXME
- ret=cx22702_validate_eeprom(adapter, &minfreq, &pll_type);
+ pll_addr = 0x60;
+ demod_addr = 0x43;
+ minfreq = 177000000; // guess
+ } else if (!strcmp(adapter->name, "Hauppauge Nova-T DVB-T")) {
+ printk("cx22702: Detected Hauppauge Nova-T DVB-T - PLL Thomson DTT759x\n");
+ ret=cx22702_validate_eeprom(adapter, &minfreq, &pll_type, &pll_addr, &demod_addr);
if(ret < 0)
return ret;
+ } else {
+ return -ENODEV;
}
- ret=cx22702_validate_demod(adapter);
+ ret=cx22702_validate_demod(adapter, demod_addr);
if(ret < 0)
return ret;
- ret=cx22702_validate_pll(adapter);
+ ret=cx22702_validate_pll(adapter, pll_addr, demod_addr);
if(ret < 0)
return ret;
@@ -764,6 +791,8 @@
memcpy(&state->cx22702_info, &cx22702_info, sizeof(struct dvb_frontend_info));
state->cx22702_info.frequency_min = minfreq;
state->pll_type = pll_type;
+ state->pll_addr = pll_addr;
+ state->demod_addr = demod_addr;
if ( !(client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL)) ) {
kfree(state);
@@ -772,10 +801,11 @@
memcpy(client, &client_template, sizeof(struct i2c_client));
client->adapter = adapter;
- client->addr = I2C_DEMOD_SLAVE_ADDR;
+ client->addr = state->demod_addr;
i2c_set_clientdata(client, state);
-
+
if ((ret = i2c_attach_client(client))) {
+ printk("cx22702: attach failed %i\n", ret);
kfree(client);
kfree(state);
return ret;
@@ -855,7 +885,7 @@
MODULE_PARM(debug,"i");
MODULE_PARM_DESC(debug, "Enable verbose debug messages");
-MODULE_DESCRIPTION("CX22702 / Thompson DTT 759x / Thompson DTT 7579 PLL DVB Frontend driver");
+MODULE_DESCRIPTION("CX22702 / Thomson DTT 759x / Thomson DTT 7579 PLL DVB Frontend driver");
MODULE_AUTHOR("Steven Toth");
MODULE_LICENSE("GPL");
Home |
Main Index |
Thread Index