Hi All,
Here's my last and final patch to the maintainer of USB Scanner Driver. Brian
Beattie <[EMAIL PROTECTED]> is now going to assume this role (thanks
Brian!). Brian brings some kernel level programming so I'm sure he'll be able
to conttribute to this list w/o any problems. I want to thank you all for your
support and help. A couple of you sent some personal msgs regarding my
departure - thank you.
Over the next week or so, I'll be updating my www page, forwaring scanner
e-mails to Brian, and updating contacts to that they can update their pages.
I've unsubbed from the list so you'll have to reply to me directly. I'll be
hanging on the '[EMAIL PROTECTED]' addr for another month or so, then I'm going
full-time (hopefully lifetime) to [EMAIL PROTECTED]
This patch was created from a stock 2.4.18 kernel tree. Please feel free to
apply it to the other trees out there were applicable.
So w/o delay, here are the changes/additions in this version:
* 0.4.8 5/30/2002
* - Added Mustek BearPaw 2400 TA. Thanks to Sergey
* Vlasov <[EMAIL PROTECTED]>.
* - Added Mustek 1200UB Plus and Mustek BearPaw 1200 CU ID's. These use
* the Grandtech GT-6801 chip. Thanks to Henning
* Meier-Geinitz <[EMAIL PROTECTED]>.
* - Increased Epson timeout to 60 secs as requested from
* Karl Heinz Kremer <[EMAIL PROTECTED]>.
* - Changed maintainership from David E. Nelson to Brian
* Beattie <[EMAIL PROTECTED]>.
Regards,
/\/elson
--
~~ ** ~~ If you didn't learn anything when you broke it the 1st ~~ ** ~~
time, then break it again.
diff -u --recursive --new-file linux-2.4.18-org/drivers/usb/scanner.c
linux-2.4.18/drivers/usb/scanner.c
--- linux-2.4.18-org/drivers/usb/scanner.c Fri Dec 21 12:41:55 2001
+++ linux-2.4.18/drivers/usb/scanner.c Thu May 30 21:39:56 2002
@@ -1,13 +1,13 @@
/* -*- linux-c -*- */
/*
- * Driver for USB Scanners (linux-2.4.12)
+ * Driver for USB Scanners (linux-2.4.18)
*
- * Copyright (C) 1999, 2000, 2001 David E. Nelson
+ * Copyright (C) 1999, 2000, 2001, 2002 David E. Nelson
*
* Portions may be copyright Brad Keryan and Michael Gee.
*
- * David E. Nelson ([EMAIL PROTECTED])
+ * Brian Beattie <[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
@@ -300,11 +300,24 @@
* Frank Zago <[EMAIL PROTECTED]> and
* Oliver Neukum <[EMAIL PROTECTED]> for reviewing/testing.
*
+ * 0.4.8 5/30/2002
+ * - Added Mustek BearPaw 2400 TA. Thanks to Sergey
+ * Vlasov <[EMAIL PROTECTED]>.
+ * - Added Mustek 1200UB Plus and Mustek BearPaw 1200 CU ID's. These use
+ * the Grandtech GT-6801 chip. Thanks to Henning
+ * Meier-Geinitz <[EMAIL PROTECTED]>.
+ * - Increased Epson timeout to 60 secs as requested from
+ * Karl Heinz Kremer <[EMAIL PROTECTED]>.
+ * - Changed maintainership from David E. Nelson to Brian
+ * Beattie <[EMAIL PROTECTED]>.
+ *
* TODO
+ * - Remove the 2/3 endpoint limitation
* - Performance
* - Select/poll methods
* - More testing
* - Proper registry/assignment for LM9830 ioctl's
+ * - More general usage ioctl's
*
*
* Thanks to:
@@ -320,6 +333,8 @@
* - All the folks who chimed in with reports and suggestions.
* - All the developers that are working on USB SANE backends or other
* applications to use USB scanners.
+ * - Thanks to Greg KH <[EMAIL PROTECTED]> for setting up Brian Beattie
+ * to be the new USB Scanner maintainer.
*
* Performance:
*
@@ -1017,7 +1032,7 @@
switch (dev->descriptor.idVendor) { /* Scanner specific read timeout
parameters */
case 0x04b8: /* Seiko/Epson */
- scn->rd_nak_timeout = HZ * 40;
+ scn->rd_nak_timeout = HZ * 60;
break;
case 0x055f: /* Mustek */
case 0x0400: /* Another Mustek */
diff -u --recursive --new-file linux-2.4.18-org/drivers/usb/scanner.h
linux-2.4.18/drivers/usb/scanner.h
--- linux-2.4.18-org/drivers/usb/scanner.h Fri Dec 21 12:41:55 2001
+++ linux-2.4.18/drivers/usb/scanner.h Thu May 30 23:09:04 2002
@@ -1,9 +1,9 @@
/*
- * Driver for USB Scanners (linux-2.4.12)
+ * Driver for USB Scanners (linux-2.4.18)
*
- * Copyright (C) 1999, 2000, 2001 David E. Nelson
+ * Copyright (C) 1999, 2000, 2001, 2002 David E. Nelson
*
- * David E. Nelson ([EMAIL PROTECTED])
+ * Brian Beattie <[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
@@ -48,7 +48,7 @@
static __s32 vendor=-1, product=-1, read_timeout=0;
-MODULE_AUTHOR("David E. Nelson, [EMAIL PROTECTED], http://www.jump.net/~dnelson";);
+MODULE_AUTHOR("Brian Beattie, [EMAIL PROTECTED]");
MODULE_DESCRIPTION(DRIVER_DESC" "DRIVER_VERSION);
MODULE_LICENSE("GPL");
@@ -141,6 +141,8 @@
{ USB_DEVICE(0x0400, 0x1001) }, /* BearPaw 2400 */
{ USB_DEVICE(0x055f, 0x0008) }, /* 1200 CU Plus */
{ USB_DEVICE(0x0ff5, 0x0010) }, /* BearPaw 1200F */
+ { USB_DEVICE(0x055f, 0x0218) }, /* BearPaw 2400 TA */
+ { USB_DEVICE(0x05d8, 0x4002) }, /* 1200 CU and 1200 UB Plus */
/* Plustek */
{ USB_DEVICE(0x07b3, 0x0017) }, /* OpticPro UT12 */
{ USB_DEVICE(0x07b3, 0x0011) }, /* OpticPro UT24 */
