Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / drivers / media / dvb / dvb-core / dvbdev.h

diff --git a/drivers/media/dvb/dvb-core/dvbdev.h b/drivers/media/dvb/dvb-core/dvbdev.h
index fc4700f..74ed585 100644 (file)
--- a/drivers/media/dvb/dvb-core/dvbdev.h
+++ b/drivers/media/dvb/dvb-core/dvbdev.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * dvbdev.h
  *
  * Copyright (C) 2000 Ralph Metzler & Marcus Metzler
@@ -28,6 +28,7 @@
 #include <linux/fs.h>
 #include <linux/list.h>
 #include <linux/devfs_fs_kernel.h>
+#include <linux/smp_lock.h>
 
 #define DVB_MAJOR 212
 
@@ -48,6 +49,7 @@ struct dvb_adapter {
        struct list_head device_list;
        const char *name;
        u8 proposed_mac [6];
+       void* priv;
 
        struct module *module;
 };
@@ -56,9 +58,6 @@ struct dvb_adapter {
 struct dvb_device {
        struct list_head list_head;
        struct file_operations *fops;
- 
- 
- 
        struct dvb_adapter *adapter;
        int type;
        u32 id;
@@ -69,19 +68,19 @@ struct dvb_device {
        int writers;
        int users;
 
-        /* don't really need those !? -- FIXME: use video_usercopy  */
-        int (*kernel_ioctl)(struct inode *inode, struct file *file,
+       /* don't really need those !? -- FIXME: use video_usercopy  */
+       int (*kernel_ioctl)(struct inode *inode, struct file *file,
                            unsigned int cmd, void *arg);
 
        void *priv;
 };
 
 
-extern int dvb_register_adapter (struct dvb_adapter **padap, const char *name, struct module *module);
+extern int dvb_register_adapter (struct dvb_adapter *adap, const char *name, struct module *module);
 extern int dvb_unregister_adapter (struct dvb_adapter *adap);
 
 extern int dvb_register_device (struct dvb_adapter *adap,
-                               struct dvb_device **pdvbdev, 
+                               struct dvb_device **pdvbdev,
                                const struct dvb_device *template,
                                void *priv,
                                int type);
@@ -92,5 +91,14 @@ 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);
-#endif /* #ifndef _DVBDEV_H_ */
 
+/* we don't mess with video_usercopy() any more,
+we simply define out own dvb_usercopy(), which will hopefully become
+generic_usercopy()  someday... */
+
+extern 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_ */