new prods.

1 files changed, 45 insertions, 7 deletions

diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 148f92c182b..8ed9f441bf2 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.19 2000/04/14 22:50:29 aaron Exp $
+$OpenBSD: usbdevs,v 1.20 2000/07/04 10:27:44 fgsch Exp $
 /* $NetBSD: usbdevs,v 1.88 2000/04/03 12:09:43 augustss Exp $ */
 
 /*
@@ -6,7 +6,7 @@ $OpenBSD: usbdevs,v 1.19 2000/04/14 22:50:29 aaron Exp $
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
- * by Lennart Augustsson (augustss@carlstedt.se) at
+ * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,6 +51,7 @@ vendor FTDI		0x0403	Future Technology Devices
 vendor NEC		0x0409	NEC
 vendor KODAK		0x040a	Eastman Kodak Corp.
 vendor MELCO		0x0411	Melco, Inc.
+vendor CREATIVELABS	0x041e	Creative Labs
 vendor ADI		0x0422	ADI Systems, Inc.
 vendor CATC		0x0423	Computer Access Technology Corp.
 vendor GRAVIS		0x0428	Advanced Gravis Computer Tech. Ltd.
@@ -75,6 +76,7 @@ vendor CONNECTIX	0x0478	Connectix Corp.
 vendor KENSINGTON	0x047d	Kensington
 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 CYPRESS		0x04b4	Cypress Semiconductor
@@ -143,12 +145,14 @@ vendor ACTLABS		0x061c	Act Labs, Ltd.
 vendor ALARIS		0x0620	Alaris, Inc.
 vendor APEX		0x0624	Apex, Inc.
 vendor AVISION		0x0638	Avision, Inc.
+vendor TEAC		0x0644	TEAC
 vendor LINKSYS		0x066b	Linksys, Inc.
 vendor ACERSA		0x066e	Acer Semiconductor America, Inc.
 vendor AIWA		0x0677	Aiwa Co., Ltd.
 vendor ACARD		0x0678	ACARD Technology Corp.
 vendor PROLIFIC		0x067b	Prolific Technology Inc.
 vendor ADVANCELOGIC	0x0680	Avance Logic, Inc.
+vendor CTX		0x0698	Chuntex
 vendor ASKEY		0x069a	Askey Computer Corp.
 vendor ALCATELT		0x06b9	Alcatel Telecom
 vendor AGFA		0x06bd	AGFA-Gevaert NV
@@ -161,6 +165,7 @@ vendor ALCATELM		0x06e4	Alcatel Microelectronics
 vendor SIRIUS		0x06ea	Sirius Technologies
 vendor BOSTON		0x06fd	Boston Acoustics
 vendor SMC		0x0707	Standard Microsystems Corp
+vendor MCT		0x0711	MCT Corp.
 vendor AUREAL		0x0755	Aureal Semiconductor
 vendor MIDIMAN		0x0763	Midiman
 vendor SANDISK		0x0781	SanDisk Corp
@@ -198,7 +203,9 @@ vendor ANDREA		0x08a8	Andrea Electronics
 vendor BURRBROWN	0x08bb	Burr-Brown Japan, Ltd.
 vendor 2WIRE		0x08c8	2Wire, Inc
 vendor AIPTEK		0x08ca	AIPTEK International, Inc.
+vendor SMARTBRIDGES	0x08d1	SmartBridges Pte Ltd.
 vendor BILLIONTON	0x08dd	Billionton Systems, Inc.
+vendor EXTENDED		0x08e9	Extended Systems, Inc.
 vendor AUTHENTEC	0x08ff	AuthenTec, Inc.
 vendor ALATION		0x0910	Alation Systems, Inc.
 vendor BIOMETRIC	0x0929	American Biometric Company
@@ -220,6 +227,7 @@ vendor ALTERA		0x09fb	Altera
 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 INSIDEOUT	0x1608	Inside Out Networks
@@ -313,6 +321,9 @@ product CHIC CYPRESS		0x0003	Cypress USB Mouse
 /* Chicony products */
 product CHICONY KB8933		0x0001	KB-8933 keyboard
 
+/* Compaq products */
+product COMPAQ PJB100		0x504a	Personal Jukebox PJB100
+
 /* Connectix products */
 product CONNECTIX QUICKCAM	0x0001	QuickCam
 
@@ -320,6 +331,12 @@ product CONNECTIX QUICKCAM	0x0001	QuickCam
 product COREGA ETHER_USB_T	0x0001	Ether USB-T
 product COREGA FETHER_USB_TX	0x0004	FEther USB-TX
 
+/* Creative Labs products */
+product CREATIVELABS NOMAD_II	0x1002	Nomad II
+
+/* CTX products */
+product CTX EX1300		0x9999	Ex1300 hub
+
 /* Cypress Semiconductor products */
 product CYPRESS MOUSE		0x0001	mouse
 product CYPRESS THERMO		0x0002	thermometer
