From owner-svn-src-all@FreeBSD.ORG Wed Jul 28 16:58:36 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A8C4A1065687; Wed, 28 Jul 2010 16:58:36 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 974938FC1E; Wed, 28 Jul 2010 16:58:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6SGwajL076717; Wed, 28 Jul 2010 16:58:36 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6SGwatp076713; Wed, 28 Jul 2010 16:58:36 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201007281658.o6SGwatp076713@svn.freebsd.org> From: Gavin Atkinson Date: Wed, 28 Jul 2010 16:58:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210574 - in stable/7: share/man/man4 sys/dev/usb X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2010 16:58:36 -0000 Author: gavin Date: Wed Jul 28 16:58:36 2010 New Revision: 210574 URL: http://svn.freebsd.org/changeset/base/210574 Log: - Support the Epson RX620 and HP ScanJet 3570C scanners in uscanner(4). Direct commit to stable/7 as the uscanner driver no longer exists in head. PR: usb/121426, usb/122025 Submitted by: Greg Mars Submitted by: Bjorn Konig Modified: stable/7/share/man/man4/uscanner.4 stable/7/sys/dev/usb/usbdevs stable/7/sys/dev/usb/uscanner.c Modified: stable/7/share/man/man4/uscanner.4 ============================================================================== --- stable/7/share/man/man4/uscanner.4 Wed Jul 28 16:38:37 2010 (r210573) +++ stable/7/share/man/man4/uscanner.4 Wed Jul 28 16:58:36 2010 (r210574) @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 5, 2007 +.Dd July 28, 2010 .Dt USCANNER 4 .Os .Sh NAME @@ -103,13 +103,13 @@ Epson Perfection: 610, 636U / 636Photo, .It Epson: GT-8400UF, GT-9300UF, GT-9700F; .It -Epson Stylus: Photo RX425, CX3650, DX-5000, DX-5050, DX-6000, DX-6050 +Epson Stylus: Photo RX425, RX620, CX3650, DX-5000, DX-5050, DX-6000, DX-6050 (and possibly more in the CX-5000 and DX-3800..DX-7000 family); .It Hewlett Packard: Photosmart S20 .It Hewlett Packard Scanjet: 2200C, -3300C, 3400CSE, +3300C, 3400CSE, 3570C, 4100C, 4200C, 4300C, 5200C, 5300C, 5400C, 6200C, 6300C, Modified: stable/7/sys/dev/usb/usbdevs ============================================================================== --- stable/7/sys/dev/usb/usbdevs Wed Jul 28 16:38:37 2010 (r210573) +++ stable/7/sys/dev/usb/usbdevs Wed Jul 28 16:58:36 2010 (r210574) @@ -1255,6 +1255,7 @@ 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 RX620 0x0811 Stylus Photo RX620 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 @@ -1451,6 +1452,7 @@ product HP 930C 0x1204 DeskJet 930c product HP P2000U 0x1801 Inkjet P-2000U product HP HS2300 0x1e1d HS2300 HSDPA (aka MC8775) product HP 640C 0x2004 DeskJet 640c +product HP 3570C 0x2005 ScanJet 3570C product HP 4670V 0x3005 ScanJet 4670v product HP P1100 0x3102 Photosmart P1100 product HP OJ4215 0x3d11 OfficeJet 4215 Modified: stable/7/sys/dev/usb/uscanner.c ============================================================================== --- stable/7/sys/dev/usb/uscanner.c Wed Jul 28 16:38:37 2010 (r210573) +++ stable/7/sys/dev/usb/uscanner.c Wed Jul 28 16:58:36 2010 (r210574) @@ -129,6 +129,7 @@ static const struct uscan_info uscanner_ {{ USB_VENDOR_HP, USB_PRODUCT_HP_2200C }, 0 }, {{ USB_VENDOR_HP, USB_PRODUCT_HP_3300C }, 0 }, {{ USB_VENDOR_HP, USB_PRODUCT_HP_3400CSE }, 0 }, + {{ USB_VENDOR_HP, USB_PRODUCT_HP_3570C }, 0 }, {{ USB_VENDOR_HP, USB_PRODUCT_HP_4100C }, 0 }, {{ USB_VENDOR_HP, USB_PRODUCT_HP_4200C }, 0 }, {{ USB_VENDOR_HP, USB_PRODUCT_HP_4300C }, 0 }, @@ -202,6 +203,7 @@ static const struct uscan_info uscanner_ {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1260 }, 0 }, {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1270 }, 0 }, {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_RX425 }, 0 }, + {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_RX620 }, 0 }, {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_3200 }, USC_KEEP_OPEN }, {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9700F }, USC_KEEP_OPEN }, {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9300UF }, 0 },