From owner-svn-src-head@FreeBSD.ORG Wed Dec 31 14:25:15 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 2B7DE1065674;
Wed, 31 Dec 2008 14:25:15 +0000 (UTC)
(envelope-from luigi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 17F0E8FC1B;
Wed, 31 Dec 2008 14:25:15 +0000 (UTC)
(envelope-from luigi@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBVEPEcC027950;
Wed, 31 Dec 2008 14:25:14 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBVEPElm027948;
Wed, 31 Dec 2008 14:25:14 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <200812311425.mBVEPElm027948@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Wed, 31 Dec 2008 14:25:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r186651 - head/sys/dev/usb
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 31 Dec 2008 14:25:15 -0000
Author: luigi
Date: Wed Dec 31 14:25:14 2008
New Revision: 186651
URL: http://svn.freebsd.org/changeset/base/186651
Log:
add some USB scanner IDs for recent Epson multifunction devices.
Add support to uscanner.c for known-working devices
(the same should be done for uscanner2.c).
Waiting for 7.1 to be released before the merge.
MFC after: 3 weeks
Modified:
head/sys/dev/usb/usbdevs
head/sys/dev/usb/uscanner.c
Modified: head/sys/dev/usb/usbdevs
==============================================================================
--- head/sys/dev/usb/usbdevs Wed Dec 31 13:56:31 2008 (r186650)
+++ head/sys/dev/usb/usbdevs Wed Dec 31 14:25:14 2008 (r186651)
@@ -1239,12 +1239,18 @@ product EPSON STYLUS_895 0x0602 Stylus P
product EPSON CX5400 0x0808 CX5400 scanner
product EPSON 3500 0x080e CX-3500/3600/3650 MFP
product EPSON RX425 0x080f Stylus Photo RX425 scanner
-product EPSON 4800 0x0819 CX4800 MP scanner
-product EPSON 4200 0x0820 CX4200 MP scanner
-product EPSON 5000 0x082b DX-50x0 MFP scanner
-product EPSON 6000 0x082e DX-60x0 MFP scanner
-product EPSON DX7400 0x0838 DX7400/CX7300 scanner
-product EPSON DX8400 0x0839 DX8400 scanner
+product EPSON DX3800 0x0818 CX3700/CX3800/DX38x0 MFP scanner
+product EPSON 4800 0x0819 CX4700/CX4800/DX48x0 MFP scanner
+product EPSON 4200 0x0820 CX4100/CX4200/DX4200 MFP scanner
+product EPSON 5000 0x082b CX4900/CX5000/DX50x0 MFP scanner
+product EPSON 6000 0x082e CX5900/CX6000/DX60x0 MFP scanner
+product EPSON DX4000 0x082f DX4000 MFP scanner
+product EPSON DX7400 0x0838 CX7300/CX7400/DX7400 MFP scanner
+product EPSON DX8400 0x0839 CX8300/CX8400/DX8400 MFP scanner
+product EPSON SX100 0x0841 SX100/NX100 MFP scanner
+product EPSON NX300 0x0848 NX300 MFP scanner
+product EPSON SX200 0x0849 SX200/SX205 MFP scanner
+product EPSON SX400 0x084a SX400/NX400/TX400 MFP scanner
/* e-TEK Labs products */
product ETEK 1COM 0x8007 Serial
Modified: head/sys/dev/usb/uscanner.c
==============================================================================
--- head/sys/dev/usb/uscanner.c Wed Dec 31 13:56:31 2008 (r186650)
+++ head/sys/dev/usb/uscanner.c Wed Dec 31 14:25:14 2008 (r186651)
@@ -90,6 +90,15 @@ struct uscan_info {
/* Table of scanners that may work with this driver. */
static const struct uscan_info uscanner_devs[] = {
+
+ /*
+ * These first two entries are duplicates of known-working units,
+ * so one can patch them to test support for newer devices
+ * without rebuilding the module.
+ */
+ {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_6000 }, 0 }, /* duplicate */
+ {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_6000 }, 0 }, /* duplicate */
+
/* Acer Peripherals */
{{ USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_320U }, 0 },
{{ USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_4300U }, 0 },
@@ -217,6 +226,12 @@ static const struct uscan_info uscanner_
{{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_CX5400 }, 0 },
{{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX7400 }, 0 },
{{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX8400 }, 0 },
+ {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_CX5400 }, 0 },
+ {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX3800 }, 0 },
+ {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_DX4000 }, 0 },
+ {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_NX300 }, 0 },
+ {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_SX200 }, 0 },
+ {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_SX400 }, 0 },
/* UMAX */
{{ USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1220U }, 0 },