patch-2.3.43 linux/drivers/usb/scanner.h

• Lines: 50
• Date: Mon Feb 7 19:13:45 2000
• Orig file: v2.3.42/linux/drivers/usb/scanner.h
• Orig date: Fri Jan 28 15:09:08 2000

diff -u --recursive --new-file v2.3.42/linux/drivers/usb/scanner.h linux/drivers/usb/scanner.h
@@ -18,6 +18,8 @@
 #define IS_EP_BULK_OUT(ep) (IS_EP_BULK(ep) && ((ep).bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT)
 #define IS_EP_INTR(ep) ((ep).bmAttributes == USB_ENDPOINT_XFER_INT ? 1 : 0)
 
+#define USB_SCN_MINOR(X) MINOR((X)->i_rdev) - SCN_BASE_MNR
+
 #ifdef DEBUG
 #define SCN_DEBUG(X) X
 #else
@@ -30,19 +32,25 @@
 
 /* FIXME: These are NOT registered ioctls()'s */
 
-#define PV8630_RECEIVE 69
-#define PV8630_SEND    70
+#define PV8630_IOCTL_INREQUEST 69
+#define PV8630_IOCTL_OUTREQUEST 70
+
+#define SCN_MAX_MNR 16		/* We're allocated 16 minors */
+#define SCN_BASE_MNR 48		/* USB Scanners start at minor 48 */
 
-struct hpscan_usb_data {
-	struct usb_device *hpscan_dev;
-        int isopen;		/* Not zero if the device is open */
-	int present;		/* Device is present on the bus */
+struct scn_usb_data {
+	struct usb_device *scn_dev;
+	struct urb scn_irq;
+	unsigned int ifnum;	/* Interface number of the USB device */
+	kdev_t scn_minor;	/* Scanner minor - used in disconnect() */
+	unsigned char button;	/* Front panel buffer */
+        char isopen;		/* Not zero if the device is open */
+	char present;		/* Not zero if device is present */
 	char *obuf, *ibuf;	/* transfer buffers */
 	char bulk_in_ep, bulk_out_ep, intr_ep; /* Endpoint assignments */
-	char *button;		/* Front panel button buffer */
 };
 
-static struct hpscan_usb_data hpscan;
+static struct scn_usb_data *p_scn_table[SCN_MAX_MNR] = { NULL, /* ... */};
 
 MODULE_AUTHOR("David E. Nelson, dnelson@jump.net, http://www.jump.net/~dnelson");
 MODULE_DESCRIPTION("USB Scanner Driver");
@@ -53,3 +61,6 @@
 
 MODULE_PARM(product, "i");
 MODULE_PARM_DESC(product, "User specified USB idProduct");
+
+/* Forward declarations */
+static struct usb_driver scanner_driver;