diff options
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-dvb.c | 20 | ||||
| -rw-r--r-- | v4l/ChangeLog | 12 |
2 files changed, 30 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c index 44e063516..7eb510503 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.47 2005/07/20 05:20:37 mkrufky Exp $ + * $Id: cx88-dvb.c,v 1.48 2005/07/20 05:33:33 mkrufky Exp $ * * device driver for Conexant 2388x based TV cards * MPEG Transport Stream (DVB) routines @@ -232,6 +232,19 @@ static int lgdt3302_pll_set(struct dvb_frontend* fe, return 0; } +static int lgdt3302_pll_rf_set(struct dvb_frontend* fe, int index) +{ + struct cx8802_dev *dev= fe->dvb->priv; + struct cx88_core *core = dev->core; + + dprintk(1, "%s: index = %d\n", __FUNCTION__, index); + if (index == 0) + cx_clear(MO_GP0_IO, 8); + else + cx_set(MO_GP0_IO, 8); + return 0; +} + static int lgdt3302_set_ts_param(struct dvb_frontend* fe, int is_punctured) { struct cx8802_dev *dev= fe->dvb->priv; @@ -305,8 +318,11 @@ static int dvb_register(struct cx8802_dev *dev) cx_clear(MO_GP0_IO, 1); mdelay(100); - cx_set(MO_GP0_IO, 9); // ANT connector too FIXME + cx_set(MO_GP0_IO, 1); mdelay(200); + + /* Select RF connector callback */ + fusionhdtv_3_gold.pll_rf_set = lgdt3302_pll_rf_set; dev->core->pll_addr = 0x61; dev->core->pll_desc = &dvb_pll_microtune_4042; dev->dvb.frontend = lgdt3302_attach(&fusionhdtv_3_gold, diff --git a/v4l/ChangeLog b/v4l/ChangeLog index b54626f1a..c6d9c218e 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,5 +1,17 @@ 2005-07-20 05:18 mkrufky * cx88-dvb.c: + - Select the RF input connector based upon the type of + demodulation selected. ANT RF connector is selected for + 8-VSB and CABLE RF connector is selected for QAM64/QAM256. + This only affects the cards that use the Microtune 4042 tuner. + - This is patch #2 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-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 |