diff options
Diffstat (limited to 'v4l_experimental/v3tv/v3tv.c')
| -rw-r--r-- | v4l_experimental/v3tv/v3tv.c | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/v4l_experimental/v3tv/v3tv.c b/v4l_experimental/v3tv/v3tv.c index 6f105cb3b..214034573 100644 --- a/v4l_experimental/v3tv/v3tv.c +++ b/v4l_experimental/v3tv/v3tv.c @@ -17,14 +17,8 @@ #include <asm/io.h> #include <asm/pgtable.h> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) #include <media/tuner.h> #include <media/audiochip.h> -#else -#include "/usr/src/linux/drivers/media/video/i2c-compat.h" -#include "/usr/src/linux/drivers/media/video/audiochip.h" -#include "/usr/src/linux/drivers/media/video/tuner.h" -#endif //#ifndef I2C_DRIVERID_VPX3224 //#include "vpx-common.h" @@ -32,9 +26,6 @@ //#include <linux/i2c.h> -//#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) -//#include "../linux/drivers/media/video/i2c-compat.h" -//#endif #define UNSET (-1U) @@ -549,12 +540,8 @@ static inline unsigned long uvirt_to_kva(pgd_t * pgd, unsigned long adr) #endif #endif if (pte_present(pte)) { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) ret = (unsigned long)page_address(pte_page(pte)); -#else - ret = pte_page(pte); -#endif ret |= (adr & (PAGE_SIZE - 1)); } } @@ -601,12 +588,8 @@ inline unsigned long kvirt_to_pa(unsigned long adr) return ret; } -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0) -#include <linux/wrapper.h> -#else #define mem_map_reserve(p) set_bit(PG_reserved, &((p)->flags)) #define mem_map_unreserve(p) clear_bit(PG_reserved, &((p)->flags)) -#endif void inline *rvmalloc(signed long size) { @@ -753,25 +736,17 @@ int v3tv_get_adapter(struct i2c_adapter *adapter) if (debug) printk(KERN_INFO "v3tv: i2c_attach_client releasing adapter: %s\n", adapter->name); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) module_put(voodoo->voodoo_i2c_adapter->owner); -#else - __MOD_DEC_USE_COUNT(voodoo->voodoo_i2c_adapter->owner); -#endif voodoo->voodoo_i2c_adapter = NULL; return 0; } voodoo->voodoo_i2c_adapter = adapter; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) if (!try_module_get(adapter->owner)) { printk("v3tv: Unable to get module %s\n", adapter->owner->name); return -ENODEV; } -#else - __MOD_INC_USE_COUNT(voodoo->voodoo_i2c_adapter->owner); -#endif printk ("v3tv: i2c dummy driver registered: adapter: 0x%p\n", voodoo->voodoo_i2c_adapter); @@ -1402,10 +1377,6 @@ static int do_voodoo_mmap(const char *adr, unsigned long size) * $Id: v3tv.c,v 1.1 2005/12/25 16:23:58 mkrufky Exp $ */ -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0) -#define iminor(inode) minor(inode->i_rdev) -#endif - /* External variables: Data struct */ //extern struct voodoo_data *voodoo; //extern struct video_capture video_standard[]; @@ -2034,11 +2005,7 @@ static int v3tv_radio_open(struct inode *inode, struct file *file) AUDC_SET_RADIO, &voodoo->tuner_type); // up(&voodoo->lock); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) try_module_get(THIS_MODULE); -#else - MOD_INC_USE_COUNT; -#endif printk("v3tv: Radio device opened.\n"); return 0; } @@ -2053,11 +2020,7 @@ static int v3tv_radio_release(struct inode *inode, struct file *file) file->private_data = NULL; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) module_put(THIS_MODULE); -#else - MOD_DEC_USE_COUNT; -#endif printk("v3tv: Radio device closed.\n"); @@ -2182,11 +2145,7 @@ static irqreturn_t v3tv_video_irq(int irq, void *dev_id, struct pt_regs *regs) tempReg |= (1 << 31); v3tv_regwrite(V3REG_intrCtrl, tempReg); } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) return capture_ready; -#else - return; -#endif } void v3tv_set_palette(struct video_picture *picture_settings) |