A bunch of usb devices from netbsd

1 files changed, 89 insertions, 6 deletions

diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 9a2593db10e..84d730947d3 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,5 +1,5 @@
-$OpenBSD: usbdevs,v 1.60 2003/03/14 18:04:23 todd Exp $
-/* $NetBSD: usbdevs,v 1.280 2002/11/05 12:13:40 cjs Exp $ */
+$OpenBSD: usbdevs,v 1.61 2003/05/16 17:54:07 nate Exp $
+/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
 /*
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -92,9 +92,11 @@ vendor MEGATRENDS	0x046b	American Megatrends
 vendor LOGITECH		0x046d	Logitech
 vendor BTC		0x046e	Behavior Tech. Computer
 vendor PHILIPS		0x0471	Philips
+vendor SANYO		0x0474	Sanyo Electric
 vendor CONNECTIX	0x0478	Connectix
 vendor KENSINGTON	0x047d	Kensington
 vendor LUCENT		0x047e	Lucent
+vendor PLANTRONICS	0x047f	Plantronics
 vendor STMICRO		0x0483	STMicroelectronics
 vendor YAMAHA		0x0499	YAMAHA
 vendor COMPAQ		0x049f	Compaq
@@ -216,7 +218,7 @@ vendor AIWA		0x0677	Aiwa
 vendor ACARD		0x0678	ACARD Technology
 vendor PROLIFIC		0x067b	Prolific Technology
 vendor SIEMENS		0x067c	Siemens
-vendor ADVANCELOGIC	0x0680	Avance Logic
+vendor AVANCELOGIC	0x0680	Avance Logic
 vendor MINOLTA		0x0686	Minolta
 vendor CHPRODUCTS	0x068e	CH Products
 vendor HAGIWARA		0x0693	Hagiwara Sys-Com
@@ -241,12 +243,14 @@ vendor MCT		0x0711	MCT
 vendor DIGITALSTREAM	0x074e	Digital Stream
 vendor AUREAL		0x0755	Aureal Semiconductor
 vendor MIDIMAN		0x0763	Midiman
+vendor LINKSYS2		0x077b	Linksys
 vendor GRIFFIN		0x077d	Griffin Technology
 vendor SANDISK		0x0781	SanDisk
 vendor JENOPTIK		0x0784  Jenoptik
 vendor BRIMAX		0x078e	Brimax
 vendor AXIS		0x0792	Axis Communications
 vendor ABL		0x0794	ABL Electronics
+vendor SUNCOMM		0x079c	Sun Communications, Inc.
 vendor ALFADATA		0x079d	Alfadata Computer
 vendor NATIONALTECH	0x07a2	National Technical Systems
 vendor ONNTO		0x07a3	Onnto
@@ -319,6 +323,7 @@ vendor AKAI		0x09e8	AKAI professional M.I.
 vendor ARESCOM		0x09f5	ARESCOM
 vendor BAY		0x09f9	Bay Associates
 vendor ALTERA		0x09fb	Altera
+vendor CSR		0x0a12	Cambridge Silicon Radio
 vendor TREK		0x0a16	Trek Technology
 vendor ASAHIOPTICAL	0x0a17	Asahi Optical
 vendor BOCASYSTEMS	0x0a43	Boca Systems
@@ -330,6 +335,7 @@ vendor TODOS		0x0b0c	Todos Data System
 vendor NEC2		0x0b62	NEC
 vendor ATI2		0x0b6f	ATI
 vendor KURUSUGAWA	0x0b7e	Kurusugawa Electronics, Inc.
+vendor ASIX		0x0b95	ASIX Electronics
 vendor GREENHOUSE2	0x0bda	GREENHOUSE
 vendor ADDONICS2	0x0bf6	Addonics Technology
 vendor AGATE		0x0c08	Agate Technologies
@@ -337,10 +343,14 @@ vendor DMI		0x0c0b	DMI
 vendor EASYDISK		0x0c76	EasyDisk
 vendor TANGTOP		0x0d3d	Tangtop
 vendor PEN		0x0d7d	Pen Drive
+vendor OTI		0x0ea0	Ours Technology Inc.
+vendor PILOTECH		0x0eaf  Pilotech
 vendor MOTOROLA		0x1063	Motorola
 vendor CCYU		0x1065	CCYU Technology
 vendor PLX		0x10b5	PLX
 vendor ASANTE		0x10bd	Asante
+vendor JRC		0x1145	Japan Radio Company
+vendor ACERCM		0x1189	Acer Communications & Multimedia
 vendor BELKIN2		0x1293	Belkin Components
 vendor MOBILITY		0x1342	Mobility
 vendor SHARK		0x13d2	Shark
@@ -351,8 +361,11 @@ vendor INSIDEOUT	0x1608	Inside Out Networks
 vendor ENTREGA		0x1645	Entrega
 vendor ACTIONTEC	0x1668	Actiontec Electronics
 vendor DLINK		0x2001	D-Link
+vendor NHJ		0x2770  NHJ
 vendor PQI		0x3538	PQI
 vendor DAISY		0x3579	Daisy Technology
+vendor NI		0x3923	National Instruments
+vendor IODATA2		0x40bb	I-O Data
 vendor INTEL		0x8086	Intel
 vendor HP2		0xf003	Hewlett Packard
 
@@ -396,6 +409,7 @@ 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
+product ACERP ATAPI		0x6003	ATA/ATAPI adapter
 
 /* Actiontec products */
 product ACTIONTEC PRISM_25	0x0408	Prism2.5 WLAN
