diff options
Diffstat (limited to 'linux/drivers/media/video/cx88')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-core.c | 19 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-mpeg.c | 10 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 34 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 6 |
4 files changed, 49 insertions, 20 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c index 5673286c2..36169c106 100644 --- a/linux/drivers/media/video/cx88/cx88-core.c +++ b/linux/drivers/media/video/cx88/cx88-core.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-core.c,v 1.14 2004/10/13 10:39:00 kraxel Exp $ + * $Id: cx88-core.c,v 1.15 2004/10/25 11:26:36 kraxel Exp $ * * device driver for Conexant 2388x based TV cards * driver core @@ -50,13 +50,18 @@ module_param(latency,int,0444); MODULE_PARM_DESC(latency,"pci latency timer"); static unsigned int tuner[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; -static int tuner_num; -module_param_array(tuner,int,tuner_num,0444); -MODULE_PARM_DESC(tuner,"tuner type"); +static unsigned int card[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; -static unsigned int card[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; -static int card_num; -module_param_array(card,int,card_num,0444); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) +static int dummy; +module_param_array(tuner, int, dummy, 0444); +module_param_array(card, int, dummy, 0444); +#else +module_param_array(tuner, int, NULL, 0444); +module_param_array(card, int, NULL, 0444); +#endif + +MODULE_PARM_DESC(tuner,"tuner type"); MODULE_PARM_DESC(card,"card type"); static unsigned int nicam = 0; diff --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c index 7b45b5d8a..d2e9767e8 100644 --- a/linux/drivers/media/video/cx88/cx88-mpeg.c +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-mpeg.c,v 1.13 2004/10/19 16:02:04 kraxel Exp $ + * $Id: cx88-mpeg.c,v 1.14 2004/10/25 11:26:36 kraxel Exp $ * * Support for the mpeg transport stream transfers * PCI function #2 of the cx2388x. @@ -412,7 +412,11 @@ int cx8802_suspend_common(struct pci_dev *pci_dev, u32 state) cx88_shutdown(dev->core); #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) pci_save_state(pci_dev, dev->state.pci_cfg); +#else + pci_save_state(pci_dev); +#endif if (0 != pci_set_power_state(pci_dev, state)) { pci_disable_device(pci_dev); dev->state.disabled = 1; @@ -430,7 +434,11 @@ int cx8802_resume_common(struct pci_dev *pci_dev) dev->state.disabled = 0; } pci_set_power_state(pci_dev, 0); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) pci_restore_state(pci_dev, dev->state.pci_cfg); +#else + pci_restore_state(pci_dev); +#endif #if 1 /* FIXME: re-initialize hardware */ diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index c1ee8baa4..933f7739d 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-video.c,v 1.43 2004/10/19 16:02:05 kraxel Exp $ + * $Id: cx88-video.c,v 1.44 2004/10/25 11:26:36 kraxel Exp $ * * device driver for Conexant 2388x based TV cards * video4linux video interface @@ -41,18 +41,22 @@ MODULE_LICENSE("GPL"); /* ------------------------------------------------------------------ */ static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; -static unsigned int video_nr_num; -module_param_array(video_nr,int,video_nr_num,0444); -MODULE_PARM_DESC(video_nr,"video device numbers"); +static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; +static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; -static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; -static unsigned int vbi_nr_num; -module_param_array(vbi_nr,int,vbi_nr_num,0444); -MODULE_PARM_DESC(vbi_nr,"vbi device numbers"); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) +static unsigned int dummy; +module_param_array(video_nr, int, dummy, 0444); +module_param_array(vbi_nr, int, dummy, 0444); +module_param_array(radio_nr, int, dummy, 0444); +#else +module_param_array(video_nr, int, NULL, 0444); +module_param_array(vbi_nr, int, NULL, 0444); +module_param_array(radio_nr, int, NULL, 0444); +#endif -static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET }; -static unsigned int radio_nr_num; -module_param_array(radio_nr,int,radio_nr_num,0444); +MODULE_PARM_DESC(video_nr,"video device numbers"); +MODULE_PARM_DESC(vbi_nr,"vbi device numbers"); MODULE_PARM_DESC(radio_nr,"radio device numbers"); static unsigned int video_debug = 0; @@ -2186,7 +2190,11 @@ static int cx8800_suspend(struct pci_dev *pci_dev, u32 state) cx88_shutdown(dev->core); #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) pci_save_state(pci_dev, dev->state.pci_cfg); +#else + pci_save_state(pci_dev); +#endif if (0 != pci_set_power_state(pci_dev, state)) { pci_disable_device(pci_dev); dev->state.disabled = 1; @@ -2204,7 +2212,11 @@ static int cx8800_resume(struct pci_dev *pci_dev) dev->state.disabled = 0; } pci_set_power_state(pci_dev, 0); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) pci_restore_state(pci_dev, dev->state.pci_cfg); +#else + pci_restore_state(pci_dev); +#endif #if 1 /* FIXME: re-initialize hardware */ diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index f9412befd..8dcb768c8 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -1,5 +1,5 @@ /* - * $Id: cx88.h,v 1.38 2004/10/19 16:02:05 kraxel Exp $ + * $Id: cx88.h,v 1.39 2004/10/25 11:26:36 kraxel Exp $ * * v4l2 device driver for cx2388x based TV cards * @@ -291,7 +291,9 @@ struct cx8800_fh { }; struct cx8800_suspend_state { +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) u32 pci_cfg[64 / sizeof(u32)]; +#endif int disabled; }; @@ -348,7 +350,9 @@ struct cx8802_fh { }; struct cx8802_suspend_state { +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) u32 pci_cfg[64 / sizeof(u32)]; +#endif int disabled; }; |