patch-2.3.99-pre7 linux/drivers/usb/scanner.h

• Lines: 157
• Date: Tue May 2 13:49:18 2000
• Orig file: v2.3.99-pre6/linux/drivers/usb/scanner.h
• Orig date: Tue Apr 11 15:09:20 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/usb/scanner.h linux/drivers/usb/scanner.h
@@ -1,3 +1,26 @@
+/*
+ * Driver for USB Scanners (linux-2.3.99-pre6-3)
+ *
+ * Copyright (C) 1999, 2000 David E. Nelson
+ *
+ * David E. Nelson ([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 Free Software Foundation; either version 2 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 General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */ 
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
@@ -6,16 +29,28 @@
 #include <linux/malloc.h>
 #include <linux/delay.h>
 #include <linux/ioctl.h>
+#include <linux/sched.h>
 
 // #define DEBUG
 
+#include <linux/usb.h>
+
+static __s32 vendor=-1, product=-1;
+
+MODULE_AUTHOR("David E. Nelson, [email protected], http://www.jump.net/~dnelson");
+MODULE_DESCRIPTION("USB Scanner Driver");
+
+MODULE_PARM(vendor, "i");
+MODULE_PARM_DESC(vendor, "User specified USB idVendor");
+
+MODULE_PARM(product, "i");
+MODULE_PARM_DESC(product, "User specified USB idProduct");
+
+
 /* Enable to activate the ioctl interface.  This is mainly meant for */
 /* development purposes until an ioctl number is officially registered */
 // #define SCN_IOCTL
 
-#include <linux/usb.h>
-// #include "usb.h"
-
 /* WARNING: These DATA_DUMP's can produce a lot of data. Caveat Emptor. */
 // #define RD_DATA_DUMP /* Enable to dump data - limited to 24 bytes */
 // #define WR_DATA_DUMP /* DEBUG does not have to be defined. */
@@ -36,9 +71,12 @@
 #define IBUF_SIZE 32768
 #define OBUF_SIZE 4096
 
+/* read_scanner timeouts -- RD_NAK_TIMEOUT * RD_EXPIRE = Number of seconds */
+#define RD_NAK_TIMEOUT (10*HZ)	/* Number of X seconds to wait */
+#define RD_EXPIRE 12		/* Number of attempts to wait X seconds */
 
-/* FIXME: These are NOT registered ioctls()'s */
 
+/* FIXME: These are NOT registered ioctls()'s */
 #define PV8630_IOCTL_INREQUEST 69
 #define PV8630_IOCTL_OUTREQUEST 70
 
@@ -55,19 +93,74 @@
 	char present;		/* Not zero if device is present */
 	char *obuf, *ibuf;	/* transfer buffers */
 	char bulk_in_ep, bulk_out_ep, intr_ep; /* Endpoint assignments */
+	wait_queue_head_t rd_wait_q; /* read timeouts */
 };
 
 static struct scn_usb_data *p_scn_table[SCN_MAX_MNR] = { NULL, /* ... */};
 
-MODULE_AUTHOR("David E. Nelson, [email protected], http://www.jump.net/~dnelson");
-MODULE_DESCRIPTION("USB Scanner Driver");
-
-static __s32 vendor=-1, product=-1;
-MODULE_PARM(vendor, "i");
-MODULE_PARM_DESC(vendor, "User specified USB idVendor");
-
-MODULE_PARM(product, "i");
-MODULE_PARM_DESC(product, "User specified USB idProduct");
+/* table of scanners that may work with this driver */
+static const struct scanner_device {
+	__u16		idVendor;
+	__u16		idProduct;
+} scanner_device_ids [] = {
+	/* Acer */
+		{ 0x04a5, 0x2060 },	/* Prisa Acerscan 620U & 640U (!) */
+		{ 0x04a5, 0x2040 },	/* Prisa AcerScan 620U (!) */
+	/* Agfa */
+		{ 0x06bd, 0x0001 },	/* SnapScan 1212U */
+		{ 0x06bd, 0x2061 },	/* Another SnapScan 1212U (?) */
+		{ 0x06bd, 0x0100 },	/* SnapScan Touch */
+	/* Colorado -- See Primax/Colorado below */
+	/* Epson -- See Seiko/Epson below */
+	/* Genius */
+		{ 0x0458, 0x2001 },	/* ColorPage-Vivid Pro */
+	/* Hewlett Packard */
+		{ 0x03f0, 0x0205 },	/* 3300C */
+		{ 0x03f0, 0x0101 },	/* 4100C */
+		{ 0x03f0, 0x0105 },	/* 4200C */
+		{ 0x03f0, 0x0202 },	/* PhotoSmart S20 */
+		{ 0x03f0, 0x0401 },	/* 5200C */
+		{ 0x03f0, 0x0201 },	/* 6200C */
+		{ 0x03f0, 0x0601 },	/* 6300C */
+	/* iVina */
+		{ 0x0638, 0x0268 },     /* 1200U */
+	/* Microtek */
+		{ 0x05da, 0x0099 },	/* ScanMaker X6 - X6U */
+		{ 0x05da, 0x0094 },	/* Phantom 336CX - C3 */
+		{ 0x05da, 0x00a0 },	/* Phantom 336CX - C3 #2 */
+		{ 0x05da, 0x009a },	/* Phantom C6 */
+		{ 0x05da, 0x00a3 },	/* ScanMaker V6USL */
+		{ 0x05da, 0x80a3 },	/* ScanMaker V6USL #2 */
+		{ 0x05da, 0x80ac },	/* ScanMaker V6UL - SpicyU */
+	/* Mustek */
+		{ 0x055f, 0x0001 },	/* 1200 CU */
+	/* Primax/Colorado */
+		{ 0x0461, 0x0300 },	/* G2-300 #1 */
+		{ 0x0461, 0x0380 },	/* G2-600 #1 */
+		{ 0x0461, 0x0301 },	/* G2E-300 #1 */
+		{ 0x0461, 0x0381 },	/* ReadyScan 636i */
+		{ 0x0461, 0x0302 },	/* G2-300 #2 */
+		{ 0x0461, 0x0382 },	/* G2-600 #2 */
+		{ 0x0461, 0x0303 },	/* G2E-300 #2 */
+		{ 0x0461, 0x0383 },	/* G2E-600 */
+		{ 0x0461, 0x0340 },	/* Colorado USB 9600 */
+		{ 0x0461, 0x0360 },	/* Colorado USB 19200 */
+		{ 0x0461, 0x0341 },	/* Colorado 600u */
+		{ 0x0461, 0x0361 },	/* Colorado 1200u */
+	/* Seiko/Epson Corp. */
+		{ 0x04b8, 0x0101 },	/* Perfection 636U and 636Photo */
+		{ 0x04b8, 0x0103 },	/* Perfection 610 */
+		{ 0x04b8, 0x0104 },	/* Perfection 1200U and 1200Photo */
+	/* Umax */
+		{ 0x1606, 0x0010 },	/* Astra 1220U */
+		{ 0x1606, 0x0002 },	/* Astra 1236U */
+		{ 0x1606, 0x0030 },	/* Astra 2000U */
+		{ 0x1606, 0x0230 },	/* Astra 2200U */
+	/* Visioneer */
+		{ 0x04a7, 0x0221 },	/* OneTouch 5300 */
+		{ 0x04a7, 0x0221 },	/* OneTouch 7600 duplicate ID (!) */
+		{ 0x04a7, 0x0231 },	/* 6100 */
+};
 
 /* Forward declarations */
 static struct usb_driver scanner_driver;