@@ -468,6 +482,9 @@ product ASAHIOPTICAL OPTIO230	0x0004	PENTAX Optio230
 /* Asante products */
 product ASANTE EA		0x1427	Ethernet
 
+/* ASIX Electronics products */
+product ASIX AX88172		0x1720	USB 2.0 10/100 ethernet controller
+
 /* ATen products */
 product ATEN UC1284		0x2001	Parallel adapter
 product ATEN UC10T		0x2002	10Mbps Ethernet
@@ -485,6 +502,9 @@ product ATMEL DWL120		0x7602	DWL-120 Wireless adapter
 /* Audio-Technica products */
 product AUDIOTECHNICA ATCHA4USB	0x0009	ATC-HA4USB USB headphone
 
+/* Avance Logic products */
+product AVANCELOGIC USBAUDIO	0x0100	USB Audio Speaker
+
 /* Avision products */
 product AVISION 1200U		0x0268	1200U scanner
 
@@ -492,6 +512,7 @@ product AVISION 1200U		0x0268	1200U scanner
 /*product BELKIN F5U111		0x????	F5U111 Ethernet */
 product BELKIN2 F5U002		0x0002	F5U002 Parallel adapter
 product BELKIN F5U103		0x0103	F5U103 Serial adapter
+product BELKIN F5U109		0x0109	F5U109 Serial adapter
 product BELKIN SCSI		0x0115	SCSI Adaptor
 product BELKIN USB2LAN		0x0121	USB to LAN Converter
 product BELKIN F5U120		0x1203	F5U120-PC Hub
@@ -514,6 +535,7 @@ product BTC BTC7932		0x6782	Keyboard/Mouse
 
 /* Canon, Inc. products */
 product CANON N656U		0x2206	CANOSCAN N656U
+product CANON N670U		0x220d	CANOSCAN N670U
 product CANON S10		0x3041	PowerShot S10
 product CANON S20		0x3043	PowerShot S20
 product CANON S100_US		0x3045	PowerShot S100
@@ -573,6 +595,9 @@ product COREGA FETHER_USB_TXS	0x000d	FEther USB-TXS
 product CREATIVE NOMAD_II	0x1002	Nomad II
 product CREATIVE NOMAD_IIMG	0x4004	Nomad II MG
 
+/* Cambridge Silicon Radio products */
+product CSR BLUETOOTH		0x0001	Bluetooth USB Adapter
+
 /* CTX products */
 product CTX EX1300		0x9999	Ex1300 hub
 
@@ -602,6 +627,7 @@ product DIGITALSTREAM PS2	0x0001	PS/2 Active Adapter
 
 /* D-Link products */
 /*product DLINK DSBS25		0x0100	DSB-S25 serial adapter*/
+product DLINK DUBE100		0x1a00	10/100 ethernet
 product DLINK DSB650TX4		0x200c	10/100 ethernet
 product DLINK DSB650C		0x4000	10Mbps ethernet
 product DLINK DSB650TX1		0x4001	10/100 ethernet
