usb/98908: Update usb drivers for modems and scanner

[Michael Collette]

>Number:         98908
>Category:       usb
>Synopsis:       Update usb drivers for modems and scanner
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-usb
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 13 18:20:17 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Michael Collette
>Release:        6-STABLE
>Organization:
>Environment:
6.1-STABLE #1: Fri Jun  2 13:10:13 PDT 2006
>Description:
Requesting an update for usbdevs to properly recognize:

Hp 8200 Series Scanjet Scanners
Curitel PC5740 Wireless Modem (Verizon's PCMCIA card)
Sierra MC5720 Wireless Modem (Built in to Thinkpad X60s)

An update to uscanner.c for the 8200 Scanjet
An update to umodem.c for the 2 wireless modems

Notes:
The uscanner.c patch is just the first step in getting the 8200 to
work properly with the sane-backends.  A patch to the port is also
required.

The Curitel modem works great, but there's a catch.  If you pull the
card out while the system is up you get a kernel panic.  I seem to
recall this being documented in another PR, but I couldn't locate it
for this PR.  This lockup occurs whether or not the attached patch is
applied.

I haven't yet had a chance to fully test the Sierra modem.  I believe
I need to enable it in Windows before it will properly show up as a
com device.  I didn't want to have to pay for another service at this
point while I have a working Curitel card.  I have included here so at
least the basics are in place.
>How-To-Repeat:

>Fix:
--- usbdevs.orig	Tue Jun 13 10:06:27 2006
+++ usbdevs	Tue Jun 13 10:22:10 2006
@@ -489,6 +489,7 @@
 vendor GIGABYTE		0x1044	GIGABYTE
 vendor WESTERN		0x1058	Western Digital
 vendor MOTOROLA		0x1063	Motorola
+vendor CURITEL		0x106c	Curitel Communications Inc
 vendor CCYU		0x1065	CCYU
 vendor PLX		0x10b5	PLX
 vendor ASANTE		0x10bd	Asante
@@ -496,6 +497,7 @@
 vendor DELORME		0x1163	DeLorme
 vendor SERVERWORKS	0x1166	ServerWorks
 vendor ACERCM		0x1189	Acer Communications & Multimedia
+vendor SIERRA		0x1199	Sierra Wireless
 vendor TWINMOS		0x126f	TwinMOS
 vendor TSUNAMI		0x1241	Tsunami
 vendor CREATIVE2	0x1292	Creative Labs
@@ -765,6 +767,9 @@
 /* CTX products */
 product CTX EX1300		0x9999	Ex1300 hub
 
+/* Curitel products */
+product CURITEL PC5740		0x3701	Broadband wireless modem
+
 /* Cypress Semiconductor products */
 product CYPRESS MOUSE		0x0001	mouse
 product CYPRESS THERMO		0x0002	thermometer
@@ -966,6 +971,7 @@
 product HP 2200C		0x0605	ScanJet 2200C
 product HP 5300C		0x0701	Scanjet 5300C
 product HP 4400C		0x0705	Scanjet 4400C
+product HP 8200 		0x0b01	Scanjet 8200
 product HP 2300D 		0x0b17	Laserjet 2300d
 product HP 970CSE		0x1004	Deskjet 970Cse
 product HP 5400C		0x1005	Scanjet 5400C
@@ -1431,6 +1437,9 @@
 
 /* Siemens products */
 product SIEMENS SPEEDSTREAM	0x1001	SpeedStream USB
+
+/* Sierra Wireless products */
+product SIERRA MC5720		0x0218	MC5720 Wireless Modem
 
 /* Sigmatel products */
 product SIGMATEL I_BEAD100	0x8008	i-Bead 100 MP3 Player


--- uscanner.c.orig	Tue Jun 13 10:29:01 2006
+++ uscanner.c	Tue Jun 13 10:29:08 2006
@@ -144,6 +144,7 @@
  {{ USB_VENDOR_HP, USB_PRODUCT_HP_5400C }, 0 },
  {{ USB_VENDOR_HP, USB_PRODUCT_HP_6200C }, 0 },
  {{ USB_VENDOR_HP, USB_PRODUCT_HP_6300C }, 0 },
+ {{ USB_VENDOR_HP, USB_PRODUCT_HP_8200 }, 0 },
 
   /* Microtek */
  {{ USB_VENDOR_SCANLOGIC, USB_PRODUCT_SCANLOGIC_336CX }, 0 },

--- umodem.c.orig	Tue Jun 13 10:07:02 2006
+++ umodem.c	Tue Jun 13 10:09:59 2006
@@ -125,6 +125,8 @@
 } umodem_products[] = {
 	/* Kyocera AH-K3001V*/
 	{ USB_VENDOR_KYOCERA, USB_PRODUCT_KYOCERA_AHK3001V, 0 },
+	{ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_MC5720, 0 },
+	{ USB_VENDOR_CURITEL, USB_PRODUCT_CURITEL_PC5740, 0 },
 	{ 0, 0, 0 },
 };
>Release-Note:
>Audit-Trail:
>Unformatted: