diff options
| author | Michael Krufky <devnull@localhost> | 2005-07-20 05:20:37 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-07-20 05:20:37 +0000 |
| commit | 57cf6ed6fe6387b0c751cec7fb66fe65bded9034 (patch) | |
| tree | 84750322547e1611d86240a3dd3c988c1fbdab10 | |
| parent | b10b7aec1b2bbb93720b0dce9c018ced37066848 (diff) | |
| download | mediapointer-dvb-s2-57cf6ed6fe6387b0c751cec7fb66fe65bded9034.tar.gz mediapointer-dvb-s2-57cf6ed6fe6387b0c751cec7fb66fe65bded9034.tar.bz2 | |
* cx88-dvb.c:
- Remove the dvb_pll_desc from the frontend and replace with a
pll_set-callback to isolate the tuner programming from the frontend.
- This is patch #1 of a string of patches with counterparts in the
dvb-kernel tree affecting lgdt3302.c and lgdt3302.h
Signed-off-by: Mac Michaels <wmichaels1@earthlink.net>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-dvb.c | 34 | ||||
| -rw-r--r-- | v4l/ChangeLog | 10 |
2 files changed, 31 insertions, 13 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c index 31e991e00..44e063516 100644 --- a/linux/drivers/media/video/cx88/cx88-dvb.c +++ b/linux/drivers/media/video/cx88/cx88-dvb.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-dvb.c,v 1.46 2005/07/15 23:59:43 mchehab Exp $ + * $Id: cx88-dvb.c,v 1.47 2005/07/20 05:20:37 mkrufky Exp $ * * device driver for Conexant 2388x based TV cards * MPEG Transport Stream (DVB) routines @@ -220,6 +220,18 @@ static struct or51132_config pchdtv_hd3000 = { #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; @@ -230,17 +242,9 @@ static int lgdt3302_set_ts_param(struct dvb_frontend* fe, int is_punctured) return 0; } -static struct lgdt3302_config fusionhdtv_3_gold_q = { - .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 = { +static struct lgdt3302_config fusionhdtv_3_gold = { .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 @@ -303,7 +307,9 @@ static int dvb_register(struct cx8802_dev *dev) 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; @@ -317,7 +323,9 @@ static int dvb_register(struct cx8802_dev *dev) 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; diff --git a/v4l/ChangeLog b/v4l/ChangeLog index cdec1f19c..b54626f1a 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,13 @@ +2005-07-20 05:18 mkrufky + * cx88-dvb.c: + - Remove the dvb_pll_desc from the frontend and replace with a + pll_set-callback to isolate the tuner programming from the frontend. + - This is patch #1 of a string of patches with counterparts in the + dvb-kernel tree affecting lgdt3302.c and lgdt3302.h + + Signed-off-by: Mac Michaels <wmichaels1@earthlink.net> + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-07-19 18:18 mkrufky * bttv-cards.c: - Fix Bug 4395: modprobe bttv freezes the computer |