sync

1 files changed, 46 insertions, 8 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index b7d0c6e70a9..5120ab6c789 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.18 2000/04/14 22:50:29 aaron Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.19 2000/07/04 10:29:06 fgsch Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.18 2000/04/11 19:03:19 jakob 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 $ */
 
@@ -13,7 +13,7 @@
  * 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
@@ -58,6 +58,7 @@
 #define	USB_VENDOR_NEC	0x0409		/* NEC */
 #define	USB_VENDOR_KODAK	0x040a		/* Eastman Kodak Corp. */
 #define	USB_VENDOR_MELCO	0x0411		/* Melco, Inc. */
+#define	USB_VENDOR_CREATIVELABS	0x041e		/* Creative Labs */
 #define	USB_VENDOR_ADI	0x0422		/* ADI Systems, Inc. */
 #define	USB_VENDOR_CATC	0x0423		/* Computer Access Technology Corp. */
 #define	USB_VENDOR_GRAVIS	0x0428		/* Advanced Gravis Computer Tech. Ltd. */
@@ -82,6 +83,7 @@
 #define	USB_VENDOR_KENSINGTON	0x047d		/* Kensington */
 #define	USB_VENDOR_LUCENT	0x047e		/* Lucent */
 #define	USB_VENDOR_STMICRO	0x0483		/* STMicroelectronics */
+#define	USB_VENDOR_COMPAQ	0x049f		/* Compaq Computers */
 #define	USB_VENDOR_ACERP	0x04a5		/* Acer Peripherals, Inc. */
 #define	USB_VENDOR_CANON	0x04a9		/* Canon, Inc. */
 #define	USB_VENDOR_CYPRESS	0x04b4		/* Cypress Semiconductor */
@@ -150,12 +152,14 @@
 #define	USB_VENDOR_ALARIS	0x0620		/* Alaris, Inc. */
 #define	USB_VENDOR_APEX	0x0624		/* Apex, Inc. */
 #define	USB_VENDOR_AVISION	0x0638		/* Avision, Inc. */
+#define	USB_VENDOR_TEAC	0x0644		/* TEAC */
 #define	USB_VENDOR_LINKSYS	0x066b		/* Linksys, Inc. */
 #define	USB_VENDOR_ACERSA	0x066e		/* Acer Semiconductor America, Inc. */
 #define	USB_VENDOR_AIWA	0x0677		/* Aiwa Co., Ltd. */
 #define	USB_VENDOR_ACARD	0x0678		/* ACARD Technology Corp. */
 #define	USB_VENDOR_PROLIFIC	0x067b		/* Prolific Technology Inc. */
 #define	USB_VENDOR_ADVANCELOGIC	0x0680		/* Avance Logic, Inc. */
+#define	USB_VENDOR_CTX	0x0698		/* Chuntex */
 #define	USB_VENDOR_ASKEY	0x069a		/* Askey Computer Corp. */
 #define	USB_VENDOR_ALCATELT	0x06b9		/* Alcatel Telecom */
 #define	USB_VENDOR_AGFA	0x06bd		/* AGFA-Gevaert NV */
@@ -168,6 +172,7 @@
 #define	USB_VENDOR_SIRIUS	0x06ea		/* Sirius Technologies */
 #define	USB_VENDOR_BOSTON	0x06fd		/* Boston Acoustics */
 #define	USB_VENDOR_SMC	0x0707		/* Standard Microsystems Corp */
+#define	USB_VENDOR_MCT	0x0711		/* MCT Corp. */
 #define	USB_VENDOR_AUREAL	0x0755		/* Aureal Semiconductor */
 #define	USB_VENDOR_MIDIMAN	0x0763		/* Midiman */
 #define	USB_VENDOR_SANDISK	0x0781		/* SanDisk Corp */
@@ -205,7 +210,9 @@
 #define	USB_VENDOR_BURRBROWN	0x08bb		/* Burr-Brown Japan, Ltd. */
 #define	USB_VENDOR_2WIRE	0x08c8		/* 2Wire, Inc */
 #define	USB_VENDOR_AIPTEK	0x08ca		/* AIPTEK International, Inc. */
+#define	USB_VENDOR_SMARTBRIDGES	0x08d1		/* SmartBridges Pte Ltd. */
 #define	USB_VENDOR_BILLIONTON	0x08dd		/* Billionton Systems, Inc. */
+#define	USB_VENDOR_EXTENDED	0x08e9		/* Extended Systems, Inc. */
 #define	USB_VENDOR_AUTHENTEC	0x08ff		/* AuthenTec, Inc. */
 #define	USB_VENDOR_ALATION	0x0910		/* Alation Systems, Inc. */
 #define	USB_VENDOR_BIOMETRIC	0x0929		/* American Biometric Company */
