This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / media / dvb / dvb-core / dmxdev.c

diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c
index cdbfb15..1d685f6 100644 (file)
--- a/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/drivers/media/dvb/dvb-core/dmxdev.c
@@ -25,7 +25,6 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/sched.h>
 #include <linux/poll.h>
 #include <linux/ioctl.h>
@@ -34,20 +33,25 @@
 #include <asm/system.h>
 
 #include "dmxdev.h"
+#include "dvb_functions.h"
 
-static int debug;
-
-module_param(debug, int, 0644);
-MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off).");
+MODULE_PARM(debug,"i");
+static int debug = 0;
 
 #define dprintk        if (debug) printk
 
-static inline struct dmxdev_filter *
+inline struct dmxdev_filter *
 dvb_dmxdev_file_to_filter(struct file *file)
 {
        return (struct dmxdev_filter *) file->private_data;
 }
 
+inline struct dmxdev_dvr *
+dvb_dmxdev_file_to_dvr(struct dmxdev *dmxdev, struct file *file)
+{
+       return (struct dmxdev_dvr *) file->private_data;
+}
+
 static inline void dvb_dmxdev_buffer_init(struct dmxdev_buffer *buffer) 
 {
        buffer->data=NULL;
@@ -840,7 +844,7 @@ static ssize_t dvb_dmxdev_read_sec(struct dmxdev_filter *dfil,
 }
 
 
-static ssize_t
+ssize_t 
 dvb_demux_read(struct file *file, char __user *buf, size_t count, loff_t *ppos)
 {
        struct dmxdev_filter *dmxdevfilter=dvb_dmxdev_file_to_filter(file);
@@ -1116,7 +1120,6 @@ dvb_dmxdev_init(struct dmxdev *dmxdev, struct dvb_adapter *dvb_adapter)
 
        return 0;
 }
-EXPORT_SYMBOL(dvb_dmxdev_init);
 
 void 
 dvb_dmxdev_release(struct dmxdev *dmxdev)
@@ -1133,5 +1136,5 @@ dvb_dmxdev_release(struct dmxdev *dmxdev)
        }
        dmxdev->demux->close(dmxdev->demux);
 }
-EXPORT_SYMBOL(dvb_dmxdev_release);
+