diff options
author | Michael Hunold <devnull@localhost> | 2003-03-20 09:56:57 +0000 |
---|---|---|
committer | Michael Hunold <devnull@localhost> | 2003-03-20 09:56:57 +0000 |
commit | dab9ea33014f096f57a109767f77a48c544bcbb4 (patch) | |
tree | e91686163e24c2de98c5f084487436e33ee408f7 /linux | |
parent | 5797f42d3ed47493db6ec2b904a9e8df10969f90 (diff) | |
download | mediapointer-dvb-s2-dab9ea33014f096f57a109767f77a48c544bcbb4.tar.gz mediapointer-dvb-s2-dab9ea33014f096f57a109767f77a48c544bcbb4.tar.bz2 |
Small changes all over the place:
- sync Kconfig and Makefiles with 2.5.65
- fix various things in saa7146 because of latest v4l changes in 2.5.65
- makelinks: removed the compat module from the 2.5.x build process
- makelinks: removed the linkage of ttusb and bt8xx -- enable this again for
the next patches, when ttusb is more stable and the bt8xx related patches
have been applied by Gerd Knorr
- dvb: removed the compat module from the 2.5.x build process, added #ifdefs
around the inclusion of compat.h. this was necessary because having compat
code in the newest 2.5.x kernel is awkward.
- dvb: move around of dvb_usercopy again. because I removed the compat module
from the 2.5.x build process, dvb_usercopy had to be moved to another file
- dvb: change MOD_*_USE_COUNT to module_get/module_put in various files,
but I'm not sure if I did this right. please review these changes.
- dvb: removed the crc32 code from dvb_demux.c, because it's in compat.c, too.
- dvb: removed some cruft from dvd_i2c.c, which is present in compat.h
- all files: apply small fixes to reflect the new location of some header
files
Diffstat (limited to 'linux')
20 files changed, 136 insertions, 159 deletions
diff --git a/linux/drivers/media/Kconfig b/linux/drivers/media/Kconfig index 0814912c5..b0fcbddea 100644 --- a/linux/drivers/media/Kconfig +++ b/linux/drivers/media/Kconfig @@ -26,13 +26,30 @@ config VIDEO_DEV whenever you want). If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. -source "drivers/media/common/Kconfig" - source "drivers/media/video/Kconfig" source "drivers/media/radio/Kconfig" source "drivers/media/dvb/Kconfig" +source "drivers/media/common/Kconfig" + +config VIDEO_TUNER + tristate + default y if VIDEO_BT848=y || VIDEO_SAA7134=y || VIDEO_MXB=y || VIDEO_DPC=y + default m if VIDEO_BT848=m || VIDEO_SAA7134=m || VIDEO_MXB=m || VIDEO_DPC=m + depends on VIDEO_DEV + +config VIDEO_BUF + tristate + default y if VIDEO_BT848=y || VIDEO_SAA7134=y || VIDEO_SAA7146=y + default m if VIDEO_BT848=m || VIDEO_SAA7134=m || VIDEO_SAA7134=m + depends on VIDEO_DEV + +config VIDEO_BTCX + tristate + default VIDEO_BT848 + depends on VIDEO_DEV + endmenu diff --git a/linux/drivers/media/common/saa7146_vbi.c b/linux/drivers/media/common/saa7146_vbi.c index 41fe0d787..2b273e4d1 100644 --- a/linux/drivers/media/common/saa7146_vbi.c +++ b/linux/drivers/media/common/saa7146_vbi.c @@ -262,7 +262,7 @@ int buffer_prepare(struct file *file, struct videobuf_buffer *vb,enum v4l2_field } static int -buffer_setup(struct file *file, int *count, int *size) +buffer_setup(struct file *file, unsigned int *count, unsigned int *size) { int llength,lines; diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c index 5aa64ab19..92a76b8d4 100644 --- a/linux/drivers/media/common/saa7146_video.c +++ b/linux/drivers/media/common/saa7146_video.c @@ -1206,7 +1206,7 @@ int buffer_prepare(struct file *file, struct videobuf_buffer *vb, enum v4l2_fiel } static -int buffer_setup(struct file *file, int *count, int *size) +int buffer_setup(struct file *file, unsigned int *count, unsigned int *size) { struct saa7146_fh *fh = file->private_data; diff --git a/linux/drivers/media/dvb/Kconfig b/linux/drivers/media/dvb/Kconfig index 7f67704d8..753fdae94 100644 --- a/linux/drivers/media/dvb/Kconfig +++ b/linux/drivers/media/dvb/Kconfig @@ -36,7 +36,6 @@ comment "Supported SAA7146 based PCI Adapters" depends on DVB source "drivers/media/dvb/ttpci/Kconfig" -source "drivers/media/dvb/ttpci-budget/Kconfig" endmenu diff --git a/linux/drivers/media/dvb/Makefile b/linux/drivers/media/dvb/Makefile index 90cb106d0..0dd59252d 100644 --- a/linux/drivers/media/dvb/Makefile +++ b/linux/drivers/media/dvb/Makefile @@ -2,4 +2,4 @@ # Makefile for the kernel multimedia device drivers. # -obj-y := dvb-core/ frontends/ ttpci/ ttpci-budget/ ttusb-budget/ +obj-y := dvb-core/ frontends/ ttpci/ # ttusb-budget/ diff --git a/linux/drivers/media/dvb/dvb-core/Makefile b/linux/drivers/media/dvb/dvb-core/Makefile index f0c7c7c4f..e3f63f4a8 100644 --- a/linux/drivers/media/dvb/dvb-core/Makefile +++ b/linux/drivers/media/dvb/dvb-core/Makefile @@ -2,7 +2,7 @@ # Makefile for the kernel DVB device drivers. # -dvb-core-objs = dvbdev.o compat.o dmxdev.o dvb_demux.o dvb_filter.o \ +dvb-core-objs = dvbdev.o dmxdev.o dvb_demux.o dvb_filter.o \ dvb_frontend.o dvb_i2c.o dvb_net.o dvb_ksyms.o dvb_ringbuffer.o obj-$(CONFIG_DVB_CORE) += dvb-core.o diff --git a/linux/drivers/media/dvb/dvb-core/compat.c b/linux/drivers/media/dvb/dvb-core/compat.c index d66012ee4..85e9d9949 100644 --- a/linux/drivers/media/dvb/dvb-core/compat.c +++ b/linux/drivers/media/dvb/dvb-core/compat.c @@ -8,65 +8,6 @@ * even when everything compiles. */ -int dvb_usercopy(struct inode *inode, struct file *file, - unsigned int cmd, unsigned long arg, - int (*func)(struct inode *inode, struct file *file, - unsigned int cmd, void *arg)) -{ - char sbuf[128]; - void *mbuf = NULL; - void *parg = NULL; - int err = -EINVAL; - - /* Copy arguments into temp kernel buffer */ - switch (_IOC_DIR(cmd)) { - case _IOC_NONE: - parg = (void *)arg; - break; - case _IOC_READ: /* some v4l ioctls are marked wrong ... */ - case _IOC_WRITE: - case (_IOC_WRITE | _IOC_READ): - if (_IOC_SIZE(cmd) <= sizeof(sbuf)) { - parg = sbuf; - } else { - /* too big to allocate from stack */ - mbuf = kmalloc(_IOC_SIZE(cmd),GFP_KERNEL); - if (NULL == mbuf) - return -ENOMEM; - parg = mbuf; - } - - err = -EFAULT; - if (copy_from_user(parg, (void *)arg, _IOC_SIZE(cmd))) - goto out; - break; - } - - /* call driver */ - if ((err = func(inode, file, cmd, parg)) == -ENOIOCTLCMD) - err = -EINVAL; - - if (err < 0) - goto out; - - /* Copy results into user buffer */ - switch (_IOC_DIR(cmd)) - { - case _IOC_READ: - case (_IOC_WRITE | _IOC_READ): - if (copy_to_user((void *)arg, parg, _IOC_SIZE(cmd))) - err = -EFAULT; - break; - } - -out: - if (mbuf) - kfree(mbuf); - - return err; -} -EXPORT_SYMBOL(dvb_usercopy); - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) static u32 crc32_table[256] = { diff --git a/linux/drivers/media/dvb/dvb-core/dmxdev.c b/linux/drivers/media/dvb/dvb-core/dmxdev.c index b7034c0f2..aa9612cea 100644 --- a/linux/drivers/media/dvb/dvb-core/dmxdev.c +++ b/linux/drivers/media/dvb/dvb-core/dmxdev.c @@ -26,9 +26,11 @@ #include <linux/poll.h> #include <asm/uaccess.h> -#include "compat.h" #include "dmxdev.h" +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51) + #include "compat.h" +#endif //MODULE_DESCRIPTION(""); //MODULE_AUTHOR("Ralph Metzler, Marcus Metzler"); @@ -1141,7 +1143,8 @@ dvb_dmxdev_init(dmxdev_t *dmxdev, struct dvb_adapter *dvb_adapter) dvb_register_device(dvb_adapter, &dmxdev->dvr_dvbdev, &dvbdev_dvr, dmxdev, DVB_DEVICE_DVR); dvb_dmxdev_buffer_init(&dmxdev->dvr_buffer); - MOD_INC_USE_COUNT; + /* fixme: is this correct? */ + try_module_get(THIS_MODULE); return 0; } @@ -1159,7 +1162,8 @@ dvb_dmxdev_release(dmxdev_t *dmxdev) dmxdev->dvr=0; } dmxdev->demux->close(dmxdev->demux); - MOD_DEC_USE_COUNT; + /* fixme: is this correct? */ + module_put(THIS_MODULE); } diff --git a/linux/drivers/media/dvb/dvb-core/dvb_demux.c b/linux/drivers/media/dvb/dvb-core/dvb_demux.c index 6eb5cf663..f52a408fe 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_demux.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_demux.c @@ -27,64 +27,10 @@ #include <linux/version.h> #include <asm/uaccess.h> -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) -static -u32 crc32_table[256] = { - 0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b, - 0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61, - 0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, 0x4c11db70, 0x48d0c6c7, - 0x4593e01e, 0x4152fda9, 0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75, - 0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3, - 0x709f7b7a, 0x745e66cd, 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039, - 0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, 0xbe2b5b58, 0xbaea46ef, - 0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d, - 0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49, 0xc7361b4c, 0xc3f706fb, - 0xceb42022, 0xca753d95, 0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1, - 0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x34867077, 0x30476dc0, - 0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072, - 0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, 0x018aeb13, 0x054bf6a4, - 0x0808d07d, 0x0cc9cdca, 0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde, - 0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02, 0x5e9f46bf, 0x5a5e5b08, - 0x571d7dd1, 0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba, - 0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b, 0xbb60adfc, - 0xb6238b25, 0xb2e29692, 0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6, - 0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a, 0xe0b41de7, 0xe4750050, - 0xe9362689, 0xedf73b3e, 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2, - 0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34, - 0xdc3abded, 0xd8fba05a, 0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637, - 0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb, 0x4f040d56, 0x4bc510e1, - 0x46863638, 0x42472b8f, 0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53, - 0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5, - 0x3f9b762c, 0x3b5a6b9b, 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff, - 0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, 0xf12f560e, 0xf5ee4bb9, - 0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b, - 0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f, 0xc423cd6a, 0xc0e2d0dd, - 0xcda1f604, 0xc960ebb3, 0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7, - 0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, 0x9b3660c6, 0x9ff77d71, - 0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3, - 0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640, 0x4e8ee645, 0x4a4ffbf2, - 0x470cdd2b, 0x43cdc09c, 0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8, - 0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24, 0x119b4be9, 0x155a565e, - 0x18197087, 0x1cd86d30, 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec, - 0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d, 0x2056cd3a, - 0x2d15ebe3, 0x29d4f654, 0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0, - 0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c, 0xe3a1cbc1, 0xe760d676, - 0xea23f0af, 0xeee2ed18, 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4, - 0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662, - 0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668, - 0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4}; - -static u32 crc32_le (u32 crc, unsigned char const *data, size_t len) -{ - int i; - - for (i=0; i<len; i++) - crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ *data++) & 0xff]; - - return crc; -} +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51) + #include "compat.h" #else -#include <linux/crc32.h> + #include <linux/crc32.h> #endif #include "dvb_demux.h" @@ -108,7 +54,8 @@ int dmx_register_demux(dmx_demux_t *demux) demux->users = 0; list_add(&demux->reg_list, &dmx_muxs); - MOD_INC_USE_COUNT; + /* fixme: is this correct? */ + try_module_get(THIS_MODULE); return 0; } @@ -122,7 +69,8 @@ int dmx_unregister_demux(dmx_demux_t* demux) if (demux->users>0) return -EINVAL; list_del(pos); - MOD_DEC_USE_COUNT; + /* fixme: is this correct? */ + module_put(THIS_MODULE); return 0; } } diff --git a/linux/drivers/media/dvb/dvb-core/dvb_i2c.c b/linux/drivers/media/dvb/dvb-core/dvb_i2c.c index 53c48d4df..bc1bdcbac 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_i2c.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_i2c.c @@ -22,6 +22,11 @@ #include <linux/slab.h> #include <linux/list.h> #include <linux/module.h> +#include <linux/version.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51) + #include "compat.h" +#endif #include "dvb_i2c.h" @@ -32,25 +37,11 @@ struct dvb_i2c_device { void (*detach) (struct dvb_i2c_bus *i2c); }; -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,48)) -static inline -int try_module_get(struct module *mod) -{ - if (!MOD_CAN_QUERY(mod)) - return 0; - __MOD_INC_USE_COUNT(mod); - return 1; -} - -#define module_put(mod) __MOD_DEC_USE_COUNT(mod) -#endif - LIST_HEAD(dvb_i2c_buslist); LIST_HEAD(dvb_i2c_devicelist); DECLARE_MUTEX(dvb_i2c_mutex); - static int register_i2c_client (struct dvb_i2c_bus *i2c, struct dvb_i2c_device *dev) { diff --git a/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c b/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c index f3688770f..60c0ef1b8 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c @@ -8,6 +8,66 @@ #include "dvb_demux.h" #include "dvb_net.h" +/* if the miracle happens and "generic_usercopy()" is included into + the kernel, then this can vanish... */ +int dvb_usercopy(struct inode *inode, struct file *file, + unsigned int cmd, unsigned long arg, + int (*func)(struct inode *inode, struct file *file, + unsigned int cmd, void *arg)) +{ + char sbuf[128]; + void *mbuf = NULL; + void *parg = NULL; + int err = -EINVAL; + + /* Copy arguments into temp kernel buffer */ + switch (_IOC_DIR(cmd)) { + case _IOC_NONE: + parg = (void *)arg; + break; + case _IOC_READ: /* some v4l ioctls are marked wrong ... */ + case _IOC_WRITE: + case (_IOC_WRITE | _IOC_READ): + if (_IOC_SIZE(cmd) <= sizeof(sbuf)) { + parg = sbuf; + } else { + /* too big to allocate from stack */ + mbuf = kmalloc(_IOC_SIZE(cmd),GFP_KERNEL); + if (NULL == mbuf) + return -ENOMEM; + parg = mbuf; + } + + err = -EFAULT; + if (copy_from_user(parg, (void *)arg, _IOC_SIZE(cmd))) + goto out; + break; + } + + /* call driver */ + if ((err = func(inode, file, cmd, parg)) == -ENOIOCTLCMD) + err = -EINVAL; + + if (err < 0) + goto out; + + /* Copy results into user buffer */ + switch (_IOC_DIR(cmd)) + { + case _IOC_READ: + case (_IOC_WRITE | _IOC_READ): + if (copy_to_user((void *)arg, parg, _IOC_SIZE(cmd))) + err = -EFAULT; + break; + } + +out: + if (mbuf) + kfree(mbuf); + + return err; +} +EXPORT_SYMBOL(dvb_usercopy); EXPORT_SYMBOL(dvb_dmxdev_init); EXPORT_SYMBOL(dvb_dmxdev_release); diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.c b/linux/drivers/media/dvb/dvb-core/dvb_net.c index c785ec004..30bc41dba 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_net.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c @@ -29,8 +29,10 @@ #include <linux/dvb/net.h> #include "dvb_demux.h" #include "dvb_net.h" -#include "compat.h" +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51) + #include "compat.h" +#endif #define DVB_NET_MULTICAST_MAX 10 @@ -224,7 +226,8 @@ dvb_net_feed_start(struct net_device *dev) priv->secfeed=0; return ret; } - MOD_INC_USE_COUNT; + /* fixme: is this correct? */ + try_module_get(THIS_MODULE); if (priv->mode<3) dvb_net_filter_set(dev, &priv->secfilter, mac, mask_normal); @@ -274,7 +277,8 @@ dvb_net_feed_stop(struct net_device *dev) priv->demux-> release_section_feed(priv->demux, priv->secfeed); priv->secfeed=0; - MOD_DEC_USE_COUNT; + /* fixme: is this correct? */ + module_put(THIS_MODULE); } else printk("%s: no feed to stop\n", dev->name); } @@ -462,7 +466,9 @@ dvb_net_add_if(struct dvb_net *dvbnet, u16 pid) if ((result = register_netdev(net)) < 0) { return result; } - MOD_INC_USE_COUNT; + /* fixme: is this correct? */ + try_module_get(THIS_MODULE); + return if_num; } @@ -475,7 +481,9 @@ dvb_net_remove_if(struct dvb_net *dvbnet, int num) kfree(dvbnet->device[num].priv); unregister_netdev(&dvbnet->device[num]); dvbnet->state[num]=0; - MOD_DEC_USE_COUNT; + /* fixme: is this correct? */ + module_put(THIS_MODULE); + return 0; } diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c index d3a9ca092..71929aafb 100644 --- a/linux/drivers/media/dvb/dvb-core/dvbdev.c +++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c @@ -39,7 +39,10 @@ #include <linux/slab.h> #include "dvbdev.h" -#include "compat.h" + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51) + #include "compat.h" +#endif static int dvbdev_debug = 0; #define dprintk if (dvbdev_debug) printk @@ -301,7 +304,8 @@ int dvb_register_adapter(struct dvb_adapter **padap, const char *name) memset (adap, 0, sizeof(struct dvb_adapter)); INIT_LIST_HEAD (&adap->device_list); - MOD_INC_USE_COUNT; + /* fixme: is this correct? */ + try_module_get(THIS_MODULE); printk ("DVB: registering new adapter (%s).\n", name); @@ -326,7 +330,8 @@ int dvb_unregister_adapter(struct dvb_adapter *adap) list_del (&adap->list_head); up (&dvbdev_register_lock); kfree (adap); - MOD_DEC_USE_COUNT; + /* fixme: is this correct? */ + module_put(THIS_MODULE); return 0; } diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.h b/linux/drivers/media/dvb/dvb-core/dvbdev.h index 04c4d50fd..f472ed178 100644 --- a/linux/drivers/media/dvb/dvb-core/dvbdev.h +++ b/linux/drivers/media/dvb/dvb-core/dvbdev.h @@ -86,6 +86,9 @@ extern int dvb_generic_open (struct inode *inode, struct file *file); extern int dvb_generic_release (struct inode *inode, struct file *file); extern int dvb_generic_ioctl (struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg); - +int dvb_usercopy(struct inode *inode, struct file *file, + unsigned int cmd, unsigned long arg, + int (*func)(struct inode *inode, struct file *file, + unsigned int cmd, void *arg)); #endif /* #ifndef _DVBDEV_H_ */ diff --git a/linux/drivers/media/dvb/frontends/alps_tdlb7.c b/linux/drivers/media/dvb/frontends/alps_tdlb7.c index dbc93ff56..40640300c 100644 --- a/linux/drivers/media/dvb/frontends/alps_tdlb7.c +++ b/linux/drivers/media/dvb/frontends/alps_tdlb7.c @@ -51,7 +51,6 @@ #include <linux/fs.h> #include <linux/unistd.h> -#include "compat.h" #include "dvb_frontend.h" static int debug = 0; diff --git a/linux/drivers/media/dvb/ttpci/av7110.h b/linux/drivers/media/dvb/ttpci/av7110.h index 901cc305b..208ed3d21 100644 --- a/linux/drivers/media/dvb/ttpci/av7110.h +++ b/linux/drivers/media/dvb/ttpci/av7110.h @@ -11,7 +11,7 @@ #include <linux/devfs_fs_kernel.h> #endif -#include "saa7146_vv.h" +#include <media/saa7146_vv.h> /* DEBI transfer mode defs */ diff --git a/linux/drivers/media/dvb/ttpci/budget-av.c b/linux/drivers/media/dvb/ttpci/budget-av.c index 66173a760..8d6be0828 100644 --- a/linux/drivers/media/dvb/ttpci/budget-av.c +++ b/linux/drivers/media/dvb/ttpci/budget-av.c @@ -31,7 +31,7 @@ */ #include "budget.h" -#include "saa7146_vv.h" +#include <media/saa7146_vv.h> #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51) #define KBUILD_MODNAME budget_av diff --git a/linux/drivers/media/dvb/ttpci/budget.h b/linux/drivers/media/dvb/ttpci/budget.h index 09dbb2735..a76cc607b 100644 --- a/linux/drivers/media/dvb/ttpci/budget.h +++ b/linux/drivers/media/dvb/ttpci/budget.h @@ -9,8 +9,8 @@ #include "dmxdev.h" #include "dvb_filter.h" #include "dvb_net.h" -#include "saa7146.h" +#include <media/saa7146.h> extern int budget_debug; diff --git a/linux/include/media/saa7146.h b/linux/include/media/saa7146.h index dcb4510c5..ac8544da4 100644 --- a/linux/include/media/saa7146.h +++ b/linux/include/media/saa7146.h @@ -14,7 +14,9 @@ #include <asm/io.h> /* for accessing devices */ #include <linux/stringify.h> -#include "compat.h" +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51) + #include "compat.h" +#endif #define SAA7146_VERSION_CODE KERNEL_VERSION(0,5,0) diff --git a/linux/include/media/saa7146_vv.h b/linux/include/media/saa7146_vv.h index a22ebe560..f45c32a4c 100644 --- a/linux/include/media/saa7146_vv.h +++ b/linux/include/media/saa7146_vv.h @@ -1,10 +1,10 @@ #ifndef __SAA7146_VV__ #define __SAA7146_VV__ -#include "saa7146.h" - #include <linux/videodev2.h> -#include "video-buf.h" + +#include <media/saa7146.h> +#include <media/video-buf.h> #define MAX_SAA7146_CAPTURE_BUFFERS 32 /* arbitrary */ #define BUFFER_TIMEOUT (HZ/2) /* 0.5 seconds */ |