[linux-dvb] DViCO FusionHDTV3&5 lgdt330x support plans
Mac Michaels
wmichaels1 at earthlink.net
Tue Jul 19 22:13:33 CEST 2005
On Tuesday 19 July 2005 02:05 pm, Michael Krufky wrote:
> For now, it would be best if you can send in separate
> patches for each respective tree.... please have
> lgdt330*.* and dvb-pll.* patches prepared together, and
> all other video4linux stuff in a separate patch. I have
> access to both cvs trees, and I can handle proper
> application of these patches for you.
I am not trying to complicate the patch process.
Please tell me how my patches are defective.
> I received my FusionHDTV5 Gold card in the mail today...
> haven't yet had a chance to play with it. If you can
> re-send your patch against newer code, it will lay down
> some framework for me to begin testing with both boards.
Here is patch for item 1 against the 2005-07-14 CVS:
Index: cx88-dvb.c
===================================================================
RCS file: /cvs/video4linux/video4linux/cx88-dvb.c,v
retrieving revision 1.42
diff -u -b -B -u -r1.42 cx88-dvb.c
--- cx88-dvb.c 12 Jul 2005 15:44:55 -0000 1.42
+++ cx88-dvb.c 19 Jul 2005 20:01:11 -0000
@@ -209,6 +209,18 @@
#endif
#if CONFIG_DVB_LGDT3302
+static int lgdt3302_pll_set(struct dvb_frontend* fe,
+ struct dvb_frontend_parameters* params,
+ u8* pllbuf)
+{
+ struct cx8802_dev *dev= fe->dvb->priv;
+
+ pllbuf[0] = dev->core->pll_addr;
+ dvb_pll_configure(dev->core->pll_desc, &pllbuf[1],
+ params->frequency, 0);
+ return 0;
+}
+
static int lgdt3302_set_ts_param(struct dvb_frontend* fe, int is_punctured)
{
struct cx8802_dev *dev= fe->dvb->priv;
@@ -219,17 +231,9 @@
return 0;
}
-static struct lgdt3302_config fusionhdtv_3_gold_q = {
+static struct lgdt3302_config fusionhdtv_3_gold = {
.demod_address = 0x0e,
- .pll_address = 0x61,
- .pll_desc = &dvb_pll_microtune_4042,
- .set_ts_params = lgdt3302_set_ts_param,
-};
-
-static struct lgdt3302_config fusionhdtv_3_gold_t = {
- .demod_address = 0x0e,
- .pll_address = 0x61,
- .pll_desc = &dvb_pll_thomson_dtt7611,
+ .pll_set = lgdt3302_pll_set,
.set_ts_params = lgdt3302_set_ts_param,
};
#endif
@@ -292,7 +296,9 @@
mdelay(100);
cx_set(MO_GP0_IO, 9); // ANT connector too FIXME
mdelay(200);
- dev->dvb.frontend = lgdt3302_attach(&fusionhdtv_3_gold_q,
+ dev->core->pll_addr = 0x61;
+ dev->core->pll_desc = &dvb_pll_microtune_4042;
+ dev->dvb.frontend = lgdt3302_attach(&fusionhdtv_3_gold,
&dev->core->i2c_adap);
}
break;
@@ -306,7 +313,9 @@
mdelay(100);
cx_set(MO_GP0_IO, 9); /* ANT connector too FIXME */
mdelay(200);
- dev->dvb.frontend = lgdt3302_attach(&fusionhdtv_3_gold_t,
+ dev->core->pll_addr = 0x61;
+ dev->core->pll_desc = &dvb_pll_thomson_dtt7611;
+ dev->dvb.frontend = lgdt3302_attach(&fusionhdtv_3_gold,
&dev->core->i2c_adap);
}
break;
Index: lgdt3302.c
===================================================================
RCS file: /cvs/video4linux/video4linux/Attic/lgdt3302.c,v
retrieving revision 1.18
diff -u -b -B -u -r1.18 lgdt3302.c
--- lgdt3302.c 14 Jul 2005 01:34:46 -0000 1.18
+++ lgdt3302.c 19 Jul 2005 20:01:11 -0000
@@ -76,19 +76,6 @@
u8 *buf, /* data bytes to send */
int len /* number of bytes to send */ )
{
- if (addr == state->config->pll_address) {
- struct i2c_msg msg =
- { .addr = addr, .flags = 0, .buf = buf, .len = len };
- int err;
-
- if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) {
- printk(KERN_WARNING "lgdt3302: %s error (addr %02x <- %02x, err == %i)\n", __FUNCTION__, addr, buf[0], err);
- if (err < 0)
- return err;
- else
- return -EREMOTEIO;
- }
- } else {
u8 tmp[] = { buf[0], buf[1] };
struct i2c_msg msg =
{ .addr = addr, .flags = 0, .buf = tmp, .len = 2 };
@@ -106,9 +93,9 @@
}
tmp[0]++;
}
- }
return 0;
}
+
static int i2c_readbytes (struct lgdt3302_state* state,
u8 addr, /* demod_address or pll_address */
u8 *buf, /* holds data bytes read */
@@ -209,7 +196,6 @@
static int lgdt3302_set_parameters(struct dvb_frontend* fe,
struct dvb_frontend_parameters *param)
{
- u8 buf[4];
struct lgdt3302_state* state =
(struct lgdt3302_state*) fe->demodulator_priv;
@@ -292,16 +278,30 @@
/* Change only if we are actually changing the channel */
if (state->current_frequency != param->frequency) {
- dvb_pll_configure(state->config->pll_desc, buf,
- param->frequency, 0);
- dprintk("%s: tuner bytes: 0x%02x 0x%02x "
- "0x%02x 0x%02x\n", __FUNCTION__, buf[0],buf[1],buf[2],buf[3]);
- i2c_writebytes(state, state->config->pll_address ,buf, 4);
+ u8 buf[5];
- /* Check the status of the tuner pll */
- i2c_readbytes(state, state->config->pll_address, buf, 1);
- dprintk("%s: tuner status byte = 0x%02x\n", __FUNCTION__, buf[0]);
+ /* This must be done before the initialized msg is declared */
+ state->config->pll_set(fe, param, buf);
+ struct i2c_msg msg =
+ { .addr = buf[0], .flags = 0, .buf = &buf[1], .len = 4 };
+ int err;
+
+ dprintk("%s: tuner at 0x%02x bytes: 0x%02x 0x%02x "
+ "0x%02x 0x%02x\n", __FUNCTION__,
+ buf[0],buf[1],buf[2],buf[3],buf[4]);
+ if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) {
+ printk(KERN_WARNING "lgdt3302: %s error (addr %02x <- %02x, err = %i)\n", __FUNCTION__, buf[0], buf[1], err);
+ if (err < 0)
+ return err;
+ else
+ return -EREMOTEIO;
+ }
+#if 0
+ /* Check the status of the tuner pll */
+ i2c_readbytes(state, buf[0], &buf[1], 1);
+ dprintk("%s: tuner status byte = 0x%02x\n", __FUNCTION__, buf[1]);
+#endif
/* Update current frequency */
state->current_frequency = param->frequency;
}
@@ -323,13 +323,6 @@
u8 buf[3];
*status = 0; /* Reset status result */
-
- /* Check the status of the tuner pll */
- i2c_readbytes(state, state->config->pll_address, buf, 1);
- dprintk("%s: tuner status byte = 0x%02x\n", __FUNCTION__, buf[0]);
- if ((buf[0] & 0xc0) != 0x40)
- return 0; /* Tuner PLL not locked or not powered on */
-
/*
* You must set the Mask bits to 1 in the IRQ_MASK in order
* to see that status bit in the IRQ_STATUS register.
Index: lgdt3302.h
===================================================================
RCS file: /cvs/video4linux/video4linux/Attic/lgdt3302.h,v
retrieving revision 1.4
diff -u -b -B -u -r1.4 lgdt3302.h
--- lgdt3302.h 28 Jun 2005 12:34:14 -0000 1.4
+++ lgdt3302.h 19 Jul 2005 20:01:11 -0000
@@ -30,8 +30,9 @@
{
/* The demodulator's i2c address */
u8 demod_address;
- u8 pll_address;
- struct dvb_pll_desc *pll_desc;
+
+ /* PLL interface */
+ int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, u8* pll_address);
/* Need to set device param for start_dma */
int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured);
More information about the linux-dvb
mailing list