@@ -663,6 +689,9 @@ product EPSON 1240		0x010b	Perfection 1240U / 1240Photo scanner
 product EPSON 640U		0x010c	Perfection 640U scanner
 product EPSON 1650		0x0110	Perfection 1650 scanner
 product EPSON GT9700F		0x0112	GT-9700F scanner
+product EPSON 2400		0x011b	Perfection 2400 scanner
+product EPSON 1260		0x011d	Perfection 1260 scanner
+product EPSON 1660		0x011e	Perfection 1660 scanner
 
 /* e-TEK Labs products */
 product ETEK 1COM		0x8007	Serial port
@@ -681,6 +710,9 @@ product FTDI SERIAL_8U100AX	0x8372	Serial converter
 /* Fuji photo products */
 product FUJIPHOTO MASS0100	0x0100	Mass Storage
 
+/* Fujitsu protducts */
+product FUJITSU	AH_F401U	0x105b	AH-F401U Air H device
+
 /* Genesys Logic products */
 product GENESYS GENELINK	0x05e3	GeneLink Host-Host Bridge
 product GENESYS GL650		0x0604	GL650 Hub
@@ -709,6 +741,7 @@ product HAGIWARA FG		0x0005  FlashGate
 
 /* Handspring, Inc. */
 product HANDSPRING VISOR	0x0100	Handspring Visor
+product HANDSPRING TREO		0x0200	Handspring Treo
 
 /* Hauppauge Computer Works */
 product HAUPPAUGE WINTV_USB_FM	0x4d12	WinTV USB FM
@@ -729,6 +762,7 @@ product HP S20b			0x0202	PhotoSmart S20
 product HP 815C			0x0204	DeskJet 815C
 product HP 3300C		0x0205	ScanJet 3300C
 product HP CDW8200		0x0207	CD-Writer Plus 8200e
+product HP 1220C		0x0212	DeskJet 1220C
 product HP 810C			0x0304	DeskJet 810C/812C
 product HP 4300C		0x0305	Scanjet 4300C
 product HP CD4E			0x0307	CD-Writer+ CD-4e
@@ -805,6 +839,7 @@ product IODATA USBETT		0x0901	USB ETT
 product IODATA USBETTX		0x0904	USB ETTX
 product IODATA USBETTXS		0x0913	USB ETTX
 product IODATA USBRSAQ		0x0a03	RSAQ1 Serial Adapter
+product	IODATA2 USB2SC		0x0a09	USB2.0-SCSI Bridge USB2-SC
 
 /* Iomega products */
 product IOMEGA ZIP100		0x0001	Zip 100
@@ -816,6 +851,9 @@ product JATON EDA		0x5704	Ethernet Device Adapter
 /* Jenoptik products */
 product JENOPTIK JD350		0x5300  JD 350 Camera/mp3 player
 
+/* JRC products */
+product JRC AH_J3001V_J3002V	0x0001	AirH\"PHONE AH-J3001V/J3002V
+
 /* Kawasaki LSI products */
 product KLSI DUH3E10BT		0x0008	10BT Ethernet
 product KLSI DUH3E10BTN		0x0009	10BT Ethernet
@@ -902,6 +940,7 @@ product LINKSYS USB100H1	0x2204	USB100H1 Ethernet/HPNA
 product LINKSYS USB10TA		0x2206	USB10TA Ethernet
 product	LINKSYS	WUSB11		0x2211	WUSB11 802.11b
 product	LINKSYS	WUSB11_25	0x2212	WUSB11 802.11b v2.5
+product LINKSYS2 USB200M	0x2226	USB 2.0 10/100 ethernet controller
 product LINKSYS USB10TX2	0x400b	USB10TX
 
 /* Logitech products */
@@ -948,6 +987,8 @@ product MELCO LUATX1		0x0001	LUA-TX Ethernet
 product MELCO LUATX5		0x0005	LUA-TX Ethernet
 product MELCO LUA2TX5		0x0009	LUA2-TX Ethernet
 product MELCO LUAKTX		0x0012	LUA-KTX Ethernet
+product MELCO MCRSM2		0x001b	MCR-SM2 SmartMedia Card Reader/Writer
+product MELCO DUBPXXG		0x001c	USB-IDE Bridge: DUB-PxxG
 product MELCO KS11G		0x0027	WLI-USB-KS11G USB-wlan
 
 /* Metricom products */
@@ -998,6 +1039,7 @@ product MOBILITY EA		0x0204	Ethernet
 
 /* Motorola products */
 product MOTOROLA MC141555	0x1555	MC141555 hub controller