@@ -227,6 +234,7 @@
 #define	USB_VENDOR_ASAHIOPTICAL	0x0a17		/* Asahi Optical Co., Ltd. */
 #define	USB_VENDOR_BOCASYSTEMS	0x0a43		/* Boca Systems, Inc. */
 #define	USB_VENDOR_BROADCOM	0x0a5c		/* Broadcom Corp. */
+#define	USB_VENDOR_GEOCAST	0x0a79		/* Geocast Network Systems */
 #define	USB_VENDOR_MOTOROLA	0x1063		/* Motorola */
 #define	USB_VENDOR_PLX	0x10b5		/* PLX */
 #define	USB_VENDOR_INSIDEOUT	0x1608		/* Inside Out Networks */
@@ -320,6 +328,9 @@
 /* Chicony products */
 #define	USB_PRODUCT_CHICONY_KB8933	0x0001		/* KB-8933 keyboard */
 
+/* Compaq products */
+#define	USB_PRODUCT_COMPAQ_PJB100	0x504a		/* Personal Jukebox PJB100 */
+
 /* Connectix products */
 #define	USB_PRODUCT_CONNECTIX_QUICKCAM	0x0001		/* QuickCam */
 
@@ -327,6 +338,12 @@
 #define	USB_PRODUCT_COREGA_ETHER_USB_T	0x0001		/* Ether USB-T */
 #define	USB_PRODUCT_COREGA_FETHER_USB_TX	0x0004		/* FEther USB-TX */
 
+/* Creative Labs products */
+#define	USB_PRODUCT_CREATIVELABS_NOMAD_II	0x1002		/* Nomad II */
+
+/* CTX products */
+#define	USB_PRODUCT_CTX_EX1300	0x9999		/* Ex1300 hub */
+
 /* Cypress Semiconductor products */
 #define	USB_PRODUCT_CYPRESS_MOUSE	0x0001		/* mouse */
 #define	USB_PRODUCT_CYPRESS_THERMO	0x0002		/* thermometer */
@@ -368,13 +385,16 @@
 /*product ENTREGA SERIAL	0x8001	DB25 Serial connector*/
 /*product ENTREGA SERIAL_DB9	0x8093	DB9 Serial connector*/
 
-/* e-TEK Labs products */
-#define	USB_PRODUCT_ETEK_1COM	0x8007		/* Serial port */
-
 /* Epson products */
 #define	USB_PRODUCT_EPSON_PRINTER2	0x0002		/* ISD USB Smart Cable for Mac */
 #define	USB_PRODUCT_EPSON_PRINTER3	0x0003		/* ISD USB Smart Cable */
 
+/* e-TEK Labs products */
+#define	USB_PRODUCT_ETEK_1COM	0x8007		/* Serial port */
+
+/* Extended Systems products */
+#define	USB_PRODUCT_EXTENDED_XTNDACCESS	0x0100		/* XTNDAccess IrDA */
+
 /* Gravis products */
 #define	USB_PRODUCT_GRAVIS_GAMEPADPRO	0x4001		/* GamePad Pro */
 
@@ -415,6 +435,7 @@
 
 /* Iomega products */
 #define	USB_PRODUCT_IOMEGA_ZIP100	0x0001		/* Zip 100 */
+#define	USB_PRODUCT_IOMEGA_ZIP250	0x0030		/* Zip 250 */
 
 /* Kawasaki products */
 #define	USB_PRODUCT_KLSI_DUH3E10BT	0x0008		/* USB ethernet controller engine */
@@ -454,19 +475,24 @@
 /* Linksys products */
 #define	USB_PRODUCT_LINKSYS_USB10T	0x2202		/* USB10T Ethernet */
 #define	USB_PRODUCT_LINKSYS_USB100TX	0x2203		/* USB100TX Ethernet */
+#define	USB_PRODUCT_LINKSYS_USB100H1	0x2204		/* USB100H1 Ethernet/HPNA */
 #define	USB_PRODUCT_LINKSYS_USB10TA	0x2206		/* USB10TA Ethernet */
 
 /* Logitech products */
 #define	USB_PRODUCT_LOGITECH_M2452	0x0203		/* M2452 keyboard */
 #define	USB_PRODUCT_LOGITECH_M4848	0x0301		/* M4848 mouse */
-#define	USB_PRODUCT_LOGITECH_QUICKCAM	0x0801		/* QuickCam */
+#define	USB_PRODUCT_LOGITECH_PAGESCAN	0x040f		/* PageScan */
+#define	USB_PRODUCT_LOGITECH_QUICKCAMWEB	0x0801		/* QuickCam Web */
 #define	USB_PRODUCT_LOGITECH_QUICKCAMPRO	0x0810		/* QuickCam Pro */