@@ -361,13 +378,16 @@ product ENTREGA EZUSB		0x8000	EZ-USB
 /*product ENTREGA SERIAL	0x8001	DB25 Serial connector*/
 /*product ENTREGA SERIAL_DB9	0x8093	DB9 Serial connector*/
 
-/* e-TEK Labs products */
-product ETEK 1COM		0x8007	Serial port
-
 /* Epson products */
 product EPSON PRINTER2		0x0002	ISD USB Smart Cable for Mac
 product EPSON PRINTER3		0x0003	ISD USB Smart Cable
 
+/* e-TEK Labs products */
+product ETEK 1COM		0x8007	Serial port
+
+/* Extended Systems products */
+product EXTENDED XTNDACCESS	0x0100	XTNDAccess IrDA
+
 /* Gravis products */
 product GRAVIS GAMEPADPRO	0x4001	GamePad Pro
 
@@ -408,6 +428,7 @@ product IODATA USBETTX		0x0904	USB ETTX
 
 /* Iomega products */
 product IOMEGA ZIP100		0x0001	Zip 100
+product IOMEGA ZIP250		0x0030	Zip 250
 
 /* Kawasaki products */
 product KLSI DUH3E10BT		0x0008	USB ethernet controller engine
@@ -447,19 +468,24 @@ product LEXMARK S2450		0x0009	Optra S 2450
 /* Linksys products */
 product LINKSYS USB10T		0x2202	USB10T Ethernet
 product LINKSYS USB100TX	0x2203	USB100TX Ethernet
+product LINKSYS USB100H1	0x2204	USB100H1 Ethernet/HPNA
 product LINKSYS USB10TA		0x2206	USB10TA Ethernet
 
 /* Logitech products */
 product LOGITECH M2452		0x0203	M2452 keyboard
 product LOGITECH M4848		0x0301	M4848 mouse
-product LOGITECH QUICKCAM	0x0801	QuickCam
+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 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 WMPAD		0xc208	WingMan GamePad Extreme
 product LOGITECH WMJOY		0xc281	WingMan Force joystick 
+product LOGITECH QUICKCAMPRO2	0xd001	QuickCam Pro
 
 /* Lucent products */
 product LUCENT EVALKIT		0x1001	USS-720 evaluation kit
@@ -467,6 +493,10 @@ product LUCENT EVALKIT		0x1001	USS-720 evaluation kit
 /* Macally products */
 product MACALLY MOUSE1		0x0101	mouse
 
+/* MCT Corp. */
+product MCT HUB0100		0x0100	Hub
+product MCT USB232		0x0210	USB-232 Interface
+
 /* Melco, Inc products */
 product MELCO LUATX		0x0001	LU-ATX Ethernet
 
@@ -503,6 +533,7 @@ product NETGEAR EA101		0x1001	Ethernet adapter
 
 /* OmniVision Technologies, Inc. products */
 product OMNIVISION OV511	0x0511	OV511 Camera
+product OMNIVISION OV511PLUS	0xa511	OV511+ Camera
 
 /* Palm Computing, Inc. */
 product PALM SERIAL		0x0080	USB Serial Adaptor
@@ -517,6 +548,7 @@ product PERACOM ENET2		0x0005	Ethernet adapter
 product PHILIPS DSS350		0x0101	DSS 350 Digital Speaker System
 product PHILIPS DSS		0x0104	DSS XXX Digital Speaker System
 product PHILIPS HUB		0x0201	hub
+product PHILIPS PCVC680K	0x0308	PCVC680K Vesta Pro PC Camera
 product PHILIPS DSS150		0x0471	DSS 150 Digital Speaker System
 
 /* P.I. Engineering products */
@@ -555,6 +587,9 @@ product SIIG DIGIFILMREADER	0x0004	DigiFilm-Combo Reader
 /* Sirius Technologies products */
 product SIRIUS ROADSTER		0x0001	NetComm Roadster II 56 USB
 
+/* SmartBridges products */
+product SMARTBRIDGES SMARTLINK	0x0001	SmartLink USB ethernet adapter
+
 /* SMC products */
 product SMC 2102USB		0x0100	10Mbps ethernet adapter
 product SMC 2202USB		0x0200	10/100 ethernet adapter
@@ -569,6 +604,9 @@ product STMICRO COMMUNICATOR	0x7554	USB Communicator
 product SUN KEYBOARD		0x0005	Type 6 USB
 /* XXX The above is a North American PC style keyboard possibly */
 
+/* TEAC products */
+product TEAC FD05PUB		0x0000	FD-05PUB floppy
+
 /* Telex Communications products */
 product TELEX MIC1		0x0001	Enhanced USB Microphone
 
@@ -582,7 +620,7 @@ product THRUST FUSION_PAD	0xa0a3	Fusion Digital Gamepad
 product UNIACCESS PANACHE	0x0101	Panache Surf USB ISDN Adapter
 
 /* Vision products */
-product VISION VC6452V002	0x0002	VC6452V002 Camera
+product VISION VC6452V002	0x0002	CPiA Camera
 
 /* Wacom products */
 product WACOM CT0405U		0x0000	CT-0405-U Tablet