+product MOTOROLA SB4100		0x4100	SB4100 USB Cable Modem
 
 /* MultiTech products */
 product MULTITECH ATLAS		0xf101	MT5634ZBA modem
@@ -1015,6 +1057,10 @@ product MUSTEK MDC800		0xa800	MDC-800 digital camera
 
 /* M-Systems products */
 product MSYSTEMS DISKONKEY	0x0010	DiskOnKey
+product MSYSTEMS DISKONKEY2	0x0011	DiskOnKey
+
+/* National Instruments */
+product NI GPIB_USB_A		0xc920	GPIB-USB-A
 
 /* National Semiconductor */
 product NATIONAL BEARPAW1200	0x1000	BearPaw 1200
@@ -1028,6 +1074,7 @@ product NEC HUB_B		0x55ab	hub
 product NEC2 HUB2_0		0x0058	USB2.0 Hub
 
 /* NEODIO products */
+product NEODIO ND3050		0x3050	6-in-1 Flash Device Controller
 product NEODIO ND5010		0x5010	Multi-format Flash Controller
 
 /* NetChip Technology Products */
@@ -1038,10 +1085,15 @@ product NETCHIP CLIK40		0xa140	Clik! 40
 product NETGEAR EA101		0x1001	Ethernet
 product NETGEAR EA101X		0x1002	Ethernet
 product NETGEAR FA101		0x1020	10/100 Ethernet
+product NETGEAR FA120		0x1040	USB 2.0 Fast Ethernet Adapter
 
 /* Nikon products */
 product NIKON E990		0x0102	Digital Camera E990
 product NIKON E880		0x0103	Digital Camera E880
+product NIKON E885		0x0105	Digital Camera E885
+
+/* NHJ product */
+product NHJ CAM2		0x9120	Camera
 
 /* Olympus products */
 product OLYMPUS C1		0x0102	C-1 Digital Camera
@@ -1062,18 +1114,28 @@ product ONSPEC STECHCFSM	0xa006	Simple Tech/Datafab CF+SM Reader
 product ONSPEC LC1		0xa109	CF + SM Combo (LC1)
 product ONSPEC MD1II		0xb006	Datafab MD1-II PC-Card Reader
 
+/* Ours Technology Inc. */
+product OTI SOLID		0x6803	Solid state disk
+
 /* Palm Computing, Inc. product */
 product PALM SERIAL		0x0080	USB Serial Adaptor
 product PALM M500		0x0001	Palm m500
 product PALM M505		0x0002	Palm m505
 product PALM M515		0x0003	Palm m515
+product PALM I705		0x0020	Palm i705
+product PALM TUNGSTEN_Z		0x0031	Palm Tungsten Z
 product PALM M125		0x0040	Palm m125
+product PALM M130		0x0050	Palm m130
+product PALM TUNGSTEN_T		0x0060	Palm Tungsten T
+product PALM ZIRE		0x0070	Palm Zire
 
 /* Panasonic products */
 product PANASONIC LS120		0x0901	LS-120 Camera
 product PANASONIC SDCAAE	0x1b00	MultiMediaCard Adapter
 
 /* Pen Driver */
+product PEN USBREADER		0x0240	USB 6 in 1 reader
+product PEN MOBILEDRIVE		0x0280	USB 3 in 1 reader
 product PEN USBDISK		0x0d7d	USB Disk
 
 /* Peracom products */
@@ -1104,6 +1166,12 @@ product PHILIPSSEMI HUB1122	0x1122	hub
 product PIENGINEERING PS2USB	0x020b	PS2 to Mac Adapter
 product PIENGINEERING XKEYS	0x0233	Xkeys Programmable Keyboard
 
+/* Pilotech Systems Co., Ltd products */
+product PILOTECH CRW600		0x0001	CRW-600 6-in-1 Reader
+
+/* Plantronics products */
+product PLANTRONICS HEADSET	0x0ca1	Platronics DSP-400 Headset
+
 /* PLX products */
 product PLX TESTBOARD		0x9060	test board
 
@@ -1175,12 +1243,17 @@ product SAITEK CYBORG_3D_GOLD	0x0006	Cyborg 3D Gold Joystick
 /* SanDisk products */
 product SANDISK SDDR05A		0x0001	ImageMate SDDR-05a
 product SANDISK SDDR31		0x0002	ImageMate SDDR-31
