Hi,
Here's a patch against 2.2.19-pre16 that updates the USB dc2xx driver to
the same level of 2.4.2.
(patch 2 of 7 in this bundle)
thanks,
greg k-h
diff -Naur -X /home/greg/linux/dontdiff linux-2.2.19-pre16/drivers/usb/dc2xx.c
linux-2.2.19-pre16-greg/drivers/usb/dc2xx.c
--- linux-2.2.19-pre16/drivers/usb/dc2xx.c Sun Dec 10 16:49:43 2000
+++ linux-2.2.19-pre16-greg/drivers/usb/dc2xx.c Mon Mar 5 11:08:31 2001
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1999-2000 by David Brownell <[EMAIL PROTECTED]>
+ * Copyright (C) 1999-2000 by David Brownell <[EMAIL PROTECTED]>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -59,13 +59,17 @@
#include <linux/init.h>
#include <linux/malloc.h>
#include <linux/module.h>
-#undef DEBUG
+#ifdef CONFIG_USB_DEBUG
+ #define DEBUG
+#else
+ #undef DEBUG
+#endif
#include <linux/usb.h>
/* current USB framework handles max of 16 USB devices per driver */
-#define MAX_CAMERAS 8
+#define MAX_CAMERAS 16
/* USB char devs use USB_MAJOR and from USB_CAMERA_MINOR_BASE up */
#define USB_CAMERA_MINOR_BASE 80
@@ -90,6 +94,8 @@
/* These have the same application level protocol */
{ 0x040a, 0x0120 }, // Kodak DC-240
{ 0x040a, 0x0130 }, // Kodak DC-280
+ { 0x040a, 0x0131 }, // Kodak DC-5000
+ { 0x040a, 0x0132 }, // Kodak DC-3400
/* These have a different application level protocol which
* is part of the Flashpoint "DigitaOS". That supports some
@@ -435,7 +441,8 @@
goto error;
}
- info ("USB Camera #%d connected", camera->subminor);
+ info ("USB Camera #%d connected, major/minor %d/%d", camera->subminor,
+ USB_MAJOR, USB_CAMERA_MINOR_BASE + camera->subminor);
camera->dev = dev;
usb_inc_dev_use (dev);
@@ -475,12 +482,13 @@
}
static /* const */ struct usb_driver camera_driver = {
- "dc2xx",
- camera_probe,
- camera_disconnect,
- { NULL, NULL },
- &usb_camera_fops,
- USB_CAMERA_MINOR_BASE
+ name: "dc2xx",
+
+ probe: camera_probe,
+ disconnect: camera_disconnect,
+
+ fops: &usb_camera_fops,
+ minor: USB_CAMERA_MINOR_BASE
};
@@ -497,7 +505,7 @@
}
-MODULE_AUTHOR("David Brownell, [EMAIL PROTECTED]");
+MODULE_AUTHOR("David Brownell, [EMAIL PROTECTED]");
MODULE_DESCRIPTION("USB Camera Driver for Kodak DC-2xx series cameras");
module_init (usb_dc2xx_init);
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
http://lists.sourceforge.net/lists/listinfo/linux-usb-devel
