diff options
| author | Michael Krufky <devnull@localhost> | 2005-07-30 16:21:58 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-07-30 16:21:58 +0000 |
| commit | 4b944966b29073549f919b4378bb34cf2c0363ac (patch) | |
| tree | c34afa04ba8b86ef7c789ad0e3b086beb23902e5 /linux/drivers/media/video/cx88 | |
| parent | 6ce23c6f6d76f1adde155c4459feb0a445018520 (diff) | |
| download | mediapointer-dvb-s2-4b944966b29073549f919b4378bb34cf2c0363ac.tar.gz mediapointer-dvb-s2-4b944966b29073549f919b4378bb34cf2c0363ac.tar.bz2 | |
Fix cvs compile for 2.6.13
Diffstat (limited to 'linux/drivers/media/video/cx88')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-dvb.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c index 91a9afefa..7d7c82622 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.56 2005/07/27 19:25:32 mkrufky Exp $ + * $Id: cx88-dvb.c,v 1.57 2005/07/30 16:21:58 mkrufky Exp $ * * device driver for Conexant 2388x based TV cards * MPEG Transport Stream (DVB) routines @@ -216,8 +216,9 @@ static struct or51132_config pchdtv_hd3000 = { #endif #ifdef HAVE_LGDT330X +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) static int lgdt330x_pll_set(struct dvb_frontend* fe, - struct dvb_frontend_parameters* params) + struct dvb_frontend_parameters* params) { /* FIXME make this routine use the tuner-simple code. * It could probably be shared with a number of ATSC @@ -245,6 +246,18 @@ static int lgdt330x_pll_set(struct dvb_frontend* fe, } return 0; } +#else +static int lgdt330x_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; +} +#endif static int lgdt330x_pll_rf_set(struct dvb_frontend* fe, int index) { @@ -271,6 +284,7 @@ static int lgdt330x_set_ts_param(struct dvb_frontend* fe, int is_punctured) static struct lgdt330x_config fusionhdtv_3_gold = { .demod_address = 0x0e, +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) .chip = LGDT3302, .serial_mpeg = 1, .pll_set = lgdt330x_pll_set, @@ -282,6 +296,7 @@ static struct lgdt330x_config fusionhdtv_5_gold = { .demod_address = 0x0e, .chip = LGDT3303, .serial_mpeg = 1, +#endif .pll_set = lgdt330x_pll_set, .set_ts_params = lgdt330x_set_ts_param, }; @@ -370,6 +385,7 @@ static int dvb_register(struct cx8802_dev *dev) &dev->core->i2c_adap); } break; +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) case CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD: dev->ts_gen_cntrl = 0x08; { @@ -387,6 +403,7 @@ static int dvb_register(struct cx8802_dev *dev) } break; #endif +#endif default: printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n", dev->core->name); |