# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.617 -> 1.618
# drivers/usb/image/scanner.c 1.21 -> 1.22
# drivers/usb/image/scanner.h 1.16 -> 1.17
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/05/31 [EMAIL PROTECTED] 1.618
# [PATCH] PATCH: USB Scanner Driver 0.4.8 and new maintainer
#
# 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.
#
# * 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]>.
# --------------------------------------------
#
diff -Nru a/drivers/usb/image/scanner.c b/drivers/usb/image/scanner.c
--- a/drivers/usb/image/scanner.c Fri May 31 16:46:56 2002
+++ b/drivers/usb/image/scanner.c Fri May 31 16:46: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
@@ -302,11 +302,24 @@
*
* 05/21/02 Currently maintained by Brian Beattie <[EMAIL PROTECTED]>
*
+ * 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:
@@ -322,6 +335,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:
*
@@ -1035,7 +1050,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 -Nru a/drivers/usb/image/scanner.h b/drivers/usb/image/scanner.h
--- a/drivers/usb/image/scanner.h Fri May 31 16:46:56 2002
+++ b/drivers/usb/image/scanner.h Fri May 31 16:46:56 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
@@ -51,7 +51,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");
@@ -144,6 +144,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 */
_______________________________________________________________
Don't miss the 2002 Sprint PCS Application Developer's Conference
August 25-28 in Las Vegas -- http://devcon.sprintpcs.com/adp/index.cfm
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
