Sync with NetBSD (which adds quite a few new devices), while maintaining the

products we've added locally. Hrm, only Creative Labs Nomad devices, I guess :)

1 files changed, 158 insertions, 12 deletions

diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 9cccae90a20..7fe74298084 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,5 +1,5 @@
-$OpenBSD: usbdevs,v 1.25 2000/11/08 18:12:48 aaron Exp $
-/* $NetBSD: usbdevs,v 1.88 2000/04/03 12:09:43 augustss Exp $ */
+$OpenBSD: usbdevs,v 1.26 2000/11/16 19:00:15 aaron Exp $
+/* $NetBSD: usbdevs,v 1.127 2000/11/15 14:36:09 augustss Exp $ */
 
 /*
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -21,7 +21,7 @@ $OpenBSD: usbdevs,v 1.25 2000/11/08 18:12:48 aaron Exp $
  *    must display the following acknowledgement:
  *        This product includes software developed by the NetBSD
  *        Foundation, Inc. and its contributors.
- * 4. nEITher the name of The NetBSD Foundation nor the names of its
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
  *    contributors may be used to endorse or promote products derived
  *    from this software without specific prior written permission.
  *
@@ -46,6 +46,7 @@ vendor AOX		0x03e8	AOX, Inc.
 vendor ATMEL		0x03eb	Atmel Corp.
 vendor HP		0x03f0	Hewlett Packard
 vendor ADAPTEC		0x03f3	Adaptec, Inc.
+vendor NATIONAL		0x0400	National Semiconductor
 vendor ACERLABS		0x0402	Acer Labs, Inc.
 vendor FTDI		0x0403	Future Technology Devices
 vendor NEC		0x0409	NEC
@@ -79,12 +80,29 @@ vendor LUCENT		0x047e	Lucent
 vendor STMICRO		0x0483	STMicroelectronics
 vendor COMPAQ		0x049f	Compaq Computers
 vendor ACERP		0x04a5	Acer Peripherals, Inc.
+vendor VISIONEER	0x04a7	Visioneer
 vendor CANON		0x04a9	Canon, Inc.
+vendor IBM		0x04b3	IBM Corporation
 vendor CYPRESS		0x04b4	Cypress Semiconductor
 vendor EPSON		0x04b8	Seiko Epson Corp.
+vendor RAINBOW		0x04b9	Rainbow Technologies
 vendor IODATA		0x04bb	I/O Data
 vendor 3COMUSR		0x04c1	U.S. Robotics
+vendor METHODE		0x04c2	Methode Electronics Far East PTE Ltd.
+vendor MAXISWITCH	0x04c3	Maxi Switch, Inc.
+vendor LOCKHEEDMER	0x04c4	Lockheed Martin Energy Research
+vendor FUJITSU		0x04c5	Fujitsu Ltd.
+vendor TOSHIBAAM	0x04c6	Toshiba America Electronic Components
+vendor MICROMACRO	0x04c7	Micro Macro Technologies
 vendor KONICA		0x04c8	Konica Corp.
+vendor LITEON		0x04ca	Lite-On Technology Corp.
+vendor FUJIPHOTO	0x04cb	Fuji Photo Film Co., Ltd.
+vendor PHILIPSSEMI	0x04cc	Philips Semiconductors
+vendor TATUNG		0x04cd	Tatung Co. Of America
+vendor SCANLOGIC	0x04ce	ScanLogic Corp.
+vendor MYSON		0x04cf	Myson Technology Inc.
+vendor DIGI2		0x04d0	Digi International
+vendor ITTCANON		0x04d1	ITT Canon
 vendor ALTEC		0x04d2	Altec Lansing Technologies, Inc.
 vendor SHUTTLE		0x04e6	Shuttle Technology
 vendor ANNABOOKS	0x04ed	Annabooks
@@ -104,6 +122,7 @@ vendor ATI		0x0528	ATI Technologies, Inc.
 vendor AKS		0x0529	Aladdin Knowledge Systems
 vendor UNIACCESS	0x0540	Universal Access
 vendor ANCHOR		0x0547	Anchor Chips, Inc.
+vendor SONY		0x054c	Sony Corp.
 vendor VISION		0x0553	VLSI Vision Ltd.
 vendor ASAHIKASEI	0x0556	Asahi Kasei Microsystems Co., Ltd
 vendor ATEN		0x0557	ATEN International Co. Ltd.
@@ -120,10 +139,12 @@ vendor YEDATA		0x057b	Y-E Data
 vendor AVM		0x057c	AVM GmbH
 vendor QUICKSHOT	0x057f	Quickshot
 vendor ROCKFIRE		0x0583	Rockfire
+vendor ZYXEL		0x0586	ZyXEL Communication Co.
 vendor ALCOR		0x058f	Alcor Micro, Inc.
 vendor IOMEGA		0x059b	Iomega Corp.
 vendor ATREND		0x059c	A-Trend Technology Co., Ltd.
 vendor AID		0x059d	Advanced Input Devices
+vendor LACIE		0x059f	LaCie
 vendor OMNIVISION	0x05a9	OmniVision
 vendor INSYSTEM		0x05ab	In-System Design
 vendor APPLE		0x05ac	Apple Computer
@@ -132,8 +153,14 @@ vendor QTRONIX		0x05c7	Qtronix Corp
 vendor ELSA		0x05cc	ELSA Gmbh
 vendor BRAINBOXES	0x05d1	Brainboxes Limited
 vendor AXIOHM		0x05d9	Axiohm Transaction Solutions
+vendor MICROTEK		0x05da	Microtek
+vendor SYMBOL		0x05e0	Symbol Technologies
+vendor GENESYS		0x05e3	Genesys Logic, Inc.
+vendor FUJI		0x05e5	Fuji Electric Co., Ltd.
+vendor KEITHLEY		0x05e6	Keithley Instruments
 vendor EIZONANAO	0x05e7	EIZO Nanao
 vendor KLSI		0x05e9	Kawasaki LSI
+vendor FFC		0x05eb	FFC Limited
 vendor ANKO		0x05ef	Anko Electronic Co., Ltd.
 vendor PIENGINEERING	0x05f3	P.I. Engineering
 vendor AOC		0x05f6	AOC International
@@ -170,15 +197,19 @@ vendor SMC		0x0707	Standard Microsystems Corp
 vendor MCT		0x0711	MCT Corp.
 vendor AUREAL		0x0755	Aureal Semiconductor
 vendor MIDIMAN		0x0763	Midiman
+vendor GRIFFIN		0x077d	Griffin Technology, Inc.
 vendor SANDISK		0x0781	SanDisk Corp
 vendor BRIMAX		0x078e	Brimax, Inc.
 vendor AXIS		0x0792	Axis Communications AB
 vendor ABL		0x0794	ABL Electronics Corp.
 vendor ALFADATA		0x079d	Alfadata Computer Corp.
+vendor NATIONALTECH	0x07a2	National Technical Systems
+vendor ONNTO		0x07a3	Onnto Corp.
 vendor BE		0x07a4	Be, Inc.
 vendor ADMTEK		0x07a6	ADMtek, Inc.
 vendor COREGA		0x07aa	Corega
 vendor FREECOM		0x07ab	Freecom
+vendor MICROTECH	0x07af	Microtech
 vendor ABOCOM		0x07b8	AboCom Systems, Inc.
 vendor KEISOKUGIKEN	0x07c1	Keisokugiken Corp.
 vendor APG		0x07c5	APG Cash Drawer
@@ -212,6 +243,7 @@ vendor EXTENDED		0x08e9	Extended Systems, Inc.
 vendor AUTHENTEC	0x08ff	AuthenTec, Inc.
 vendor ALATION		0x0910	Alation Systems, Inc.
 vendor BIOMETRIC	0x0929	American Biometric Company
+vendor YANO		0x094f	Yano
 vendor KINGSTON		0x0951	Kingston Technology
 vendor BLUEWATER	0x0956	BlueWater Systems, Inc.
 vendor AGILENT		0x0957	Agilent Technologies, Inc.
@@ -228,17 +260,21 @@ vendor AKAI		0x09e8	AKAI professional M.I. Corp.
 vendor ARESCOM		0x09f5	ARESCOM
 vendor BAY		0x09f9	Bay Associates
 vendor ALTERA		0x09fb	Altera
+vendor TREK		0x0a16	Trek Technology
 vendor ASAHIOPTICAL	0x0a17	Asahi Optical Co., Ltd.
 vendor BOCASYSTEMS	0x0a43	Boca Systems, Inc.
 vendor BROADCOM		0x0a5c	Broadcom Corp.
 vendor GEOCAST		0x0a79	Geocast Network Systems
 vendor MOTOROLA		0x1063	Motorola
 vendor PLX		0x10b5	PLX
+vendor BELKIN2		0x1293	Belkin Components (2nd)
+vendor UMAX		0x1606	UMAX Data Systems, Inc.
 vendor INSIDEOUT	0x1608	Inside Out Networks
 vendor ENTREGA		0x1645	Entrega
 vendor ACTIONTEC	0x1668	Actiontec Electronics, Inc.
 vendor DLINK		0x2001	D-Link Corp
 vendor INTEL		0x8086	Intel
+vendor HP2		0xf003	Hewlett Packard
 
 /*
  * List of known products.  Grouped by vendor.
@@ -259,6 +295,9 @@ product 3COMUSR USR56K		0x3021	U.S.Robotics 56000 Voice Faxmodem Pro
 
 /* Acer Peripherals, Inc. products */
 product ACERP ACERSCAN_C310U	0x12a6	Acerscan C310U
+product ACERP ACERSCAN_320U	0x2022	Acerscan 320U
+product ACERP ACERSCAN_640U	0x2040	Acerscan 640U
+product ACERP ACERSCAN_620U	0x2060	Acerscan 620U
 
 /* ActiveWire, Inc. products */
 product ACTIVEWIRE IOBOARD	0x0100	I/O Board
@@ -273,12 +312,22 @@ product ADS UBS10BT		0x0008	UBS-10BT Ethernet adapter
 /* Agiler products */
 product ELECOM MOUSE29UO	0x0002	mouse 29UO
 
+/* AGFA products */
+product AGFA SNAPSCAN1212U	0x0001	SnapScan 1212U
+product AGFA SNAPSCANTOUCH	0x0100	SnapScan Touch
+product AGFA SNAPSCAN1212U2	0x2061	SnapScan 1212U
+
 /* AKS products */
 product AKS USBHASP		0x0001	USB-HASP 0.06
 
 /* Alcor Micro, Inc. products */
 product ALCOR2 KBD_HUB		0x2802	Kbd Hub
 
+product ALCOR MA_KBD_HUB	0x9213	MacAlly Kbd Hub
+product ALCOR AU9814		0x9215	AU9814 Hub
+product ALCOR SM_KBD		0x9410	MicroConnectors/StrongMan Keyboard
+product ALCOR NEC_KBD_HUB	0x9472	NEC Kbd Hub
+
 /* Altec Lansing products */
 product ALTEC ADA70		0x0070	ADA70 Speakers
 product ALTEC ASC495		0xff05	ASC495 Speakers
@@ -288,16 +337,26 @@ product APC UPSPRO500		0x0002	Back-UPS Pro 500
 
 /* Anchor products */
 product ANCHOR EZUSB		0x2131	EZUSB
+product ANCHOR EZLINK		0x2720	EZLINK
 
 /* AOX, Inc. products */
 product AOX USB101		0x0008	USB ethernet controller engine
 
+/* Apple Computer products */
+product APPLE OPTMOUSE		0x0302	Optical mouse
+product APPLE SPEAKERS		0x1101	Speakers
+
 /* ATen products */
 product ATEN UC1284		0x2001	Parallel printer adapter
 product ATEN UC10T		0x2002	10Mbps ethernet adapter
+product ATEN UC232A		0x2008	Serial adapter
+
+/* Avision products */
+product AVISION 1200U		0x0268	1200U scanner
 
 /* Belkin products */
 /*product BELKIN F5U111		0x????	F5U111 Ethernet adapter*/
+product BELKIN2 F5U002		0x0002	F5U002 Parallel printer adapter
 
 /* Billionton products */
 product BILLIONTON USB100	0x0986	USB100N 10/100 FastEthernet Adapter
@@ -385,11 +444,17 @@ product ENTREGA CENTRONICS	0x0006	Centronics connector
 product ENTREGA 1S9		0x0093	1S9 serial connector
 product ENTREGA EZUSB		0x8000	EZ-USB
 /*product ENTREGA SERIAL	0x8001	DB25 Serial connector*/
+product ENTREGA 2U4S		0x8004  2U4S serial connector/usb hub
 /*product ENTREGA SERIAL_DB9	0x8093	DB9 Serial connector*/
 
 /* Epson products */
+product EPSON PRINTER1		0x0001	USB Printer
 product EPSON PRINTER2		0x0002	ISD USB Smart Cable for Mac
 product EPSON PRINTER3		0x0003	ISD USB Smart Cable
+product EPSON 636		0x0101	Perfection 636U / 636Photo scanner
+product EPSON 610		0x0103	Perfection 610 scanner
+product EPSON 1200		0x0104	Perfection 1200U / 1200Photo scanner
+product EPSON 1600		0x0107	Expression 1600
 
 /* e-TEK Labs products */
 product ETEK 1COM		0x8007	Serial port
@@ -400,12 +465,18 @@ product EXTENDED XTNDACCESS	0x0100	XTNDAccess IrDA
 /* Gravis products */
 product GRAVIS GAMEPADPRO	0x4001	GamePad Pro
 
+/* Griffin Technology */
+product GRIFFIN IMATE		0x0405	iMate, ABD adapter
+
 /* Freecom products */
 product FREECOM DVD		0xfc01	Connector for DVD drive
 
 /* Future Technology Devices products */
 product FTDI SERIAL		0x8372	Serial converter
 
+/* Fuji photo products */
+product FUJIPHOTO MASS0100	0x0100	Mass Storage
+
 /* Handspring, Inc. */
 product HANDSPRING VISOR	0x0100	Handspring Visor
 
@@ -416,18 +487,26 @@ product HP 4200C		0x0105	ScanJet 4200C
 product HP 6200C		0x0201	ScanJet 6200C
 product HP S20b			0x0202	PhotoSmart S20
 product HP 3300C		0x0205	ScanJet 3300C
-product HP 5200			0x0401	Scanjet 5200
+product HP 5200C		0x0401	Scanjet 5200C
 product HP 6300C		0x0601	Scanjet 6300C
+product HP 5300C		0x0701	Scanjet 5300C
 product HP 970CSE		0x1004	Deskjet 970Cse
 product HP P1100		0x3102	Photosmart P1100
 
+/* HP products */
+product HP2 C500		0x6002	PhotoSmart C500
+
+/* IBM Corporation */
+product IBM USBCDROMDRIVE	0x4427	USB CD-ROM Drive
+
 /* Inside Out Networks products */
 product INSIDEOUT EDGEPORT4	0x0001	EdgePort/4 serial ports
 
 /* In-System products */
 product INSYSTEM F5U002		0x0002	Parallel printer adapter
-product INSYSTEM ISD110		0x0200  IDE adapter ISD110
-product INSYSTEM ISD105		0x0202  IDE adapter ISD105
+product INSYSTEM ISD110		0x0200	IDE adapter ISD110
+product INSYSTEM ISD105		0x0202	IDE adapter ISD105
+product INSYSTEM USBCABLE	0x081a	USB cable
 
 /* Intel products */
 product INTEL TESTBOARD		0x9890	82930 test board
@@ -473,6 +552,10 @@ product KONICA CAMERA		0x0720	Digital Color Camera
 product KYE NICHE		0x0001	Niche mouse
 product KYE NETSCROLL		0x0003	Genius NetScroll mouse
 product KYE FLIGHT2000		0x1004	Flight 2000 joystick
+product KYE VIVIDPRO		0x2001	ColorPage Vivid-Pro scanner
+
+/* LaCie products */
+product LACIE CDRW		0xa602	CD R/W
 
 /* Lexmark products */
 product LEXMARK S2450		0x0009	Optra S 2450
@@ -495,6 +578,7 @@ product LOGITECH N43		0xc000	N43
 product LOGITECH N48		0xc001	N48 mouse
 product LOGITECH MBA47		0xc002	M-BA47 mouse
 product LOGITECH WMMOUSE	0xc004	WingMan Gaming Mouse
+product LOGITECH BB13		0xc401	USB-PS/2 Trackball
 product LOGITECH WMPAD		0xc208	WingMan GamePad Extreme
 product LOGITECH WMJOY		0xc281	WingMan Force joystick 
 product LOGITECH QUICKCAMPRO2	0xd001	QuickCam Pro
@@ -524,6 +608,15 @@ product MICROSOFT SIDEWINDER	0x001a	Sidewinder Precision Racing Wheel
 product MICROSOFT INTELLIEYE	0x0025	IntelliEye mouse
 product MICROSOFT INETPRO	0x002b	Internet Keyboard Pro
 
+/* Microtek products */
+product MICROTEK X6U		0x0099	ScanMaker X6 - X6U
+product MICROTEK 336CX		0x0094	Phantom 336CX - C3 scanner
+product MICROTEK 336CX2		0x00a0	Phantom 336CX - C3 scanner
+product MICROTEK C6		0x009a	Phantom C6 scanner
+product MICROTEK V6USL		0x00a3	ScanMaker V6USL
+product MICROTEK V6USL2		0x80a3	ScanMaker V6USL
+product MICROTEK V6UL		0x80ac	ScanMaker V6UL
+
 /* Midiman products */
 product MIDIMAN MIDISPORT2X2	0x1001	Midisport 2x2
 
@@ -534,8 +627,15 @@ product MOTOROLA MC141555	0x1555	MC141555 hub controller
 product MULTITECH ATLAS		0xf101	MT5634ZBA-USB modem
 
 /* Mustek products */
+product MUSTEK 1200CU		0x0001	1200 CU scanner
+product MUSTEK 600CU		0x0002	600 CU scanner
+product MUSTEK 1200USB		0x0003	1200 USB scanner
+product MUSTEK 1200UB		0x0006	1200 UB scanner
 product MUSTEK MDC800		0xa800	MDC-800 digital camera
 
+/* National Semiconductor */
+product NATIONAL BEARPAW	0x1000	BearPaw 1200
+
 /* NEC products */
 product NEC HUB			0x55aa	hub
 product NEC HUB_B		0x55ab	hub
@@ -573,6 +673,18 @@ product PIENGINEERING PS2USB	0x020b	PS2 to Mac USB Adapter
 product PLX TESTBOARD		0x9060	test board
 
 /* Primax products */
+product PRIMAX G2X300		0x0300	G2-200 scanner
+product PRIMAX G2E300		0x0301	G2E-300 scanner
+product PRIMAX G2300		0x0302	G2-300 scanner
+product PRIMAX G2E3002		0x0303	G2E-300 scanner
+product PRIMAX 9600		0x0340	Colorado USB 9600 scanner
+product PRIMAX 600U		0x0341	Colorado 600u scanner
+product PRIMAX 19200		0x0360	Colorado USB 19200 scanner
+product PRIMAX 1200U		0x0361	Colorado 1200u scanner
+product PRIMAX G600		0x0380	G2-600 scanner
+product PRIMAX 636I		0x0381	ReadyScan 636i
+product PRIMAX G2600		0x0382	G2-600 scanner
+product PRIMAX G2E600		0x0383	G2E-600 scanner
 product PRIMAX COMFORT		0x4d01	Comfort
 product PRIMAX MOUSEINABOX	0x4d02	Mouse-in-a-Box
 product PRIMAX PCGAUMS1		0x4d04	Sony PCGA-UMS1
@@ -580,16 +692,20 @@ product PRIMAX PCGAUMS1		0x4d04	Sony PCGA-UMS1
 /* Prolific products */
 product PROLIFIC PL2301		0x0000	PL2301 Host-Host interface
 product PROLIFIC PL2302		0x0001	PL2302 Host-Host interface
+product PROLIFIC ATAPI4		0x2307	ATAPI-4 Bridge Controller
+
+/* Qtronix products */
+product QTRONIX 980N		0x2011	Scorpion-980N keyboard
 
 /* Quickshot products */
 product QUICKSHOT STRIKEPAD	0x6238	USB StrikePad
 
+/* Rainbow Technologies products */
+product	RAINBOW IKEY2000	0x1200	i-Key 2000  
+
 /* Rockfire products */
 product ROCKFIRE GAMEPAD	0x2033	gamepad 203USB
 
-/* Qtronix products */
-product QTRONIX 980N		0x2011	Scorpion-980N keyboard
-
 /* SanDisk products */
 product SANDISK IMAGEMATE	0x0001	USB ImageMate
 
@@ -612,6 +728,10 @@ product SMC 2202USB		0x0200	10/100 ethernet adapter
 /* SOLID YEAR products */
 product SOLIDYEAR KEYBOARD	0x2101	Solid Year USB keyboard
 
+/* SONY products */
+product SONY DSC		0x0010	Sony DSC cameras
+product SONY MSC		0x0032	Sony MSC memory stick slot
+
 /* STMicroelectronics products */
 product STMICRO COMMUNICATOR	0x7554	USB Communicator
 
@@ -619,9 +739,11 @@ product STMICRO COMMUNICATOR	0x7554	USB Communicator
 product SUN KEYBOARD		0x0005	Type 6 USB
 /* XXX The above is a North American PC style keyboard possibly */
 
-/* Diamond (Supra) products */
-product	DIAMOND2 RIO600USB	0x5001	Rio 600 USB
-
+/* Supra products */
+product DIAMOND2 SUPRAEXPRESS56K 0x07da	Supra Express 56K modem
+product DIAMOND2 SUPRA2890	0x0b4a	SupraMax 2890 56K Modem
+product DIAMOND2 RIO600USB	0x5001	Rio 600 USB
+ 
 /* TEAC products */
 product TEAC FD05PUB		0x0000	FD-05PUB floppy
 
@@ -634,12 +756,30 @@ product TI UTUSB41		0x1446	UT-USB41 hub
 /* Thrustmaster products */
 product THRUST FUSION_PAD	0xa0a3	Fusion Digital Gamepad
 
+/* Trek Technology products */
+product TREK THUMBDRIVE		0x1111	ThumbDrive
+
+/* UMAX products */
+product UMAX ASTRA1236U		0x0002	Astra 1236U Scanner
+product UMAX ASTRA1220U		0x0010	Astra 1220U Scanner
+product UMAX ASTRA2000U		0x0030	Astra 2000U Scanner
+product UMAX ASTRA2100U		0x0130	Astra 2100U Scanner
+product UMAX ASTRA2200U		0x0230	Astra 2200U Scanner
+
 /* Universal Access products */
 product UNIACCESS PANACHE	0x0101	Panache Surf USB ISDN Adapter
 
 /* Vision products */
 product VISION VC6452V002	0x0002	CPiA Camera
 
+/* Visioneer products */
+product VISIONEER 7600		0x0211	OneTouch 7600
+product VISIONEER 5300		0x0221	OneTouch 5300
+product VISIONEER 6100		0x0231	OneTouch 6100
+product VISIONEER 6200		0x0311	OneTouch 6200
+product VISIONEER 8100		0x0321	OneTouch 8100
+product VISIONEER 8600		0x0331	OneTouch 8600
+								       
 /* Wacom products */
 product WACOM CT0405U		0x0000	CT-0405-U Tablet
 product WACOM GRAPHIRE		0x0010	Graphire
@@ -648,5 +788,11 @@ product WACOM INTUOSA5		0x0021	Intuos A5
 /* Y-E Data products */
 product YEDATA FLASHBUSTERU	0x0000	Flashbuster-U
 
+/* Yano products */
+product YANO U640MO		0x0101	U640MO-03
+
 /* Zoom Telephonics, Inc. products */
 product ZOOM 2986L		0x9700	2986L Fax modem
+
+/* ZyXEL Communication Co. products */
+product ZYXEL 980N		0x2011	Scorpion-980N keyboard