Sync devices with NetBSD

1 files changed, 43 insertions, 13 deletions

diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 64886a824fd..b344c5ed0c0 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,5 +1,5 @@
-$OpenBSD: usbdevs,v 1.56 2002/09/27 18:41:57 nate Exp $
-/* $NetBSD: usbdevs,v 1.261 2002/07/16 09:19:29 abs Exp $ */
+$OpenBSD: usbdevs,v 1.57 2002/11/10 18:55:14 nate Exp $
+/* $NetBSD: usbdevs,v 1.280 2002/11/05 12:13:40 cjs Exp $ */
 
 /*
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@ vendor FTDI		0x0403	Future Technology Devices
 vendor NEC		0x0409	NEC
 vendor KODAK		0x040a	Eastman Kodak
 vendor MELCO		0x0411	Melco
-vendor CREATIVELABS	0x041e	Creative Labs
+vendor CREATIVE		0x041e	Creative Labs
 vendor ADI		0x0422	ADI Systems
 vendor CATC		0x0423	Computer Access Technology
 vendor SMC2		0x0424	Standard Microsystems
@@ -296,6 +296,7 @@ vendor AUDIOTECHNICA	0x0909	Audio-Technica
 vendor TRUMPION		0x090a	Trumpion Microelectronics
 vendor ALATION		0x0910	Alation Systems
 vendor CONCORDCAMERA	0x0919	Concord Camera
+vendor GOHUBS		0x0921	GoHubs
 vendor BIOMETRIC	0x0929	American Biometric Company
 vendor YANO		0x094f	Yano
 vendor KINGSTON		0x0951	Kingston Technology
@@ -323,6 +324,7 @@ vendor BOCASYSTEMS	0x0a43	Boca Systems
 vendor BROADCOM		0x0a5c	Broadcom
 vendor GREENHOUSE	0x0a6b	GREENHOUSE
 vendor GEOCAST		0x0a79	Geocast Network Systems
+vendor NEODIO		0x0aec  Neodio
 vendor TODOS		0x0b0c	Todos Data System
 vendor NEC2		0x0b62	NEC
 vendor ATI2		0x0b6f	ATI
@@ -348,6 +350,7 @@ vendor INSIDEOUT	0x1608	Inside Out Networks
 vendor ENTREGA		0x1645	Entrega
 vendor ACTIONTEC	0x1668	Actiontec Electronics
 vendor DLINK		0x2001	D-Link
+vendor PQI		0x3538	PQI
 vendor DAISY		0x3579	Daisy Technology
 vendor INTEL		0x8086	Intel
 vendor HP2		0xf003	Hewlett Packard
@@ -458,6 +461,9 @@ product AOX USB101		0x0008	Ethernet controller engine
 product APPLE OPTMOUSE		0x0302	Optical mouse
 product APPLE SPEAKERS		0x1101	Speakers
 
+/* Asahi Optical products */
+product ASAHIOPTICAL OPTIO230	0x0004	PENTAX Optio230
+
 /* Asante products */
 product ASANTE EA		0x1427	Ethernet
 
@@ -493,6 +499,10 @@ product BILLIONTON USBLP100	0x0987	USB100LP
 product BILLIONTON USBEL100	0x0988	USB100EL
 product BILLIONTON USBE100	0x8511	USBE100
 
+/* Broadcom products */
+product BROADCOM BCM2033	0x2000	BCM2033
+product BROADCOM BCM2033NF	0x2033	BCM2033 (no fw)
+
 /* Brother Industries products */
 product BROTHER HL1050		0x0002	HL-1050 laser printer
 
@@ -502,7 +512,11 @@ product BTC BTC7932		0x6782	Keyboard/Mouse
 /* Canon, Inc. products */
 product CANON N656U		0x2206	CANOSCAN N656U
 product CANON S10		0x3041	PowerShot S10
-product CANON S100		0x3045	PowerShot S100
+product CANON S20		0x3043	PowerShot S20
+product CANON S100_US		0x3045	PowerShot S100
+product CANON S100_EU		0x3047	PowerShot S100
+product CANON G1		0x3048	PowerShot G1
+product CANON A20		0x304e	PowerShot A20
 
 /* CATC products */
 product CATC NETMATE		0x000a	Netmate Ethernet
@@ -552,8 +566,8 @@ product COREGA WLAN_USB_USB_11	0x000c	WirelessLAN USB-11
 product COREGA FETHER_USB_TXS	0x000d	FEther USB-TXS
 
 /* Creative Labs products */
-product CREATIVELABS NOMAD_II	0x1002	Nomad II
-product CREATIVELABS NOMAD_IIMG	0x4004	Nomad II MG
+product CREATIVE NOMAD_II	0x1002	Nomad II
+product CREATIVE NOMAD_IIMG	0x4004	Nomad II MG
 
 /* CTX products */
 product CTX EX1300		0x9999	Ex1300 hub
@@ -561,6 +575,7 @@ product CTX EX1300		0x9999	Ex1300 hub
 /* Cypress Semiconductor products */
 product CYPRESS MOUSE		0x0001	mouse
 product CYPRESS THERMO		0x0002	thermometer
+product CYPRESS KBDHUB		0x0101	Keyboard/Hub
 product CYPRESS FMRADIO		0x1002	FM Radio
 
 /* Daisy Technology products */
@@ -584,13 +599,13 @@ product DIGITALSTREAM PS2	0x0001	PS/2 Active Adapter
 /* D-Link products */
 /*product DLINK DSBS25		0x0100	DSB-S25 serial adapter*/
 product DLINK DSB650TX4		0x200c	10/100 ethernet
