patch-2.4.0-test11 linux/drivers/usb/dc2xx.c

• Lines: 65
• Date: Sun Nov 12 20:40:42 2000
• Orig file: v2.4.0-test10/linux/drivers/usb/dc2xx.c
• Orig date: Tue Oct 31 12:42:27 2000

diff -u --recursive --new-file v2.4.0-test10/linux/drivers/usb/dc2xx.c linux/drivers/usb/dc2xx.c
@@ -44,11 +44,14 @@
  * 03 Nov, 1999 -- update for 2.3.25 kernel API changes.
  * 08 Jan, 2000 .. multiple camera support
  * 12 Aug, 2000 .. add some real locking, remove an Oops
+ * 10 Oct, 2000 .. usb_device_id table created. 
+ * 01 Nov, 2000 .. usb_device_id support added by Adam J. Richter
  *
  * Thanks to:  the folk who've provided USB product IDs, sent in
  * patches, and shared their sucesses!
  */
 
+#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/signal.h>
@@ -59,7 +62,12 @@
 #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>
 
 
@@ -82,7 +90,7 @@
 
 
 /* table of cameras that work through this driver */
-static __devinitdata struct usb_device_id camera_table [] = {
+static struct usb_device_id camera_table [] = {
 
 	/* These have the same application level protocol */  
     { idVendor: 0x040a, idProduct: 0x0120 },		// Kodak DC-240
@@ -105,7 +113,7 @@
 	 * means, among other things, no iso or interrupt endpoints.
 	 */
 
-    { }						// TERMINATING ENTRY
+    { }						/* Terminating entry */
 };
 
 MODULE_DEVICE_TABLE (usb, camera_table);
@@ -346,7 +354,7 @@
 
 
 static void * __devinit
-camera_bind (struct usb_device *dev, unsigned int ifnum, const struct usb_device_id *camera_info)
+camera_probe (struct usb_device *dev, unsigned int ifnum, const struct usb_device_id *camera_info)
 {
 	int				i;
 	struct usb_interface_descriptor	*interface;
@@ -471,7 +479,7 @@
 	name:		"dc2xx",
 
 	id_table:	camera_table,
-	bind:		camera_bind,
+	probe:		camera_probe,
 	disconnect:	camera_disconnect,
 
 	fops:		&usb_camera_fops,