+#define	USB_PRODUCT_LOGITECH_QUICKCAMEXP	0x0840		/* QuickCam Express */
+#define	USB_PRODUCT_LOGITECH_QUICKCAM	0x0850		/* QuickCam */
 #define	USB_PRODUCT_LOGITECH_N43	0xc000		/* N43 */
 #define	USB_PRODUCT_LOGITECH_N48	0xc001		/* N48 mouse */
 #define	USB_PRODUCT_LOGITECH_MBA47	0xc002		/* M-BA47 mouse */
 #define	USB_PRODUCT_LOGITECH_WMMOUSE	0xc004		/* WingMan Gaming Mouse */
 #define	USB_PRODUCT_LOGITECH_WMPAD	0xc208		/* WingMan GamePad Extreme */
 #define	USB_PRODUCT_LOGITECH_WMJOY	0xc281		/* WingMan Force joystick */
+#define	USB_PRODUCT_LOGITECH_QUICKCAMPRO2	0xd001		/* QuickCam Pro */
 
 /* Lucent products */
 #define	USB_PRODUCT_LUCENT_EVALKIT	0x1001		/* USS-720 evaluation kit */
@@ -474,6 +500,10 @@
 /* Macally products */
 #define	USB_PRODUCT_MACALLY_MOUSE1	0x0101		/* mouse */
 
+/* MCT Corp. */
+#define	USB_PRODUCT_MCT_HUB0100	0x0100		/* Hub */
+#define	USB_PRODUCT_MCT_USB232	0x0210		/* USB-232 Interface */
+
 /* Melco, Inc products */
 #define	USB_PRODUCT_MELCO_LUATX	0x0001		/* LU-ATX Ethernet */
 
@@ -510,6 +540,7 @@
 
 /* OmniVision Technologies, Inc. products */
 #define	USB_PRODUCT_OMNIVISION_OV511	0x0511		/* OV511 Camera */
+#define	USB_PRODUCT_OMNIVISION_OV511PLUS	0xa511		/* OV511+ Camera */
 
 /* Palm Computing, Inc. */
 #define	USB_PRODUCT_PALM_SERIAL	0x0080		/* USB Serial Adaptor */
@@ -524,6 +555,7 @@
 #define	USB_PRODUCT_PHILIPS_DSS350	0x0101		/* DSS 350 Digital Speaker System */
 #define	USB_PRODUCT_PHILIPS_DSS	0x0104		/* DSS XXX Digital Speaker System */
 #define	USB_PRODUCT_PHILIPS_HUB	0x0201		/* hub */
+#define	USB_PRODUCT_PHILIPS_PCVC680K	0x0308		/* PCVC680K Vesta Pro PC Camera */
 #define	USB_PRODUCT_PHILIPS_DSS150	0x0471		/* DSS 150 Digital Speaker System */
 
 /* P.I. Engineering products */
@@ -562,6 +594,9 @@
 /* Sirius Technologies products */
 #define	USB_PRODUCT_SIRIUS_ROADSTER	0x0001		/* NetComm Roadster II 56 USB */
 
+/* SmartBridges products */
+#define	USB_PRODUCT_SMARTBRIDGES_SMARTLINK	0x0001		/* SmartLink USB ethernet adapter */
+
 /* SMC products */
 #define	USB_PRODUCT_SMC_2102USB	0x0100		/* 10Mbps ethernet adapter */
 #define	USB_PRODUCT_SMC_2202USB	0x0200		/* 10/100 ethernet adapter */
@@ -576,6 +611,9 @@
 #define	USB_PRODUCT_SUN_KEYBOARD	0x0005		/* Type 6 USB */
 /* XXX The above is a North American PC style keyboard possibly */
 
+/* TEAC products */
+#define	USB_PRODUCT_TEAC_FD05PUB	0x0000		/* FD-05PUB floppy */
+
 /* Telex Communications products */
 #define	USB_PRODUCT_TELEX_MIC1	0x0001		/* Enhanced USB Microphone */
 
@@ -589,7 +627,7 @@
 #define	USB_PRODUCT_UNIACCESS_PANACHE	0x0101		/* Panache Surf USB ISDN Adapter */
 
 /* Vision products */
-#define	USB_PRODUCT_VISION_VC6452V002	0x0002		/* VC6452V002 Camera */
+#define	USB_PRODUCT_VISION_VC6452V002	0x0002		/* CPiA Camera */
 
 /* Wacom products */
 #define	USB_PRODUCT_WACOM_CT0405U	0x0000		/* CT-0405-U Tablet */