+product SANDISK SDDR05		0x0005	ImageMate SDDR-05
 product SANDISK SDDR12		0x0100	ImageMate SDDR-12
 product SANDISK SDDR09		0x0200	ImageMate SDDR-09
+product SANDISK SDDR75		0x0810	ImageMate SDDR-75
 
 /* Sanwa Supply products */
 product SANWASUPPLY JYDV9USB	0x9806	JY-DV9USB gamepad
 
+/* Sanyo Electric products */
+product SANYO SCP4900 		0x0701	Sanyo SCP-4900 USB Phone
+
 /* ScanLogic products */
 product SCANLOGIC SL11R		0x0002	SL11R-IDE
 product SCANLOGIC 336CX		0x0300	Phantom 336CX - C3 scanner
@@ -1212,6 +1285,7 @@ product SIGMATEL IRDA		0x4200	IrDA
 
 /* SIIG products */
 product SIIG DIGIFILMREADER	0x0004	DigiFilm-Combo Reader
+product SIIG MULTICARDREADER	0x0201	MULTICARDREADER
 
 /* Silicon Portals Inc. */
 product SILICONPORTALS YAPPH_NF	0x0200	YAP Phone (no firmware)
@@ -1249,8 +1323,10 @@ product SONY PS2KEYBOARDHUB	0x005d	PlayStation2 keyboard hub
 product SONY PS2MOUSE		0x0061	PlayStatoin2 mouse
 product SONY CLIE_40		0x0066	Clie v4.0
 product SONY CLIE_40_MS		0x006d	Clie v4.0 Memory Stick slot
+product SONY CLIE_S360		0x0095	Sony Clie s360
 product SONY CLIE_41_MS		0x0099	Clie v4.1 Memory Stick slot
 product SONY CLIE_41		0x009a	Clie v4.1
+product SONY CLIE_NX60		0x00da	Sony Clie nx60
 
 /* STMicroelectronics products */
 product STMICRO COMMUNICATOR	0x7554	Communicator
@@ -1258,9 +1334,14 @@ product STMICRO COMMUNICATOR	0x7554	Communicator
 /* STSN products */
 product STSN STSN0001		0x0001	Internet Access Device
 
+/* Sun Communications products */
+product	SUNCOMM MB_ADAPTOR	0x0003	Mobile Adaptor
+
 /* SUN Corporation products */
+product SUNTAC DS96L		0x0003	SUNTAC U-Cable type D2
 product SUNTAC PS64P1		0x0005	SUNTAC U-Cable type P1
 product SUNTAC VS10U		0x0009	SUNTAC Slipper U
+product SUNTAC IS96U		0x000a	SUNTAC Ir-Trinity
 
 /* Sun Microsystems products */
 product SUN KEYBOARD		0x0005	Type 6 USB
@@ -1305,8 +1386,10 @@ product	TODOS ARGOS_MINI	0x0002	Argos Mini Smartcard Reader
 
 /* Trek Technology products */
 product TREK THUMBDRIVE		0x1111	ThumbDrive
+product TREK THUMBDRIVE_8MB	0x9988	ThumbDrive 8MB
 
 /* Trumpion products */
+product	TRUMPION T33521		0x1003	USB/MP3 decoder
 product TRUMPION XXX1100	0x1100	XXX 1100
 
 /* Ultima products */
@@ -1326,9 +1409,6 @@ product UNIACCESS PANACHE	0x0101	Panache Surf ISDN
 /* Vision products */
 product VISION VC6452V002	0x0002	CPiA Camera
 
-/* Vivitar products */
-product VIVITAR DSC350		0x0003	DSC350 Camera
-
 /* Visioneer products */
 product VISIONEER 7600		0x0211	OneTouch 7600
 product VISIONEER 5300		0x0221	OneTouch 5300
@@ -1338,6 +1418,9 @@ product VISIONEER 6200		0x0311	OneTouch 6200
 product VISIONEER 8100		0x0321	OneTouch 8100
 product VISIONEER 8600		0x0331	OneTouch 8600
 
+/* Vivitar products */
+product VIVITAR DSC350		0x0003	DSC350 Camera
+
 /* Wacom products */
 product WACOM CT0405U		0x0000	CT-0405-U Tablet
 product WACOM GRAPHIRE		0x0010	Graphire