-product DLINK DSB650C		0x4000	10Mbps Ethernet
+product DLINK DSB650C		0x4000	10Mbps ethernet
 product DLINK DSB650TX1		0x4001	10/100 ethernet
-product DLINK DSB650TX		0x4002	10/100 Ethernet
-product DLINK DSB650TX_PNA	0x4003	1/10/100 Ethernet
+product DLINK DSB650TX		0x4002	10/100 ethernet
+product DLINK DSB650TX_PNA	0x4003	1/10/100 ethernet
 product DLINK DSB650TX3		0x400b	10/100 ethernet
 product DLINK DSB650TX2		0x4102	10/100 ethernet
-product DLINK DSB650		0xabc1	10/100 Ethernet
+product DLINK DSB650		0xabc1	10/100 ethernet
 
 /* DMI products */
 product DMI SA2_0		0xb001	Storage Adapter
@@ -664,8 +679,12 @@ product FUJIPHOTO MASS0100	0x0100	Mass Storage
 
 /* Genesys Logic products */
 product GENESYS GENELINK	0x05e3	GeneLink Host-Host Bridge
+product GENESYS GL650		0x0604	GL650 Hub
 product GENESYS GL641USB	0x0700	GL641USB CompactFlash
 
+/* GoHubs products */
+product GOHUBS GOCOM232		0x1001	GoCOM232 Serial converter
+
 /* Gravis products */
 product GRAVIS GAMEPADPRO	0x4001	GamePad Pro
 
@@ -760,6 +779,7 @@ product INSIDEOUT MT4X56USB	0x1403	OEM device
 /* In-System products */
 product INSYSTEM F5U002		0x0002	Parallel adapter
 product INSYSTEM ATAPI		0x0031	ATAPI adapter
+product INSYSTEM IDEUSB2	0x0060	USB2 Storage Adapter
 product INSYSTEM ISD110		0x0200	IDE adapter ISD110
 product INSYSTEM ISD105		0x0202	IDE adapter ISD105
 product INSYSTEM DRIVEV2	0x0301	Portable USB Harddrive V2
@@ -881,13 +901,14 @@ product	LINKSYS	WUSB11_25	0x2212	WUSB11 802.11b v2.5
 product LINKSYS USB10TX2	0x400b	USB10TX
 
 /* Logitech products */
-product LOGITECH M2452		0x0203	M2452
-product LOGITECH M4848		0x0301	M4848
+product LOGITECH M2452		0x0203	M2452 keyboard
+product LOGITECH M4848		0x0301	M4848 mouse
 product LOGITECH PAGESCAN	0x040f	PageScan
 product LOGITECH QUICKCAMWEB	0x0801	QuickCam Web
 product LOGITECH QUICKCAMPRO	0x0810	QuickCam Pro
 product LOGITECH QUICKCAMEXP	0x0840	QuickCam Express
 product LOGITECH QUICKCAM	0x0850	QuickCam
+product LOGITECH QUICKCAMPRO3k	0x08b0	QuickCam Pro 3000
 product LOGITECH N43		0xc000	N43
 product LOGITECH N48		0xc001	N48 mouse
 product LOGITECH MBA47		0xc002	M-BA47 mouse
@@ -923,6 +944,7 @@ 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 KS11G		0x0027	WLI-USB-KS11G USB-wlan
 
 /* Metricom products */
 product METRICOM RICOCHET_GS	0x0001	Ricochet GS
@@ -974,7 +996,7 @@ product MOBILITY EA		0x0204	Ethernet
 product MOTOROLA MC141555	0x1555	MC141555 hub controller
 
 /* MultiTech products */
-product MULTITECH ATLAS		0xf101	MT5634ZBA
+product MULTITECH ATLAS		0xf101	MT5634ZBA modem
 
 /* Mustek products */
 product MUSTEK 1200CU		0x0001	1200 CU scanner
@@ -1001,6 +1023,9 @@ product NEC HUB_B		0x55ab	hub
 /* NEC2 products */
 product NEC2 HUB2_0		0x0058	USB2.0 Hub
 
+/* NEODIO products */
+product NEODIO ND5010		0x5010	Multi-format Flash Controller
+
 /* NetChip Technology Products */
 product NETCHIP TURBOCONNECT	0x1080	Turbo-Connect
 product NETCHIP CLIK40		0xa140	Clik! 40
@@ -1037,6 +1062,7 @@ product ONSPEC MD1II		0xb006	Datafab MD1-II PC-Card Reader
 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 M125		0x0040	Palm m125
 
 /* Panasonic products */
@@ -1084,6 +1110,9 @@ product PORTGEAR EA9		0x0009	Ethernet
 /* Portsmith products */
 product PORTSMITH EEA		0x3003	Express Ethernet
 
+/* PQI products */
+product PQI TRAVELFLASH		0x0001	Travel Flash Drive
+
 /* Primax products */
 product PRIMAX G2X300		0x0300	G2-200 scanner
 product PRIMAX G2E300		0x0301	G2E-300 scanner
@@ -1308,6 +1337,7 @@ product WACOM GRAPHIRE		0x0010	Graphire
 product WACOM INTUOSA5		0x0021	Intuos A5
 
 /* Xirlink products */
+product XIRLINK IMAGING		0x800d	Imaging Device
 product XIRLINK PCCAM		0x8080	IBM PC Camera
 
 /* Y-E Data products */