Could someone please test out this patch. It's so usbvision.c will
compile under
kernel 2.4.6. This patch is against usbvision-0.3.1-test2.tgz. Also, when
are we going to
get the ball rolling for the compression stuff. I have one person willing to
give up some
time in their life. 8*)
--- /usr/src/usbvision-0.3.1-test2/src/usbvision.c Wed May 2 13:47:21 2001
+++ /usr/src/linux/drivers/usb/usbvision.c Fri Jul 6 03:07:54 2001
@@ -1,5 +1,5 @@
/*
- * USB USBVISION Video device driver 0.3.0
+ * USB USBVISION Video device driver 0.3.1-test2 (For Kernel 2.4.6)
*
* Let's call the version 0.... until compression decoding is implemented.
*
@@ -10,6 +10,7 @@
* Gerd Knorr and zoran 36120/36125 driver by Pauline Middelink
*
* History:
+ *
* Mar. 2000 - 15.12.2000: (0.0.0 - 0.2.0)
* Several alpha drivers and the first beta.
*
@@ -48,7 +49,14 @@
* - Changes for adding new devices. There's now a table in usbvision.h.
* Adding your devices data to the usbvision_device_data table is all
* you need to add a new device, I hope.
+ *
*
+ * July 5, 2001 - (Patch the driver to run with Kernel 2.4.6)
+ * - Fixed a problem with the number of parameters
+ * passed to video_register_device.
+ *
+ *
+ *
* TODO:
* - Fix memory settings for nt1004. It is 4 times as big as the
* nt1003 memory.
@@ -74,7 +82,7 @@
#include <linux/spinlock.h>
#include <linux/usb.h>
-#include <asm/io.h>
+#include <asm/io.h>
#include <linux/video_decoder.h>
#include <linux/i2c.h>
@@ -85,9 +93,7 @@
#define ENABLE_HEXDUMP 0 /* Enable if you need it */
static int debug = 0;
-#define DEBUG(x...) //x
-#define IODEBUG(x...) //x
-#define IRQDEBUG(x...) //x
+static int video_nr = -1;
static int verbose = 1;
/* Completion states of the data parser */
@@ -3734,7 +3740,7 @@
usbvision_configure_video(usbvision);
up(&usbvision->lock);
- if (video_register_device(&usbvision->vdev, VFL_TYPE_GRABBER) == -1) {
+ if (video_register_device(&usbvision->vdev, VFL_TYPE_GRABBER, video_nr) <
0) {
printk(KERN_ERR "video_register_device failed\n");
usbvision = NULL;
}
@@ -3848,3 +3854,13 @@
module_init(usbvision_init);
module_exit(usbvision_cleanup);
+
+
+
+
+
+
+
+
+
+
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
http://lists.sourceforge.net/lists/listinfo/linux-usb-devel
