Kod:
diff -urN sasc-ng/dvbloopback/module/config-dvb/chkdvb-2.6.v4l.c sasc-ng.woohoo/dvbloopback/module/config-dvb/chkdvb-2.6.v4l.c
--- sasc-ng/dvbloopback/module/config-dvb/chkdvb-2.6.v4l.c 1969-12-31 17:00:00.000000000 -0700
+++ sasc-ng.woohoo/dvbloopback/module/config-dvb/chkdvb-2.6.v4l.c 2008-04-19 13:02:39.000000000 -0600
@@ -0,0 +1,14 @@
+ #include "dvbdev.h"
+ int test(void) {
+ struct dvb_adapter *adap = NULL;
+ const char *name = NULL;
+ struct module *module = NULL;
+ struct device *device = NULL;
+ int ret;
+ adap = adap;
+ name = name;
+ module = module;
+ device = device;
+ret = dvb_register_adapter(adap, name, module, device,1);
+return ret;
+}
diff -urN sasc-ng/dvbloopback/module/config_dvb.pl sasc-ng.woohoo/dvbloopback/module/config_dvb.pl
--- sasc-ng/dvbloopback/module/config_dvb.pl 2008-04-19 13:42:17.000000000 -0600
+++ sasc-ng.woohoo/dvbloopback/module/config_dvb.pl 2008-04-19 13:36:55.000000000 -0600
@@ -46,13 +46,14 @@
$uname = `uname -r`;
if($uname =~ /2\.6\.23/ ||
$uname =~ /2\.6\.22/) {
- system("ln -sf ../dvbdev-2.6.22.h config-dvb/dvbdev.h");
- system("ln -sf chkdvb-2.6.22.c config-dvb/chkdvb.c");
+ system("ln -sf ../dvbdev-2.6.v4l.h config-dvb/dvbdev.h");
+ system("ln -sf chkdvb-2.6.v4l.c config-dvb/chkdvb.c");
if(system("$cmd") == 0) {
print "Found 2.6.22 or later kernel, but no dvbdev.h\n";
print "Using canned header\n";
- `echo "#define wrap_dvb_reg_adapter(a, b, c) dvb_register_adapter(a, b, c, &dvblb_basedev->dev)" >> dvbdevwrap.h`;
- system("ln -sf dvbdev-2.6.22.h dvbdev.h");
+ `echo "DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);" >> dvbdevwrap.h`;
+ `echo "#define wrap_dvb_reg_adapter(a, b, c) dvb_register_adapter(a, b, c, &dvblb_basedev->dev, adapter_nr)" >> dvbdevwrap.h`;
+ system("ln -sf dvbdev-2.6.v4l.h dvbdev.h");
return 0;
}
}
diff -urN sasc-ng/dvbloopback/module/dvbdev-2.6.v4l.h sasc-ng.woohoo/dvbloopback/module/dvbdev-2.6.v4l.h
--- sasc-ng/dvbloopback/module/dvbdev-2.6.v4l.h 1969-12-31 17:00:00.000000000 -0700
+++ sasc-ng.woohoo/dvbloopback/module/dvbdev-2.6.v4l.h 2008-04-19 13:38:42.000000000 -0600
@@ -0,0 +1,138 @@
+/*
+ * dvbdev.h
+ *
+ * Copyright (C) 2000 Ralph Metzler & Marcus Metzler
+ * for convergence integrated media GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Lesser Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef _DVBDEV_H_
+#define _DVBDEV_H_
+
+#include <linux/types.h>
+#include <linux/poll.h>
+#include <linux/fs.h>
+#include <linux/list.h>
+#include <linux/smp_lock.h>
+
+#define DVB_MAJOR 212
+
+#define DVB_MAX_ADAPTERS 8
+
+#define DVB_UNSET (-1)
+
+
+#define DVB_DEVICE_VIDEO 0
+#define DVB_DEVICE_AUDIO 1
+#define DVB_DEVICE_SEC 2
+#define DVB_DEVICE_FRONTEND 3
+#define DVB_DEVICE_DEMUX 4
+#define DVB_DEVICE_DVR 5
+#define DVB_DEVICE_CA 6
+#define DVB_DEVICE_NET 7
+#define DVB_DEVICE_OSD 8
+
+#define DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr) \
+ static short adapter_nr[] = \
+ {[0 ... (DVB_MAX_ADAPTERS - 1)] = DVB_UNSET }; \
+ module_param_array(adapter_nr, short, NULL, 0444); \
+ MODULE_PARM_DESC(adapter_nr, "DVB adapter numbers")
+
+struct dvb_adapter {
+ int num;
+ struct list_head list_head;
+ struct list_head device_list;
+ const char *name;
+ u8 proposed_mac [6];
+ void* priv;
+
+ struct device *device;
+
+ struct module *module;
+};
+
+
+struct dvb_device {
+ struct list_head list_head;
+ struct file_operations *fops;
+ struct dvb_adapter *adapter;
+ int type;
+ u32 id;
+
+ /* in theory, 'users' can vanish now,
+ but I don't want to change too much now... */
+ int readers;
+ int writers;
+ int users;
+
+ wait_queue_head_t wait_queue;
+ /* 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 *adap, const char *name, struct module *module, struct device *device,short *adapter_nums);
+extern int dvb_unregister_adapter (struct dvb_adapter *adap);
+
+extern int dvb_register_device (struct dvb_adapter *adap,
+ struct dvb_device **pdvbdev,
+ const struct dvb_device *template,
+ void *priv,
+ int type);
+
+extern void dvb_unregister_device (struct dvb_device *dvbdev);
+
+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);
+
+/* 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));
+
+/** generic DVB attach function. */
+#ifdef CONFIG_DVB_CORE_ATTACH
+#define dvb_attach(FUNCTION, ARGS...) ({ \
+ void *__r = NULL; \
+ typeof(&FUNCTION) __a = symbol_request(FUNCTION); \
+ if (__a) { \
+ __r = (void *) __a(ARGS); \
+ if (__r == NULL) \
+ symbol_put(FUNCTION); \
+ } else { \
+ printk(KERN_ERR "DVB: Unable to find symbol "#FUNCTION"()\n"); \
+ } \
+ __r; \
+})
+
+#else
+#define dvb_attach(FUNCTION, ARGS...) ({ \
+ FUNCTION(ARGS); \
+})
+
+#endif
+
+#endif /* #ifndef _DVBDEV_H_ */
Observera att $uname =~ /2\.6\.23/ kan behöva bytas ut mot din egen version kärnan. Jag behövde det då senaste Mythubuntu-kärnan heter 2.6.24-XX. Kan också nämna att jag körde trunk-versionen av open-sasc-ng nedladdad med svn.
Ursprungligen postat av banen
Svara med citat
