From eugen@grosbein.pp.ru  Tue Aug  6 06:35:19 2002
Return-Path: <eugen@grosbein.pp.ru>
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EF33537B400
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  6 Aug 2002 06:35:18 -0700 (PDT)
Received: from grosbein.pp.ru (www2.svzserv.kemerovo.su [213.184.65.86])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3324B43E42
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  6 Aug 2002 06:35:02 -0700 (PDT)
	(envelope-from eugen@grosbein.pp.ru)
Received: from grosbein.pp.ru (smmsp@localhost [127.0.0.1])
	by grosbein.pp.ru (8.12.5/8.12.5) with ESMTP id g76DYrPl072144
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 6 Aug 2002 21:34:53 +0800 (KRAST)
	(envelope-from eugen@grosbein.pp.ru)
Received: (from eugen@localhost)
	by grosbein.pp.ru (8.12.5/8.12.5/Submit) id g76DXtnN072129;
	Tue, 6 Aug 2002 21:33:55 +0800 (KRAST)
Message-Id: <200208061333.g76DXtnN072129@grosbein.pp.ru>
Date: Tue, 6 Aug 2002 21:33:55 +0800 (KRAST)
From: Eugene Grosbein <eugen@grosbein.pp.ru>
Reply-To: Eugene Grosbein <eugen@grosbein.pp.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] Add support for Hewlett Packard ScanJet 2200C
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         41375
>Category:       kern
>Synopsis:       [PATCH] Add support for Hewlett Packard ScanJet 2200C
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    joe
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 06 06:40:01 PDT 2002
>Closed-Date:    Tue Oct 15 15:06:51 PDT 2002
>Last-Modified:  Tue Oct 15 15:06:51 PDT 2002
>Originator:     Eugene Grosbein
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
Private person
>Environment:
System: FreeBSD grosbein.pp.ru 4.6-STABLE FreeBSD 4.6-STABLE #14: Tue Aug 6 15:38:14 KRAST 2002 eu@grosbein.pp.ru:/usr/local/obj/usr/local/src/sys/DADV i386
SANE:	sane-backends-1.0.8, sane-frontends-1.0.8 from ports collection

>Description:
	uscanner(4) doesn't detect USB scanner Hewlett Packard ScanJet 2200C,
	while ugen(4) detects it. However, this model works fine with FreeBSD
	and standard SANE distribution 1.0.8 (plustek backend) if one
	add product id to uscanner(4).

>How-To-Repeat:
	Take ScanJet 2200C and boot FreeBSD 4.6-STABLE or 5.0-DP1
	with GENERIC kernel.

>Fix:

	Apply this patch. It corrects uscanner driver and its man page.
	It's for 4.6-STABLE.

Index: usbdevs.h
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/usbdevs.h,v
retrieving revision 1.32.2.25
diff -u -r1.32.2.25 usbdevs.h
--- usbdevs.h	26 Jul 2002 05:28:28 -0000	1.32.2.25
+++ usbdevs.h	6 Aug 2002 10:38:43 -0000
@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.32.2.25 2002/07/26 05:28:28 takawata Exp $	*/
+/*	$FreeBSD$	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -655,6 +655,7 @@
 #define	USB_PRODUCT_HP_3400CSE	0x0405		/* ScanJet 3400cse */
 #define	USB_PRODUCT_HP_6300C	0x0601		/* Scanjet 6300C */
 #define	USB_PRODUCT_HP_840C	0x0604		/* DeskJet 840c */
+#define	USB_PRODUCT_HP_2200C	0x0605		/* ScanJet 2200C */
 #define	USB_PRODUCT_HP_5300C	0x0701		/* Scanjet 5300C */
 #define	USB_PRODUCT_HP_970CSE	0x1004		/* Deskjet 970Cse */
 #define	USB_PRODUCT_HP_5400C	0x1005		/* Scanjet 5400C */
Index: usbdevs_data.h
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/usbdevs_data.h,v
retrieving revision 1.32.2.25
diff -u -r1.32.2.25 usbdevs_data.h
--- usbdevs_data.h	26 Jul 2002 05:28:28 -0000	1.32.2.25
+++ usbdevs_data.h	6 Aug 2002 10:40:49 -0000
@@ -1,4 +1,4 @@
-/*	$FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.32.2.25 2002/07/26 05:28:28 takawata Exp $	*/
+/*	$FreeBSD$	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -1100,6 +1100,12 @@
 	    0,
 	    "Hewlett Packard",
 	    "DeskJet 840c",
+	},
+	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_2200C,
+	    0,
+	    "Hewlett Packard",
+	    "ScanJet 2200C",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_5300C,
Index: uscanner.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/uscanner.c,v
retrieving revision 1.2.2.7
diff -u -r1.2.2.7 uscanner.c
--- uscanner.c	14 Feb 2002 02:52:50 -0000	1.2.2.7
+++ uscanner.c	6 Aug 2002 10:55:48 -0000
@@ -112,6 +112,7 @@
  {{ USB_VENDOR_KYE, USB_PRODUCT_KYE_VIVIDPRO }, 0 },
 
   /* HP */
+ {{ 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_4100C }, 0 },
Index: uscanner.4
===================================================================
RCS file: /home/ncvs/src/share/man/man4/uscanner.4,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 uscanner.4
--- uscanner.4	17 Aug 2001 13:08:40 -0000	1.1.2.3
+++ uscanner.4	6 Aug 2002 13:04:21 -0000
@@ -63,6 +63,7 @@
 .It Epson Perfection 1200U / 1200Photo
 .It Epson Expression 1600
 .It Hewlett Packard Photosmart S20
+.It Hewlett Packard Scanjet 2200C
 .It Hewlett Packard Scanjet 3300C
 .It Hewlett Packard Scanjet 4100C
 .It Hewlett Packard Scanjet 4200C
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->joe 
Responsible-Changed-By: njl 
Responsible-Changed-When: Fri Aug 23 17:23:01 PDT 2002 
Responsible-Changed-Why:  
Patch looks straightforward except he forgot usbdevs.  Perhaps direct 
user to NetBSD usb maintainer to include in main dist? 

http://www.freebsd.org/cgi/query-pr.cgi?pr=41375 
State-Changed-From-To: open->closed 
State-Changed-By: fjoe 
State-Changed-When: Tue Oct 15 15:05:49 PDT 2002 
State-Changed-Why:  
Thanks, committed to both -current (manpage) and RELENG_4 

http://www.freebsd.org/cgi/query-pr.cgi?pr=41375 
>Unformatted:
