Sync with NetBSD. More ids, more!

1 files changed, 63 insertions, 14 deletions

diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index a6de708..883c46d 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -62,7 +62,7 @@ vendor THRUST		0x044f	Thrustmaster
 vendor TI		0x0451	Texas Instruments
 vendor ANALOGDEVICES	0x0456	Analog Devices, Inc.
 vendor KYE		0x0458	KYE Systems Corp.
-vendor SUPRA		0x045a	Supra
+vendor DIAMOND2	0x045a	Diamond (Supra)
 vendor MICROSOFT	0x045e	Microsoft
 vendor PRIMAX		0x0461	Primax Electronics
 vendor AMP		0x0464	AMP, Inc.
@@ -77,14 +77,29 @@ vendor LUCENT		0x047e	Lucent
 vendor STMICRO		0x0483	STMicroelectronics
 vendor COMPAQ		0x049f	Compaq Computers
 vendor ACERP		0x04a5	Acer Peripherals, Inc.
-vendor CANON		0x04a9	Canon, 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
@@ -126,6 +141,7 @@ 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
@@ -135,8 +151,13 @@ 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
@@ -173,15 +194,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
@@ -230,13 +255,14 @@ 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 (second entry)
+vendor BELKIN2		0x1293	Belkin Components (2nd)
 vendor UMAX		0x1606	UMAX Data Systems, Inc.
 vendor INSIDEOUT	0x1608	Inside Out Networks
 vendor ENTREGA		0x1645	Entrega
@@ -263,6 +289,7 @@ 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
 
@@ -281,8 +308,8 @@ product ELECOM MOUSE29UO	0x0002	mouse 29UO
 
 /* AGFA products */
 product AGFA SNAPSCAN1212U	0x0001	SnapScan 1212U
-product AGFA SNAPSCAN1212U2	0x2061	SnapScan 1212U
 product AGFA SNAPSCANTOUCH	0x0100	SnapScan Touch
+product AGFA SNAPSCAN1212U2	0x2061	SnapScan 1212U
 
 /* AKS products */
 product AKS USBHASP		0x0001	USB-HASP 0.06
@@ -309,6 +336,9 @@ product ANCHOR EZLINK		0x2720	EZLINK
 /* AOX, Inc. products */
 product AOX USB101		0x0008	USB ethernet controller engine
 
+/* Apple Computer products */
+product APPLE SPEAKERS		0x1101	Speakers
+
 /* ATen products */
 product ATEN UC1284		0x2001	Parallel printer adapter
 product ATEN UC10T		0x2002	10Mbps ethernet adapter
@@ -403,13 +433,14 @@ 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	2 USB + 4 serial ports
+product ENTREGA 2U4S		0x8004  2U4S serial connector/usb hub
 /*product ENTREGA SERIAL_DB9	0x8093	DB9 Serial connector*/
 
 /* e-TEK Labs products */
 product ETEK 1COM		0x8007	Serial port
 
 /* 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
@@ -425,6 +456,9 @@ 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
 
@@ -501,6 +535,9 @@ 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
 
@@ -522,6 +559,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
@@ -567,8 +605,8 @@ product MOTOROLA MC141555	0x1555	MC141555 hub controller
 product MULTITECH ATLAS		0xf101	MT5634ZBA-USB modem
 
 /* Mustek products */
-product MUSTEK MDC800		0xa800	MDC-800 digital camera
 product MUSTEK 1200CU		0x0001	1200 CU scanner
+product MUSTEK MDC800		0xa800	MDC-800 digital camera
 
 /* NEC products */
 product NEC HUB			0x55aa	hub
@@ -607,28 +645,34 @@ product PIENGINEERING PS2USB	0x020b	PS2 to Mac USB Adapter
 product PLX TESTBOARD		0x9060	test board
 
 /* Primax products */
-product PRIMAX COMFORT		0x4d01	Comfort
-product PRIMAX MOUSEINABOX	0x4d02	Mouse-in-a-Box
-product PRIMAX PCGAUMS1		0x4d04	Sony PCGA-UMS1
 product PRIMAX G2E300		0x0301	G2E-300 scanner
-product PRIMAX 636I		0x0381	ReadyScan 636i
 product PRIMAX G2300		0x0302	G2-300 scanner
-product PRIMAX G2600		0x0382	G2-600 scanner
 product PRIMAX G2E3002		0x0303	G2E-300 scanner
-product PRIMAX G2E600		0x0383	G2E-600 scanner
 product PRIMAX 9600		0x0340	Colorado USB 9600 scanner
-product PRIMAX 19200		0x0360	Colorado USB 19200 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 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
 
 /* 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
 
@@ -668,7 +712,9 @@ product SUN KEYBOARD		0x0005	Type 6 USB
 /* XXX The above is a North American PC style keyboard possibly */
 
 /* Supra products */
-product SUPRA SUPRAEXPRESS56K	0x07da	Supra Express 56K modem
+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
@@ -682,6 +728,9 @@ 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