diff options
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/if_aue.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/if_cue.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/if_kue.c | 8 | ||||
| -rw-r--r-- | sys/dev/usb/usb.h | 6 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs | 183 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs.h | 182 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs_data.h | 717 |
7 files changed, 953 insertions, 155 deletions
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c index 3bec16926b8..0540d60cccf 100644 --- a/sys/dev/usb/if_aue.c +++ b/sys/dev/usb/if_aue.c @@ -1,5 +1,5 @@ -/* $OpenBSD: if_aue.c,v 1.2 2000/03/30 16:19:32 aaron Exp $ */ -/* $NetBSD: if_aue.c,v 1.36 2000/03/30 00:18:17 augustss Exp $ */ +/* $OpenBSD: if_aue.c,v 1.3 2000/04/04 22:52:29 aaron Exp $ */ +/* $NetBSD: if_aue.c,v 1.37 2000/04/02 21:25:41 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 * Bill Paul <wpaul@ee.columbia.edu>. All rights reserved. @@ -1448,6 +1448,8 @@ aue_send(sc, m, idx) /* Transmit */ err = usbd_transfer(c->aue_xfer); if (err != USBD_IN_PROGRESS) { + printf("%s: aue_send error=%s\n", USBDEVNAME(sc->aue_dev), + usbd_errstr(err)); aue_stop(sc); return (EIO); } diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c index 8a425317383..532b7cba30d 100644 --- a/sys/dev/usb/if_cue.c +++ b/sys/dev/usb/if_cue.c @@ -1,5 +1,5 @@ -/* $OpenBSD: if_cue.c,v 1.2 2000/03/30 16:19:32 aaron Exp $ */ -/* $NetBSD: if_cue.c,v 1.20 2000/03/30 08:53:30 augustss Exp $ */ +/* $OpenBSD: if_cue.c,v 1.3 2000/04/04 22:52:30 aaron Exp $ */ +/* $NetBSD: if_cue.c,v 1.21 2000/04/02 21:25:41 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 * Bill Paul <wpaul@ee.columbia.edu>. All rights reserved. @@ -1192,6 +1192,8 @@ cue_send(sc, m, idx) /* Transmit */ err = usbd_transfer(c->cue_xfer); if (err != USBD_IN_PROGRESS) { + printf("%s: cue_send error=%s\n", USBDEVNAME(sc->cue_dev), + usbd_errstr(err)); cue_stop(sc); return (EIO); } diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c index cbc43e37102..ff8822d12d9 100644 --- a/sys/dev/usb/if_kue.c +++ b/sys/dev/usb/if_kue.c @@ -1,5 +1,5 @@ -/* $OpenBSD: if_kue.c,v 1.3 2000/03/30 16:19:32 aaron Exp $ */ -/* $NetBSD: if_kue.c,v 1.27 2000/03/30 00:18:17 augustss Exp $ */ +/* $OpenBSD: if_kue.c,v 1.4 2000/04/04 22:52:30 aaron Exp $ */ +/* $NetBSD: if_kue.c,v 1.28 2000/04/02 21:25:41 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 * Bill Paul <wpaul@ee.columbia.edu>. All rights reserved. @@ -1122,8 +1122,8 @@ kue_send(sc, m, idx) /* Transmit */ err = usbd_transfer(c->kue_xfer); if (err != USBD_IN_PROGRESS) { - DPRINTF(("%s: kue_send err=%s\n", USBDEVNAME(sc->kue_dev), - usbd_errstr(err))); + printf("%s: kue_send error=%s\n", USBDEVNAME(sc->kue_dev), + usbd_errstr(err)); kue_stop(sc); return (EIO); } diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h index bc6ed25cdd9..6830d1fd673 100644 --- a/sys/dev/usb/usb.h +++ b/sys/dev/usb/usb.h @@ -1,5 +1,5 @@ -/* $OpenBSD: usb.h,v 1.8 2000/03/28 19:37:50 aaron Exp $ */ -/* $NetBSD: usb.h,v 1.43 2000/03/24 22:16:42 augustss Exp $ */ +/* $OpenBSD: usb.h,v 1.9 2000/04/04 22:52:30 aaron Exp $ */ +/* $NetBSD: usb.h,v 1.44 2000/04/03 13:40:05 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb.h,v 1.14 1999/11/17 22:33:46 n_hibma Exp $ */ /* @@ -425,7 +425,7 @@ typedef struct { #define USB_PORT_RESET_SETTLE 10 /* ms */ #define USB_PORT_POWERUP_DELAY 100 /* ms */ #define USB_SET_ADDRESS_SETTLE 2 /* ms */ -#define USB_RESUME_TIME (20*5) /* ms */ +#define USB_RESUME_DELAY (20*5) /* ms */ #define USB_RESUME_WAIT 10 /* ms */ #define USB_RESUME_RECOVERY 10 /* ms */ #else diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 0a3eaba658d..0bc8a3aafac 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -1,8 +1,8 @@ -$OpenBSD: usbdevs,v 1.15 2000/03/28 19:37:51 aaron Exp $ -/* $NetBSD: usbdevs,v 1.87 2000/03/26 15:08:02 augustss Exp $ */ +$OpenBSD: +/* $NetBSD: usbdevs,v 1.88 2000/04/03 12:09:43 augustss Exp $ */ /* - * Copyright (c) 1998 The NetBSD Foundation, Inc. + * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation @@ -42,96 +42,188 @@ $OpenBSD: usbdevs,v 1.15 2000/03/28 19:37:51 aaron Exp $ * List of known USB vendors */ -vendor AOX 0x03e8 Aox Inc. +vendor AOX 0x03e8 AOX, Inc. +vendor ATMEL 0x03eb Atmel Corp. vendor HP 0x03f0 Hewlett Packard +vendor ADAPTEC 0x03f3 Adaptec, Inc. +vendor ACERLABS 0x0402 Acer Labs, Inc. vendor FUTURE 0x0403 Future Technology Devices vendor NEC 0x0409 NEC vendor KODAK 0x040a Eastman Kodak Corp. -vendor MELCO 0x0411 Melco Inc. +vendor MELCO 0x0411 Melco, Inc. +vendor ADI 0x0422 ADI Systems, Inc. vendor CATC 0x0423 Computer Access Technology Corp. vendor GRAVIS 0x0428 Advanced Gravis Computer Tech. Ltd. vendor SUN 0x0430 Sun Microsystems -vendor LEXMARK 0x043d Lexmark International Inc. +vendor AMD 0x0438 Advanced Micro Devices +vendor LEXMARK 0x043d Lexmark International, Inc. vendor NANAO 0x0440 NANAO Corp. +vendor ALPS 0x044e Alps Electric Co., Ltd. vendor THRUST 0x044f Thrustmaster vendor TI 0x0451 Texas Instruments +vendor ANALOGDEVICES 0x0456 Analog Devices, Inc. vendor KYE 0x0458 KYE Systems Corp. vendor MICROSOFT 0x045e Microsoft vendor PRIMAX 0x0461 Primax Electronics +vendor AMP 0x0464 AMP, Inc. vendor CHERRY 0x046a Cherry Mikroschalter GmbH -vendor LOGITECH 0x046d Logitech Inc. +vendor MEGATRENDS 0x046b American Megatrends +vendor LOGITECH 0x046d Logitech, Inc. vendor BTC 0x046e Behavior Tech. Computer vendor PHILIPS 0x0471 Philips vendor CONNECTIX 0x0478 Connectix Corp. vendor KENSINGTON 0x047d Kensington vendor LUCENT 0x047e Lucent vendor STMICRO 0x0483 STMicroelectronics -vendor ACER 0x04a5 Acer Peripheral Inc. -vendor CANON 0x04a9 Canon Inc. +vendor ACERP 0x04a5 Acer Peripherals, Inc. +vendor CANON 0x04a9 Canon, Inc. vendor CYPRESS 0x04b4 Cypress Semiconductor vendor EPSON 0x04b8 Seiko Epson Corp. -vendor IODATA 0x04bb I/O DATA +vendor IODATA 0x04bb I/O Data vendor 3COMUSR 0x04c1 U.S. Robotics vendor KONICA 0x04c8 Konica Corp. -vendor ALTEC 0x04d2 Altec Lansing +vendor ALTEC 0x04d2 Altec Lansing Technologies, Inc. vendor SHUTTLE 0x04e6 Shuttle Technology +vendor ANNABOOKS 0x04ed Annabooks vendor CHICONY 0x04f2 Chicony Electronics Co., Ltd. -vendor BROTHER 0x04f9 Brother Industries Corp. +vendor BROTHER 0x04f9 Brother Industries, Ltd. vendor DALLAS 0x04fa Dallas Semiconductor +vendor ACER 0x0502 Acer, Inc. vendor 3COM 0x0506 3Com Corp. +vendor AZTECH 0x0509 Aztech Systems Ltd vendor BELKIN 0x050d Belkin Components vendor KAWATSU 0x050f Kawatsu Semiconductor, Inc. vendor APC 0x051d American Power Conversion +vendor CONNECTEK 0x0522 Advanced Connectek USA, Inc. vendor NETCHIP 0x0525 NetChip Technology -vendor AKS 0x0529 Fast Security AG +vendor ALTRA 0x0527 ALTRA +vendor ATI 0x0528 ATI Technologies, Inc. +vendor AKS 0x0529 Aladdin Knowledge Systems vendor UNIACCESS 0x0540 Universal Access -vendor ANCHOR 0x0547 Anchor Chips Inc. +vendor ANCHOR 0x0547 Anchor Chips, Inc. vendor VISION 0x0553 VLSI Vision Ltd. -vendor ATEN 0x0557 ATEN International Corp. Ltd. -vendor MUSTEK 0x055f Mustek Systems Inc. -vendor TELEX 0x0562 Telex Communications Inc. -vendor PERACOM 0x0565 Peracom Networks Inc. +vendor ASAHIKASEI 0x0556 Asahi Kasei Microsystems Co., Ltd +vendor ATEN 0x0557 ATEN International Co. Ltd. +vendor MUSTEK 0x055f Mustek Systems, Inc. +vendor TELEX 0x0562 Telex Communications, Inc. +vendor PERACOM 0x0565 Peracom Networks, Inc. vendor WACOM 0x056a WACOM Corp. Ltd. vendor ETEK 0x056c e-TEK Labs vendor EIZO 0x056d EIZO vendor ELECOM 0x056e Elecom Corp. Ltd. +vendor BAFO 0x0576 BAFO/Quality Computer Accessories vendor YEDATA 0x057b Y-E Data +vendor AVM 0x057c AVM GmbH vendor QUICKSHOT 0x057f Quickshot vendor ROCKFIRE 0x0583 Rockfire +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 OMNIVISION 0x05a9 OmniVision vendor INSYSTEM 0x05ab In-System Design vendor APPLE 0x05ac Apple Computer vendor DIGI 0x05c5 Digi International vendor QTRONIX 0x05c7 Qtronix Corp vendor ELSA 0x05cc ELSA Gmbh +vendor BRAINBOXES 0x05d1 Brainboxes Limited +vendor AXIOHM 0x05d9 Axiohm Transaction Solutions vendor EIZONANAO 0x05e7 EIZO Nanao vendor KLSI 0x05e9 Kawasaki LSI +vendor ANKO 0x05ef Anko Electronic Co., Ltd. vendor PIENGINEERING 0x05f3 P.I. Engineering +vendor AOC 0x05f6 AOC International vendor CHIC 0x05fe Chic Technology +vendor BARCO 0x0600 Barco Display Systems +vendor BRIDGE 0x0607 Bridge Information Co., Ltd. vendor SOLIDYEAR 0x060b Solid Year +vendor BIORAD 0x0614 Bio-Rad Laboratories vendor MACALLY 0x0618 Macally -vendor LINKSYS 0x066b Linksys Inc. +vendor ACTLABS 0x061c Act Labs, Ltd. +vendor ALARIS 0x0620 Alaris, Inc. +vendor APEX 0x0624 Apex, Inc. +vendor AVISION 0x0638 Avision, Inc. +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 ADVANCELOGIC 0x0680 Avance Logic, Inc. +vendor ASKEY 0x069a Askey Computer Corp. +vendor ALCATELT 0x06b9 Alcatel Telecom +vendor AGFA 0x06bd AGFA-Gevaert NV +vendor ASIAMD 0x06be Asia Microelectronic Development, Inc. +vendor BIZLINK 0x06c4 Bizlink International Corp. +vendor AASHIMA 0x06d6 Aashima Technology B.V. vendor MULTITECH 0x06e0 MultiTech -vendor ADS 0x06e1 ADS Technologies +vendor ADS 0x06e1 ADS Technologies, Inc. +vendor ALCATELM 0x06e4 Alcatel Microelectronics vendor SIRIUS 0x06ea Sirius Technologies +vendor BOSTON 0x06fd Boston Acoustics vendor SMC 0x0707 Standard Microsystems Corp +vendor AUREAL 0x0755 Aureal Semiconductor vendor MIDIMAN 0x0763 Midiman vendor SANDISK 0x0781 SanDisk Corp -vendor ADMTEK 0x07a6 ADMtek Inc. +vendor BRIMAX 0x078e Brimax, Inc. +vendor AXIS 0x0792 Axis Communications AB +vendor ABL 0x0794 ABL Electronics Corp. +vendor ALFADATA 0x079d Alfadata Computer Corp. +vendor BE 0x07a4 Be, Inc. +vendor ADMTEK 0x07a6 ADMtek, Inc. vendor COREGA 0x07aa Corega +vendor FREECOM 0x07ab Freecom +vendor ABOCOM 0x07b8 AboCom Systems, Inc. +vendor KEISOKUGIKEN 0x07c1 Keisokugiken Corp. +vendor APG 0x07c5 APG Cash Drawer +vendor BUG 0x07c8 B.U.G., Inc. +vendor ALLIEDTELESYN 0x07c9 Allied Telesyn International +vendor AVERMEDIA 0x07ca AVerMedia Technologies, Inc. vendor SIIG 0x07cc SIIG -vendor ZOOM 0x0803 Zoom Telephonics Inc. -vendor HANDSPRING 0x082d Handspring Inc. +vendor APTIO 0x07d2 Aptio Products, Inc. +vendor ARASAN 0x07da Arasan Chip Systems +vendor ALLIEDCABLE 0x07e6 Allied Cable Corp. +vendor ZOOM 0x0803 Zoom Telephonics, Inc. +vendor BROADLOGIC 0x0827 BroadLogic, Inc. +vendor HANDSPRING 0x082d Handspring, Inc. +vendor ACTIONSTAR 0x0835 Action Star Enterprise Co., Ltd. vendor PALM 0x0830 Palm Computing, Inc. +vendor ACCTON 0x083a Accton Technology Corp. vendor DIAMOND 0x0841 Diamond -vendor NETGEAR 0x0846 BayNETGEAR Inc. -vendor ACTIVEWIRE 0x0854 ActiveWire Inc. -vendor BILLIONTON 0x08dd Billionton Systems Inc. +vendor NETGEAR 0x0846 BayNETGEAR, Inc. +vendor ACTIVEWIRE 0x0854 ActiveWire, Inc. +vendor ADESSOKBTEK 0x087c ADESSO/Kbtek America, Inc. +vendor APT 0x0880 APT Technologies, Inc. +vendor BOCARESEARCH 0x0885 Boca Research, Inc. +vendor ANDREA 0x08a8 Andrea Electronics +vendor BURRBROWN 0x08bb Burr-Brown Japan, Ltd. +vendor 2WIRE 0x08c8 2Wire, Inc +vendor AIPTEK 0x08ca AIPTEK International, Inc. +vendor BILLIONTON 0x08dd Billionton Systems, Inc. +vendor AUTHENTEC 0x08ff AuthenTec, Inc. +vendor ALATION 0x0910 Alation Systems, Inc. +vendor BIOMETRIC 0x0929 American Biometric Company +vendor BLUEWATER 0x0956 BlueWater Systems, Inc. +vendor AGILENT 0x0957 Agilent Technologies, Inc. +vendor ADIRONDACK 0x0976 Adirondack Wire & Cable +vendor BECKHOFF 0x0978 Beckhoff Gmbh +vendor ALTIUS 0x09b3 Altius Solutions, Inc. +vendor ARRIS 0x09c1 Arris Interactive LLC +vendor ACTIVCARD 0x09c3 ACTIVCARD, INC. +vendor ACTISYS 0x09c4 ACTiSYS Corp. +vendor AFOURTECH 0x09da A-FOUR TECH CO., LTD. +vendor AIMEX 0x09dc AIMEX Corp. +vendor ADDONICS 0x09df Addonics Technologies Corp. +vendor AKAI 0x09e8 AKAI professional M.I. Corp. +vendor ARESCOM 0x09f5 ARESCOM +vendor BAY 0x09f9 Bay Associates +vendor ALTERA 0x09fb Altera +vendor ASAHIOPTICAL 0x0a17 Asahi Optical Co., Ltd. +vendor BOCASYSTEMS 0x0a43 Boca Systems, Inc. +vendor BROADCOM 0x0a5c Broadcom Corp. vendor MOTOROLA 0x1063 Motorola vendor PLX 0x10b5 PLX vendor INSIDEOUT 0x1608 Inside Out Networks vendor ENTREGA 0x1645 Entrega +vendor ACTIONTEC 0x1668 Actiontec Electronics, Inc. vendor DLINK 0x2001 D-Link Corp vendor INTEL 0x8086 Intel @@ -143,17 +235,19 @@ vendor INTEL 0x8086 Intel product 3COM HOMECONN 0x009d HomeConnect USB Camera product 3COM 3C19250 0x03E8 3C19250 Ethernet adapter product 3COM USR56K 0x3021 U.S.Robotics 56000 Voice Faxmodem Pro + product 3COM 3C460 0x11f8 HomeConnect Ethernet USB Adapter product 3COMUSR OFFICECONN 0x0082 3Com OfficeConnect Analog Modem product 3COMUSR USRISDN 0x008f 3Com U.S. Robotics Pro ISDN TA -product 3COMUSR HOMECONN 0x009d 3Com HomeConnect camera +product 3COMUSR HOMECONN 0x009d 3Com HomeConnect camera product 3COMUSR USR56K 0x3021 U.S.Robotics 56000 Voice Faxmodem Pro -/* Acer products */ -product ACER ACERSCAN_C310U 0x12a6 Acerscan C310U -/* ActiveWire Inc. products */ +/* Acer Peripherals, Inc. products */ +product ACERP ACERSCAN_C310U 0x12a6 Acerscan C310U + +/* ActiveWire, Inc. products */ product ACTIVEWIRE IOBOARD 0x0100 I/O Board product ACTIVEWIRE IOBOARD_FW1 0x0101 I/O Board, rev. 1 firmware @@ -179,7 +273,7 @@ product APC UPSPRO500 0x0002 Back-UPS Pro 500 /* Anchor products */ product ANCHOR EZUSB 0x2131 EZUSB -/* AOX Inc. products */ +/* AOX, Inc. products */ product AOX USB101 0x0008 USB ethernet controller engine /* ATen products */ @@ -198,7 +292,7 @@ product BROTHER HL1050 0x0002 HL-1050 laser printer /* Behavior Technology Computer products */ product BTC BTC7932 0x6782 Keyboard with mouse port -/* Canon Inc. products */ +/* Canon, Inc. products */ product CANON S10 0x3041 PowerShot S10 /* CATC products */ @@ -275,10 +369,13 @@ product EPSON PRINTER3 0x0003 ISD USB Smart Cable /* Gravis products */ product GRAVIS GAMEPADPRO 0x4001 GamePad Pro +/* Freecom products */ +product FREECOM DVD 0xfc01 Connector for DVD drive + /* Future Technology Devices products */ product FUTURE SERIAL 0x8372 Serial converter -/* Handspring Inc. */ +/* Handspring, Inc. */ product HANDSPRING VISOR 0x0100 Handspring Visor /* HP products */ @@ -304,7 +401,7 @@ product INSYSTEM ISD110 0x0200 IDE adapter product INTEL TESTBOARD 0x9890 82930 test board /* I/O DATA products */ -product IODATA USBETTX 0x0904 +product IODATA USBETTX 0x0904 USB ETTX /* Iomega products */ product IOMEGA ZIP100 0x0001 Zip 100 @@ -315,6 +412,12 @@ product KLSI DUH3E10BT 0x0008 USB ethernet controller engine /* Kawatsu products */ product KAWATSU MH4000P 0x0003 MiniHub 4000P +/* Keisokugiken Corp. products */ +product KEISOKUGIKEN USBDAQ 0x0068 HKS-0200 USBDAQ + +/* Kawasaki LSI products (?) */ +product KLSI DUH3E10BT 0x0008 10BT Ethernet adapter, in the DU-H3E + /* Kensington products */ product KENSINGTON ORBIT 0x1003 Orbit USB/PS2 trackball product KENSINGTON TURBOBALL 0x1005 TurboBall @@ -341,6 +444,7 @@ product LEXMARK S2450 0x0009 Optra S 2450 /* Linksys products */ product LINKSYS USB10T 0x2202 USB10T Ethernet product LINKSYS USB100TX 0x2203 USB100TX Ethernet +product LINKSYS USB10TA 0x2206 USB10TA Ethernet /* Logitech products */ product LOGITECH M2452 0x0203 M2452 keyboard @@ -360,7 +464,7 @@ product LUCENT EVALKIT 0x1001 USS-720 evaluation kit /* Macally products */ product MACALLY MOUSE1 0x0101 mouse -/* Melco Inc products */ +/* Melco, Inc products */ product MELCO LUATX 0x0001 LU-ATX Ethernet /* Microsoft products */ @@ -394,7 +498,7 @@ product NETCHIP TURBOCONNECT 0x1080 Turbo-Connect /* Netgear products */ product NETGEAR EA101 0x1001 Ethernet adapter -/* OmniVision Technologies Inc. products */ +/* OmniVision Technologies, Inc. products */ product OMNIVISION OV511 0x0511 OV511 Camera /* Palm Computing, Inc. */ @@ -403,6 +507,7 @@ product PALM SERIAL 0x0080 USB Serial Adaptor /* Peracom products */ product PERACOM SERIAL1 0x0001 Serial Converter product PERACOM ENET 0x0002 Ethernet adapter +product PERACOM ENET3 0x0003 At Home Ethernet Adapter product PERACOM ENET2 0x0005 Ethernet adapter /* Philips products */ @@ -476,9 +581,9 @@ product VISION VC6452V002 0x0002 VC6452V002 Camera product WACOM CT0405U 0x0000 CT-0405-U Tablet product WACOM GRAPHIRE 0x0010 Graphire product WACOM INTUOSA5 0x0021 Intuos A5 - -/* Y-E data products */ + +/* Y-E Data products */ product YEDATA FLASHBUSTERU 0x0000 Flashbuster-U -/* Zoom Telephonics Inc. products */ +/* Zoom Telephonics, Inc. products */ product ZOOM 2986L 0x9700 2986L Fax modem diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index 1c4f48ada63..02bd15ae6cb 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -1,14 +1,15 @@ -/* $OpenBSD: usbdevs.h,v 1.14 2000/03/28 19:37:52 aaron Exp $ */ +/* $OpenBSD: usbdevs.h,v 1.15 2000/04/04 22:52:30 aaron Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.87 2000/03/26 15:08:02 augustss Exp + * OpenBSD: */ +/* $NetBSD: usbdevs,v 1.88 2000/04/03 12:09:43 augustss Exp $ */ /* - * Copyright (c) 1998 The NetBSD Foundation, Inc. + * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation @@ -48,96 +49,188 @@ * List of known USB vendors */ -#define USB_VENDOR_AOX 0x03e8 /* Aox Inc. */ +#define USB_VENDOR_AOX 0x03e8 /* AOX, Inc. */ +#define USB_VENDOR_ATMEL 0x03eb /* Atmel Corp. */ #define USB_VENDOR_HP 0x03f0 /* Hewlett Packard */ +#define USB_VENDOR_ADAPTEC 0x03f3 /* Adaptec, Inc. */ +#define USB_VENDOR_ACERLABS 0x0402 /* Acer Labs, Inc. */ #define USB_VENDOR_FUTURE 0x0403 /* Future Technology Devices */ #define USB_VENDOR_NEC 0x0409 /* NEC */ #define USB_VENDOR_KODAK 0x040a /* Eastman Kodak Corp. */ -#define USB_VENDOR_MELCO 0x0411 /* Melco Inc. */ +#define USB_VENDOR_MELCO 0x0411 /* Melco, Inc. */ +#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. */ #define USB_VENDOR_SUN 0x0430 /* Sun Microsystems */ -#define USB_VENDOR_LEXMARK 0x043d /* Lexmark International Inc. */ +#define USB_VENDOR_AMD 0x0438 /* Advanced Micro Devices */ +#define USB_VENDOR_LEXMARK 0x043d /* Lexmark International, Inc. */ #define USB_VENDOR_NANAO 0x0440 /* NANAO Corp. */ +#define USB_VENDOR_ALPS 0x044e /* Alps Electric Co., Ltd. */ #define USB_VENDOR_THRUST 0x044f /* Thrustmaster */ #define USB_VENDOR_TI 0x0451 /* Texas Instruments */ +#define USB_VENDOR_ANALOGDEVICES 0x0456 /* Analog Devices, Inc. */ #define USB_VENDOR_KYE 0x0458 /* KYE Systems Corp. */ #define USB_VENDOR_MICROSOFT 0x045e /* Microsoft */ #define USB_VENDOR_PRIMAX 0x0461 /* Primax Electronics */ +#define USB_VENDOR_AMP 0x0464 /* AMP, Inc. */ #define USB_VENDOR_CHERRY 0x046a /* Cherry Mikroschalter GmbH */ -#define USB_VENDOR_LOGITECH 0x046d /* Logitech Inc. */ +#define USB_VENDOR_MEGATRENDS 0x046b /* American Megatrends */ +#define USB_VENDOR_LOGITECH 0x046d /* Logitech, Inc. */ #define USB_VENDOR_BTC 0x046e /* Behavior Tech. Computer */ #define USB_VENDOR_PHILIPS 0x0471 /* Philips */ #define USB_VENDOR_CONNECTIX 0x0478 /* Connectix Corp. */ #define USB_VENDOR_KENSINGTON 0x047d /* Kensington */ #define USB_VENDOR_LUCENT 0x047e /* Lucent */ #define USB_VENDOR_STMICRO 0x0483 /* STMicroelectronics */ -#define USB_VENDOR_ACER 0x04a5 /* Acer Peripheral Inc. */ -#define USB_VENDOR_CANON 0x04a9 /* Canon Inc. */ +#define USB_VENDOR_ACERP 0x04a5 /* Acer Peripherals, Inc. */ +#define USB_VENDOR_CANON 0x04a9 /* Canon, Inc. */ #define USB_VENDOR_CYPRESS 0x04b4 /* Cypress Semiconductor */ #define USB_VENDOR_EPSON 0x04b8 /* Seiko Epson Corp. */ -#define USB_VENDOR_IODATA 0x04bb /* I/O DATA */ +#define USB_VENDOR_IODATA 0x04bb /* I/O Data */ #define USB_VENDOR_3COMUSR 0x04c1 /* U.S. Robotics */ #define USB_VENDOR_KONICA 0x04c8 /* Konica Corp. */ -#define USB_VENDOR_ALTEC 0x04d2 /* Altec Lansing */ +#define USB_VENDOR_ALTEC 0x04d2 /* Altec Lansing Technologies, Inc. */ #define USB_VENDOR_SHUTTLE 0x04e6 /* Shuttle Technology */ +#define USB_VENDOR_ANNABOOKS 0x04ed /* Annabooks */ #define USB_VENDOR_CHICONY 0x04f2 /* Chicony Electronics Co., Ltd. */ -#define USB_VENDOR_BROTHER 0x04f9 /* Brother Industries Corp. */ +#define USB_VENDOR_BROTHER 0x04f9 /* Brother Industries, Ltd. */ #define USB_VENDOR_DALLAS 0x04fa /* Dallas Semiconductor */ +#define USB_VENDOR_ACER 0x0502 /* Acer, Inc. */ #define USB_VENDOR_3COM 0x0506 /* 3Com Corp. */ +#define USB_VENDOR_AZTECH 0x0509 /* Aztech Systems Ltd */ #define USB_VENDOR_BELKIN 0x050d /* Belkin Components */ #define USB_VENDOR_KAWATSU 0x050f /* Kawatsu Semiconductor, Inc. */ #define USB_VENDOR_APC 0x051d /* American Power Conversion */ +#define USB_VENDOR_CONNECTEK 0x0522 /* Advanced Connectek USA, Inc. */ #define USB_VENDOR_NETCHIP 0x0525 /* NetChip Technology */ -#define USB_VENDOR_AKS 0x0529 /* Fast Security AG */ +#define USB_VENDOR_ALTRA 0x0527 /* ALTRA */ +#define USB_VENDOR_ATI 0x0528 /* ATI Technologies, Inc. */ +#define USB_VENDOR_AKS 0x0529 /* Aladdin Knowledge Systems */ #define USB_VENDOR_UNIACCESS 0x0540 /* Universal Access */ -#define USB_VENDOR_ANCHOR 0x0547 /* Anchor Chips Inc. */ +#define USB_VENDOR_ANCHOR 0x0547 /* Anchor Chips, Inc. */ #define USB_VENDOR_VISION 0x0553 /* VLSI Vision Ltd. */ -#define USB_VENDOR_ATEN 0x0557 /* ATEN International Corp. Ltd. */ -#define USB_VENDOR_MUSTEK 0x055f /* Mustek Systems Inc. */ -#define USB_VENDOR_TELEX 0x0562 /* Telex Communications Inc. */ -#define USB_VENDOR_PERACOM 0x0565 /* Peracom Networks Inc. */ +#define USB_VENDOR_ASAHIKASEI 0x0556 /* Asahi Kasei Microsystems Co., Ltd */ +#define USB_VENDOR_ATEN 0x0557 /* ATEN International Co. Ltd. */ +#define USB_VENDOR_MUSTEK 0x055f /* Mustek Systems, Inc. */ +#define USB_VENDOR_TELEX 0x0562 /* Telex Communications, Inc. */ +#define USB_VENDOR_PERACOM 0x0565 /* Peracom Networks, Inc. */ #define USB_VENDOR_WACOM 0x056a /* WACOM Corp. Ltd. */ #define USB_VENDOR_ETEK 0x056c /* e-TEK Labs */ #define USB_VENDOR_EIZO 0x056d /* EIZO */ #define USB_VENDOR_ELECOM 0x056e /* Elecom Corp. Ltd. */ +#define USB_VENDOR_BAFO 0x0576 /* BAFO/Quality Computer Accessories */ #define USB_VENDOR_YEDATA 0x057b /* Y-E Data */ +#define USB_VENDOR_AVM 0x057c /* AVM GmbH */ #define USB_VENDOR_QUICKSHOT 0x057f /* Quickshot */ #define USB_VENDOR_ROCKFIRE 0x0583 /* Rockfire */ +#define USB_VENDOR_ALCOR 0x058f /* Alcor Micro, Inc. */ #define USB_VENDOR_IOMEGA 0x059b /* Iomega Corp. */ +#define USB_VENDOR_ATREND 0x059c /* A-Trend Technology Co., Ltd. */ +#define USB_VENDOR_AID 0x059d /* Advanced Input Devices */ #define USB_VENDOR_OMNIVISION 0x05a9 /* OmniVision */ #define USB_VENDOR_INSYSTEM 0x05ab /* In-System Design */ #define USB_VENDOR_APPLE 0x05ac /* Apple Computer */ #define USB_VENDOR_DIGI 0x05c5 /* Digi International */ #define USB_VENDOR_QTRONIX 0x05c7 /* Qtronix Corp */ #define USB_VENDOR_ELSA 0x05cc /* ELSA Gmbh */ +#define USB_VENDOR_BRAINBOXES 0x05d1 /* Brainboxes Limited */ +#define USB_VENDOR_AXIOHM 0x05d9 /* Axiohm Transaction Solutions */ #define USB_VENDOR_EIZONANAO 0x05e7 /* EIZO Nanao */ #define USB_VENDOR_KLSI 0x05e9 /* Kawasaki LSI */ +#define USB_VENDOR_ANKO 0x05ef /* Anko Electronic Co., Ltd. */ #define USB_VENDOR_PIENGINEERING 0x05f3 /* P.I. Engineering */ +#define USB_VENDOR_AOC 0x05f6 /* AOC International */ #define USB_VENDOR_CHIC 0x05fe /* Chic Technology */ +#define USB_VENDOR_BARCO 0x0600 /* Barco Display Systems */ +#define USB_VENDOR_BRIDGE 0x0607 /* Bridge Information Co., Ltd. */ #define USB_VENDOR_SOLIDYEAR 0x060b /* Solid Year */ +#define USB_VENDOR_BIORAD 0x0614 /* Bio-Rad Laboratories */ #define USB_VENDOR_MACALLY 0x0618 /* Macally */ -#define USB_VENDOR_LINKSYS 0x066b /* Linksys Inc. */ +#define USB_VENDOR_ACTLABS 0x061c /* Act Labs, Ltd. */ +#define USB_VENDOR_ALARIS 0x0620 /* Alaris, Inc. */ +#define USB_VENDOR_APEX 0x0624 /* Apex, Inc. */ +#define USB_VENDOR_AVISION 0x0638 /* Avision, Inc. */ +#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_ADVANCELOGIC 0x0680 /* Avance Logic, Inc. */ +#define USB_VENDOR_ASKEY 0x069a /* Askey Computer Corp. */ +#define USB_VENDOR_ALCATELT 0x06b9 /* Alcatel Telecom */ +#define USB_VENDOR_AGFA 0x06bd /* AGFA-Gevaert NV */ +#define USB_VENDOR_ASIAMD 0x06be /* Asia Microelectronic Development, Inc. */ +#define USB_VENDOR_BIZLINK 0x06c4 /* Bizlink International Corp. */ +#define USB_VENDOR_AASHIMA 0x06d6 /* Aashima Technology B.V. */ #define USB_VENDOR_MULTITECH 0x06e0 /* MultiTech */ -#define USB_VENDOR_ADS 0x06e1 /* ADS Technologies */ +#define USB_VENDOR_ADS 0x06e1 /* ADS Technologies, Inc. */ +#define USB_VENDOR_ALCATELM 0x06e4 /* Alcatel Microelectronics */ #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_AUREAL 0x0755 /* Aureal Semiconductor */ #define USB_VENDOR_MIDIMAN 0x0763 /* Midiman */ #define USB_VENDOR_SANDISK 0x0781 /* SanDisk Corp */ -#define USB_VENDOR_ADMTEK 0x07a6 /* ADMtek Inc. */ +#define USB_VENDOR_BRIMAX 0x078e /* Brimax, Inc. */ +#define USB_VENDOR_AXIS 0x0792 /* Axis Communications AB */ +#define USB_VENDOR_ABL 0x0794 /* ABL Electronics Corp. */ +#define USB_VENDOR_ALFADATA 0x079d /* Alfadata Computer Corp. */ +#define USB_VENDOR_BE 0x07a4 /* Be, Inc. */ +#define USB_VENDOR_ADMTEK 0x07a6 /* ADMtek, Inc. */ #define USB_VENDOR_COREGA 0x07aa /* Corega */ +#define USB_VENDOR_FREECOM 0x07ab /* Freecom */ +#define USB_VENDOR_ABOCOM 0x07b8 /* AboCom Systems, Inc. */ +#define USB_VENDOR_KEISOKUGIKEN 0x07c1 /* Keisokugiken Corp. */ +#define USB_VENDOR_APG 0x07c5 /* APG Cash Drawer */ +#define USB_VENDOR_BUG 0x07c8 /* B.U.G., Inc. */ +#define USB_VENDOR_ALLIEDTELESYN 0x07c9 /* Allied Telesyn International */ +#define USB_VENDOR_AVERMEDIA 0x07ca /* AVerMedia Technologies, Inc. */ #define USB_VENDOR_SIIG 0x07cc /* SIIG */ -#define USB_VENDOR_ZOOM 0x0803 /* Zoom Telephonics Inc. */ -#define USB_VENDOR_HANDSPRING 0x082d /* Handspring Inc. */ +#define USB_VENDOR_APTIO 0x07d2 /* Aptio Products, Inc. */ +#define USB_VENDOR_ARASAN 0x07da /* Arasan Chip Systems */ +#define USB_VENDOR_ALLIEDCABLE 0x07e6 /* Allied Cable Corp. */ +#define USB_VENDOR_ZOOM 0x0803 /* Zoom Telephonics, Inc. */ +#define USB_VENDOR_BROADLOGIC 0x0827 /* BroadLogic, Inc. */ +#define USB_VENDOR_HANDSPRING 0x082d /* Handspring, Inc. */ +#define USB_VENDOR_ACTIONSTAR 0x0835 /* Action Star Enterprise Co., Ltd. */ #define USB_VENDOR_PALM 0x0830 /* Palm Computing, Inc. */ +#define USB_VENDOR_ACCTON 0x083a /* Accton Technology Corp. */ #define USB_VENDOR_DIAMOND 0x0841 /* Diamond */ -#define USB_VENDOR_NETGEAR 0x0846 /* BayNETGEAR Inc. */ -#define USB_VENDOR_ACTIVEWIRE 0x0854 /* ActiveWire Inc. */ -#define USB_VENDOR_BILLIONTON 0x08dd /* Billionton Systems Inc. */ +#define USB_VENDOR_NETGEAR 0x0846 /* BayNETGEAR, Inc. */ +#define USB_VENDOR_ACTIVEWIRE 0x0854 /* ActiveWire, Inc. */ +#define USB_VENDOR_ADESSOKBTEK 0x087c /* ADESSO/Kbtek America, Inc. */ +#define USB_VENDOR_APT 0x0880 /* APT Technologies, Inc. */ +#define USB_VENDOR_BOCARESEARCH 0x0885 /* Boca Research, Inc. */ +#define USB_VENDOR_ANDREA 0x08a8 /* Andrea Electronics */ +#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_BILLIONTON 0x08dd /* Billionton 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 */ +#define USB_VENDOR_BLUEWATER 0x0956 /* BlueWater Systems, Inc. */ +#define USB_VENDOR_AGILENT 0x0957 /* Agilent Technologies, Inc. */ +#define USB_VENDOR_ADIRONDACK 0x0976 /* Adirondack Wire & Cable */ +#define USB_VENDOR_BECKHOFF 0x0978 /* Beckhoff Gmbh */ +#define USB_VENDOR_ALTIUS 0x09b3 /* Altius Solutions, Inc. */ +#define USB_VENDOR_ARRIS 0x09c1 /* Arris Interactive LLC */ +#define USB_VENDOR_ACTIVCARD 0x09c3 /* ACTIVCARD, INC. */ +#define USB_VENDOR_ACTISYS 0x09c4 /* ACTiSYS Corp. */ +#define USB_VENDOR_AFOURTECH 0x09da /* A-FOUR TECH CO., LTD. */ +#define USB_VENDOR_AIMEX 0x09dc /* AIMEX Corp. */ +#define USB_VENDOR_ADDONICS 0x09df /* Addonics Technologies Corp. */ +#define USB_VENDOR_AKAI 0x09e8 /* AKAI professional M.I. Corp. */ +#define USB_VENDOR_ARESCOM 0x09f5 /* ARESCOM */ +#define USB_VENDOR_BAY 0x09f9 /* Bay Associates */ +#define USB_VENDOR_ALTERA 0x09fb /* Altera */ +#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_MOTOROLA 0x1063 /* Motorola */ #define USB_VENDOR_PLX 0x10b5 /* PLX */ #define USB_VENDOR_INSIDEOUT 0x1608 /* Inside Out Networks */ #define USB_VENDOR_ENTREGA 0x1645 /* Entrega */ +#define USB_VENDOR_ACTIONTEC 0x1668 /* Actiontec Electronics, Inc. */ #define USB_VENDOR_DLINK 0x2001 /* D-Link Corp */ #define USB_VENDOR_INTEL 0x8086 /* Intel */ @@ -149,6 +242,7 @@ #define USB_PRODUCT_3COM_HOMECONN 0x009d /* HomeConnect USB Camera */ #define USB_PRODUCT_3COM_3C19250 0x03E8 /* 3C19250 Ethernet adapter */ #define USB_PRODUCT_3COM_USR56K 0x3021 /* U.S.Robotics 56000 Voice Faxmodem Pro */ + #define USB_PRODUCT_3COM_3C460 0x11f8 /* HomeConnect Ethernet USB Adapter */ #define USB_PRODUCT_3COMUSR_OFFICECONN 0x0082 /* 3Com OfficeConnect Analog Modem */ @@ -156,10 +250,11 @@ #define USB_PRODUCT_3COMUSR_HOMECONN 0x009d /* 3Com HomeConnect camera */ #define USB_PRODUCT_3COMUSR_USR56K 0x3021 /* U.S.Robotics 56000 Voice Faxmodem Pro */ -/* Acer products */ -#define USB_PRODUCT_ACER_ACERSCAN_C310U 0x12a6 /* Acerscan C310U */ -/* ActiveWire Inc. products */ +/* Acer Peripherals, Inc. products */ +#define USB_PRODUCT_ACERP_ACERSCAN_C310U 0x12a6 /* Acerscan C310U */ + +/* ActiveWire, Inc. products */ #define USB_PRODUCT_ACTIVEWIRE_IOBOARD 0x0100 /* I/O Board */ #define USB_PRODUCT_ACTIVEWIRE_IOBOARD_FW1 0x0101 /* I/O Board, rev. 1 firmware */ @@ -185,7 +280,7 @@ /* Anchor products */ #define USB_PRODUCT_ANCHOR_EZUSB 0x2131 /* EZUSB */ -/* AOX Inc. products */ +/* AOX, Inc. products */ #define USB_PRODUCT_AOX_USB101 0x0008 /* USB ethernet controller engine */ /* ATen products */ @@ -204,7 +299,7 @@ /* Behavior Technology Computer products */ #define USB_PRODUCT_BTC_BTC7932 0x6782 /* Keyboard with mouse port */ -/* Canon Inc. products */ +/* Canon, Inc. products */ #define USB_PRODUCT_CANON_S10 0x3041 /* PowerShot S10 */ /* CATC products */ @@ -281,10 +376,13 @@ /* Gravis products */ #define USB_PRODUCT_GRAVIS_GAMEPADPRO 0x4001 /* GamePad Pro */ +/* Freecom products */ +#define USB_PRODUCT_FREECOM_DVD 0xfc01 /* Connector for DVD drive */ + /* Future Technology Devices products */ #define USB_PRODUCT_FUTURE_SERIAL 0x8372 /* Serial converter */ -/* Handspring Inc. */ +/* Handspring, Inc. */ #define USB_PRODUCT_HANDSPRING_VISOR 0x0100 /* Handspring Visor */ /* HP products */ @@ -310,7 +408,7 @@ #define USB_PRODUCT_INTEL_TESTBOARD 0x9890 /* 82930 test board */ /* I/O DATA products */ -#define USB_PRODUCT_IODATA_USBETTX 0x0904 +#define USB_PRODUCT_IODATA_USBETTX 0x0904 /* USB ETTX */ /* Iomega products */ #define USB_PRODUCT_IOMEGA_ZIP100 0x0001 /* Zip 100 */ @@ -321,6 +419,12 @@ /* Kawatsu products */ #define USB_PRODUCT_KAWATSU_MH4000P 0x0003 /* MiniHub 4000P */ +/* Keisokugiken Corp. products */ +#define USB_PRODUCT_KEISOKUGIKEN_USBDAQ 0x0068 /* HKS-0200 USBDAQ */ + +/* Kawasaki LSI products (?) */ +#define USB_PRODUCT_KLSI_DUH3E10BT 0x0008 /* 10BT Ethernet adapter, in the DU-H3E */ + /* Kensington products */ #define USB_PRODUCT_KENSINGTON_ORBIT 0x1003 /* Orbit USB/PS2 trackball */ #define USB_PRODUCT_KENSINGTON_TURBOBALL 0x1005 /* TurboBall */ @@ -347,6 +451,7 @@ /* Linksys products */ #define USB_PRODUCT_LINKSYS_USB10T 0x2202 /* USB10T Ethernet */ #define USB_PRODUCT_LINKSYS_USB100TX 0x2203 /* USB100TX Ethernet */ +#define USB_PRODUCT_LINKSYS_USB10TA 0x2206 /* USB10TA Ethernet */ /* Logitech products */ #define USB_PRODUCT_LOGITECH_M2452 0x0203 /* M2452 keyboard */ @@ -366,7 +471,7 @@ /* Macally products */ #define USB_PRODUCT_MACALLY_MOUSE1 0x0101 /* mouse */ -/* Melco Inc products */ +/* Melco, Inc products */ #define USB_PRODUCT_MELCO_LUATX 0x0001 /* LU-ATX Ethernet */ /* Microsoft products */ @@ -400,7 +505,7 @@ /* Netgear products */ #define USB_PRODUCT_NETGEAR_EA101 0x1001 /* Ethernet adapter */ -/* OmniVision Technologies Inc. products */ +/* OmniVision Technologies, Inc. products */ #define USB_PRODUCT_OMNIVISION_OV511 0x0511 /* OV511 Camera */ /* Palm Computing, Inc. */ @@ -409,6 +514,7 @@ /* Peracom products */ #define USB_PRODUCT_PERACOM_SERIAL1 0x0001 /* Serial Converter */ #define USB_PRODUCT_PERACOM_ENET 0x0002 /* Ethernet adapter */ +#define USB_PRODUCT_PERACOM_ENET3 0x0003 /* At Home Ethernet Adapter */ #define USB_PRODUCT_PERACOM_ENET2 0x0005 /* Ethernet adapter */ /* Philips products */ @@ -482,9 +588,9 @@ #define USB_PRODUCT_WACOM_CT0405U 0x0000 /* CT-0405-U Tablet */ #define USB_PRODUCT_WACOM_GRAPHIRE 0x0010 /* Graphire */ #define USB_PRODUCT_WACOM_INTUOSA5 0x0021 /* Intuos A5 */ - -/* Y-E data products */ + +/* Y-E Data products */ #define USB_PRODUCT_YEDATA_FLASHBUSTERU 0x0000 /* Flashbuster-U */ -/* Zoom Telephonics Inc. products */ +/* Zoom Telephonics, Inc. products */ #define USB_PRODUCT_ZOOM_2986L 0x9700 /* 2986L Fax modem */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index 7029f0b0882..8c52b6004a0 100644 --- a/sys/dev/usb/usbdevs_data.h +++ b/sys/dev/usb/usbdevs_data.h @@ -1,14 +1,15 @@ -/* $OpenBSD: usbdevs_data.h,v 1.14 2000/03/28 19:37:52 aaron Exp $ */ +/* $OpenBSD: usbdevs_data.h,v 1.15 2000/04/04 22:52:30 aaron Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.87 2000/03/26 15:08:02 augustss Exp + * OpenBSD: */ +/* $NetBSD: usbdevs,v 1.88 2000/04/03 12:09:43 augustss Exp $ */ /* - * Copyright (c) 1998 The NetBSD Foundation, Inc. + * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation @@ -94,33 +95,33 @@ struct usb_knowndev usb_knowndevs[] = { "U.S.Robotics 56000 Voice Faxmodem Pro", }, { - USB_VENDOR_ACER, USB_PRODUCT_ACER_ACERSCAN_C310U, + USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_C310U, 0, - "Acer Peripheral Inc.", + "Acer Peripherals, Inc.", "Acerscan C310U", }, { USB_VENDOR_ACTIVEWIRE, USB_PRODUCT_ACTIVEWIRE_IOBOARD, 0, - "ActiveWire Inc.", + "ActiveWire, Inc.", "I/O Board", }, { USB_VENDOR_ACTIVEWIRE, USB_PRODUCT_ACTIVEWIRE_IOBOARD_FW1, 0, - "ActiveWire Inc.", + "ActiveWire, Inc.", "I/O Board, rev. 1 firmware", }, { USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS, 0, - "ADMtek Inc.", + "ADMtek, Inc.", "AN986 USB Ethernet adapter", }, { USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BT, 0, - "ADS Technologies", + "ADS Technologies, Inc.", "UBS-10BT Ethernet adapter", }, { @@ -132,19 +133,19 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_AKS, USB_PRODUCT_AKS_USBHASP, 0, - "Fast Security AG", + "Aladdin Knowledge Systems", "USB-HASP 0.06", }, { USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ADA70, 0, - "Altec Lansing", + "Altec Lansing Technologies, Inc.", "ADA70 Speakers", }, { USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ASC495, 0, - "Altec Lansing", + "Altec Lansing Technologies, Inc.", "ASC495 Speakers", }, { @@ -156,37 +157,37 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ANCHOR, USB_PRODUCT_ANCHOR_EZUSB, 0, - "Anchor Chips Inc.", + "Anchor Chips, Inc.", "EZUSB", }, { USB_VENDOR_AOX, USB_PRODUCT_AOX_USB101, 0, - "Aox Inc.", + "AOX, Inc.", "USB ethernet controller engine", }, { USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC1284, 0, - "ATEN International Corp. Ltd.", + "ATEN International Co. Ltd.", "Parallel printer adapter", }, { USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC10T, 0, - "ATEN International Corp. Ltd.", + "ATEN International Co. Ltd.", "10Mbps ethernet adapter", }, { USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100, 0, - "Billionton Systems Inc.", + "Billionton Systems, Inc.", "USB100N 10/100 FastEthernet Adapter", }, { USB_VENDOR_BROTHER, USB_PRODUCT_BROTHER_HL1050, 0, - "Brother Industries Corp.", + "Brother Industries, Ltd.", "HL-1050 laser printer", }, { @@ -198,7 +199,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_CANON, USB_PRODUCT_CANON_S10, 0, - "Canon Inc.", + "Canon, Inc.", "PowerShot S10", }, { @@ -424,6 +425,12 @@ struct usb_knowndev usb_knowndevs[] = { "GamePad Pro", }, { + USB_VENDOR_FREECOM, USB_PRODUCT_FREECOM_DVD, + 0, + "Freecom", + "Connector for DVD drive", + }, + { USB_VENDOR_FUTURE, USB_PRODUCT_FUTURE_SERIAL, 0, "Future Technology Devices", @@ -432,7 +439,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_VISOR, 0, - "Handspring Inc.", + "Handspring, Inc.", "Handspring Visor", }, { @@ -522,8 +529,8 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTX, 0, - "I/O DATA", - "", + "I/O Data", + "USB ETTX", }, { USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP100, @@ -544,6 +551,18 @@ struct usb_knowndev usb_knowndevs[] = { "MiniHub 4000P", }, { + USB_VENDOR_KEISOKUGIKEN, USB_PRODUCT_KEISOKUGIKEN_USBDAQ, + 0, + "Keisokugiken Corp.", + "HKS-0200 USBDAQ", + }, + { + USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BT, + 0, + "Kawasaki LSI", + "10BT Ethernet adapter, in the DU-H3E", + }, + { USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_ORBIT, 0, "Kensington", @@ -618,79 +637,85 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_LEXMARK, USB_PRODUCT_LEXMARK_S2450, 0, - "Lexmark International Inc.", + "Lexmark International, Inc.", "Optra S 2450", }, { USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10T, 0, - "Linksys Inc.", + "Linksys, Inc.", "USB10T Ethernet", }, { USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100TX, 0, - "Linksys Inc.", + "Linksys, Inc.", "USB100TX Ethernet", }, { + USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TA, + 0, + "Linksys, Inc.", + "USB10TA Ethernet", + }, + { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M2452, 0, - "Logitech Inc.", + "Logitech, Inc.", "M2452 keyboard", }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M4848, 0, - "Logitech Inc.", + "Logitech, Inc.", "M4848 mouse", }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAM, 0, - "Logitech Inc.", + "Logitech, Inc.", "QuickCam", }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO, 0, - "Logitech Inc.", + "Logitech, Inc.", "QuickCam Pro", }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_N43, 0, - "Logitech Inc.", + "Logitech, Inc.", "N43", }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_N48, 0, - "Logitech Inc.", + "Logitech, Inc.", "N48 mouse", }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_MBA47, 0, - "Logitech Inc.", + "Logitech, Inc.", "M-BA47 mouse", }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMMOUSE, 0, - "Logitech Inc.", + "Logitech, Inc.", "WingMan Gaming Mouse", }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMPAD, 0, - "Logitech Inc.", + "Logitech, Inc.", "WingMan GamePad Extreme", }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMJOY, 0, - "Logitech Inc.", + "Logitech, Inc.", "WingMan Force joystick", }, { @@ -708,7 +733,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX, 0, - "Melco Inc.", + "Melco, Inc.", "LU-ATX Ethernet", }, { @@ -774,7 +799,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_MDC800, 0, - "Mustek Systems Inc.", + "Mustek Systems, Inc.", "MDC-800 digital camera", }, { @@ -798,7 +823,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101, 0, - "BayNETGEAR Inc.", + "BayNETGEAR, Inc.", "Ethernet adapter", }, { @@ -816,19 +841,25 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1, 0, - "Peracom Networks Inc.", + "Peracom Networks, Inc.", "Serial Converter", }, { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET, 0, - "Peracom Networks Inc.", + "Peracom Networks, Inc.", "Ethernet adapter", }, { + USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET3, + 0, + "Peracom Networks, Inc.", + "At Home Ethernet Adapter", + }, + { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET2, 0, - "Peracom Networks Inc.", + "Peracom Networks, Inc.", "Ethernet adapter", }, { @@ -960,7 +991,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_TELEX, USB_PRODUCT_TELEX_MIC1, 0, - "Telex Communications Inc.", + "Telex Communications, Inc.", "Enhanced USB Microphone", }, { @@ -1014,13 +1045,19 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ZOOM, USB_PRODUCT_ZOOM_2986L, 0, - "Zoom Telephonics Inc.", + "Zoom Telephonics, Inc.", "2986L Fax modem", }, { USB_VENDOR_AOX, 0, USB_KNOWNDEV_NOPROD, - "Aox Inc.", + "AOX, Inc.", + NULL, + }, + { + USB_VENDOR_ATMEL, 0, + USB_KNOWNDEV_NOPROD, + "Atmel Corp.", NULL, }, { @@ -1030,6 +1067,18 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_ADAPTEC, 0, + USB_KNOWNDEV_NOPROD, + "Adaptec, Inc.", + NULL, + }, + { + USB_VENDOR_ACERLABS, 0, + USB_KNOWNDEV_NOPROD, + "Acer Labs, Inc.", + NULL, + }, + { USB_VENDOR_FUTURE, 0, USB_KNOWNDEV_NOPROD, "Future Technology Devices", @@ -1050,7 +1099,13 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_MELCO, 0, USB_KNOWNDEV_NOPROD, - "Melco Inc.", + "Melco, Inc.", + NULL, + }, + { + USB_VENDOR_ADI, 0, + USB_KNOWNDEV_NOPROD, + "ADI Systems, Inc.", NULL, }, { @@ -1072,9 +1127,15 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_AMD, 0, + USB_KNOWNDEV_NOPROD, + "Advanced Micro Devices", + NULL, + }, + { USB_VENDOR_LEXMARK, 0, USB_KNOWNDEV_NOPROD, - "Lexmark International Inc.", + "Lexmark International, Inc.", NULL, }, { @@ -1084,6 +1145,12 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_ALPS, 0, + USB_KNOWNDEV_NOPROD, + "Alps Electric Co., Ltd.", + NULL, + }, + { USB_VENDOR_THRUST, 0, USB_KNOWNDEV_NOPROD, "Thrustmaster", @@ -1096,6 +1163,12 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_ANALOGDEVICES, 0, + USB_KNOWNDEV_NOPROD, + "Analog Devices, Inc.", + NULL, + }, + { USB_VENDOR_KYE, 0, USB_KNOWNDEV_NOPROD, "KYE Systems Corp.", @@ -1114,15 +1187,27 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_AMP, 0, + USB_KNOWNDEV_NOPROD, + "AMP, Inc.", + NULL, + }, + { USB_VENDOR_CHERRY, 0, USB_KNOWNDEV_NOPROD, "Cherry Mikroschalter GmbH", NULL, }, { + USB_VENDOR_MEGATRENDS, 0, + USB_KNOWNDEV_NOPROD, + "American Megatrends", + NULL, + }, + { USB_VENDOR_LOGITECH, 0, USB_KNOWNDEV_NOPROD, - "Logitech Inc.", + "Logitech, Inc.", NULL, }, { @@ -1162,15 +1247,15 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { - USB_VENDOR_ACER, 0, + USB_VENDOR_ACERP, 0, USB_KNOWNDEV_NOPROD, - "Acer Peripheral Inc.", + "Acer Peripherals, Inc.", NULL, }, { USB_VENDOR_CANON, 0, USB_KNOWNDEV_NOPROD, - "Canon Inc.", + "Canon, Inc.", NULL, }, { @@ -1188,7 +1273,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_IODATA, 0, USB_KNOWNDEV_NOPROD, - "I/O DATA", + "I/O Data", NULL, }, { @@ -1206,7 +1291,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ALTEC, 0, USB_KNOWNDEV_NOPROD, - "Altec Lansing", + "Altec Lansing Technologies, Inc.", NULL, }, { @@ -1216,6 +1301,12 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_ANNABOOKS, 0, + USB_KNOWNDEV_NOPROD, + "Annabooks", + NULL, + }, + { USB_VENDOR_CHICONY, 0, USB_KNOWNDEV_NOPROD, "Chicony Electronics Co., Ltd.", @@ -1224,7 +1315,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_BROTHER, 0, USB_KNOWNDEV_NOPROD, - "Brother Industries Corp.", + "Brother Industries, Ltd.", NULL, }, { @@ -1234,12 +1325,24 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_ACER, 0, + USB_KNOWNDEV_NOPROD, + "Acer, Inc.", + NULL, + }, + { USB_VENDOR_3COM, 0, USB_KNOWNDEV_NOPROD, "3Com Corp.", NULL, }, { + USB_VENDOR_AZTECH, 0, + USB_KNOWNDEV_NOPROD, + "Aztech Systems Ltd", + NULL, + }, + { USB_VENDOR_BELKIN, 0, USB_KNOWNDEV_NOPROD, "Belkin Components", @@ -1258,15 +1361,33 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_CONNECTEK, 0, + USB_KNOWNDEV_NOPROD, + "Advanced Connectek USA, Inc.", + NULL, + }, + { USB_VENDOR_NETCHIP, 0, USB_KNOWNDEV_NOPROD, "NetChip Technology", NULL, }, { + USB_VENDOR_ALTRA, 0, + USB_KNOWNDEV_NOPROD, + "ALTRA", + NULL, + }, + { + USB_VENDOR_ATI, 0, + USB_KNOWNDEV_NOPROD, + "ATI Technologies, Inc.", + NULL, + }, + { USB_VENDOR_AKS, 0, USB_KNOWNDEV_NOPROD, - "Fast Security AG", + "Aladdin Knowledge Systems", NULL, }, { @@ -1278,7 +1399,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ANCHOR, 0, USB_KNOWNDEV_NOPROD, - "Anchor Chips Inc.", + "Anchor Chips, Inc.", NULL, }, { @@ -1288,27 +1409,33 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_ASAHIKASEI, 0, + USB_KNOWNDEV_NOPROD, + "Asahi Kasei Microsystems Co., Ltd", + NULL, + }, + { USB_VENDOR_ATEN, 0, USB_KNOWNDEV_NOPROD, - "ATEN International Corp. Ltd.", + "ATEN International Co. Ltd.", NULL, }, { USB_VENDOR_MUSTEK, 0, USB_KNOWNDEV_NOPROD, - "Mustek Systems Inc.", + "Mustek Systems, Inc.", NULL, }, { USB_VENDOR_TELEX, 0, USB_KNOWNDEV_NOPROD, - "Telex Communications Inc.", + "Telex Communications, Inc.", NULL, }, { USB_VENDOR_PERACOM, 0, USB_KNOWNDEV_NOPROD, - "Peracom Networks Inc.", + "Peracom Networks, Inc.", NULL, }, { @@ -1336,12 +1463,24 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_BAFO, 0, + USB_KNOWNDEV_NOPROD, + "BAFO/Quality Computer Accessories", + NULL, + }, + { USB_VENDOR_YEDATA, 0, USB_KNOWNDEV_NOPROD, "Y-E Data", NULL, }, { + USB_VENDOR_AVM, 0, + USB_KNOWNDEV_NOPROD, + "AVM GmbH", + NULL, + }, + { USB_VENDOR_QUICKSHOT, 0, USB_KNOWNDEV_NOPROD, "Quickshot", @@ -1354,12 +1493,30 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_ALCOR, 0, + USB_KNOWNDEV_NOPROD, + "Alcor Micro, Inc.", + NULL, + }, + { USB_VENDOR_IOMEGA, 0, USB_KNOWNDEV_NOPROD, "Iomega Corp.", NULL, }, { + USB_VENDOR_ATREND, 0, + USB_KNOWNDEV_NOPROD, + "A-Trend Technology Co., Ltd.", + NULL, + }, + { + USB_VENDOR_AID, 0, + USB_KNOWNDEV_NOPROD, + "Advanced Input Devices", + NULL, + }, + { USB_VENDOR_OMNIVISION, 0, USB_KNOWNDEV_NOPROD, "OmniVision", @@ -1396,6 +1553,18 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_BRAINBOXES, 0, + USB_KNOWNDEV_NOPROD, + "Brainboxes Limited", + NULL, + }, + { + USB_VENDOR_AXIOHM, 0, + USB_KNOWNDEV_NOPROD, + "Axiohm Transaction Solutions", + NULL, + }, + { USB_VENDOR_EIZONANAO, 0, USB_KNOWNDEV_NOPROD, "EIZO Nanao", @@ -1408,33 +1577,147 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_ANKO, 0, + USB_KNOWNDEV_NOPROD, + "Anko Electronic Co., Ltd.", + NULL, + }, + { USB_VENDOR_PIENGINEERING, 0, USB_KNOWNDEV_NOPROD, "P.I. Engineering", NULL, }, { + USB_VENDOR_AOC, 0, + USB_KNOWNDEV_NOPROD, + "AOC International", + NULL, + }, + { USB_VENDOR_CHIC, 0, USB_KNOWNDEV_NOPROD, "Chic Technology", NULL, }, { + USB_VENDOR_BARCO, 0, + USB_KNOWNDEV_NOPROD, + "Barco Display Systems", + NULL, + }, + { + USB_VENDOR_BRIDGE, 0, + USB_KNOWNDEV_NOPROD, + "Bridge Information Co., Ltd.", + NULL, + }, + { USB_VENDOR_SOLIDYEAR, 0, USB_KNOWNDEV_NOPROD, "Solid Year", NULL, }, { + USB_VENDOR_BIORAD, 0, + USB_KNOWNDEV_NOPROD, + "Bio-Rad Laboratories", + NULL, + }, + { USB_VENDOR_MACALLY, 0, USB_KNOWNDEV_NOPROD, "Macally", NULL, }, { + USB_VENDOR_ACTLABS, 0, + USB_KNOWNDEV_NOPROD, + "Act Labs, Ltd.", + NULL, + }, + { + USB_VENDOR_ALARIS, 0, + USB_KNOWNDEV_NOPROD, + "Alaris, Inc.", + NULL, + }, + { + USB_VENDOR_APEX, 0, + USB_KNOWNDEV_NOPROD, + "Apex, Inc.", + NULL, + }, + { + USB_VENDOR_AVISION, 0, + USB_KNOWNDEV_NOPROD, + "Avision, Inc.", + NULL, + }, + { USB_VENDOR_LINKSYS, 0, USB_KNOWNDEV_NOPROD, - "Linksys Inc.", + "Linksys, Inc.", + NULL, + }, + { + USB_VENDOR_ACERSA, 0, + USB_KNOWNDEV_NOPROD, + "Acer Semiconductor America, Inc.", + NULL, + }, + { + USB_VENDOR_AIWA, 0, + USB_KNOWNDEV_NOPROD, + "Aiwa Co., Ltd.", + NULL, + }, + { + USB_VENDOR_ACARD, 0, + USB_KNOWNDEV_NOPROD, + "ACARD Technology Corp.", + NULL, + }, + { + USB_VENDOR_ADVANCELOGIC, 0, + USB_KNOWNDEV_NOPROD, + "Avance Logic, Inc.", + NULL, + }, + { + USB_VENDOR_ASKEY, 0, + USB_KNOWNDEV_NOPROD, + "Askey Computer Corp.", + NULL, + }, + { + USB_VENDOR_ALCATELT, 0, + USB_KNOWNDEV_NOPROD, + "Alcatel Telecom", + NULL, + }, + { + USB_VENDOR_AGFA, 0, + USB_KNOWNDEV_NOPROD, + "AGFA-Gevaert NV", + NULL, + }, + { + USB_VENDOR_ASIAMD, 0, + USB_KNOWNDEV_NOPROD, + "Asia Microelectronic Development, Inc.", + NULL, + }, + { + USB_VENDOR_BIZLINK, 0, + USB_KNOWNDEV_NOPROD, + "Bizlink International Corp.", + NULL, + }, + { + USB_VENDOR_AASHIMA, 0, + USB_KNOWNDEV_NOPROD, + "Aashima Technology B.V.", NULL, }, { @@ -1446,7 +1729,13 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ADS, 0, USB_KNOWNDEV_NOPROD, - "ADS Technologies", + "ADS Technologies, Inc.", + NULL, + }, + { + USB_VENDOR_ALCATELM, 0, + USB_KNOWNDEV_NOPROD, + "Alcatel Microelectronics", NULL, }, { @@ -1456,12 +1745,24 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_BOSTON, 0, + USB_KNOWNDEV_NOPROD, + "Boston Acoustics", + NULL, + }, + { USB_VENDOR_SMC, 0, USB_KNOWNDEV_NOPROD, "Standard Microsystems Corp", NULL, }, { + USB_VENDOR_AUREAL, 0, + USB_KNOWNDEV_NOPROD, + "Aureal Semiconductor", + NULL, + }, + { USB_VENDOR_MIDIMAN, 0, USB_KNOWNDEV_NOPROD, "Midiman", @@ -1474,9 +1775,39 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_BRIMAX, 0, + USB_KNOWNDEV_NOPROD, + "Brimax, Inc.", + NULL, + }, + { + USB_VENDOR_AXIS, 0, + USB_KNOWNDEV_NOPROD, + "Axis Communications AB", + NULL, + }, + { + USB_VENDOR_ABL, 0, + USB_KNOWNDEV_NOPROD, + "ABL Electronics Corp.", + NULL, + }, + { + USB_VENDOR_ALFADATA, 0, + USB_KNOWNDEV_NOPROD, + "Alfadata Computer Corp.", + NULL, + }, + { + USB_VENDOR_BE, 0, + USB_KNOWNDEV_NOPROD, + "Be, Inc.", + NULL, + }, + { USB_VENDOR_ADMTEK, 0, USB_KNOWNDEV_NOPROD, - "ADMtek Inc.", + "ADMtek, Inc.", NULL, }, { @@ -1486,21 +1817,93 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_FREECOM, 0, + USB_KNOWNDEV_NOPROD, + "Freecom", + NULL, + }, + { + USB_VENDOR_ABOCOM, 0, + USB_KNOWNDEV_NOPROD, + "AboCom Systems, Inc.", + NULL, + }, + { + USB_VENDOR_KEISOKUGIKEN, 0, + USB_KNOWNDEV_NOPROD, + "Keisokugiken Corp.", + NULL, + }, + { + USB_VENDOR_APG, 0, + USB_KNOWNDEV_NOPROD, + "APG Cash Drawer", + NULL, + }, + { + USB_VENDOR_BUG, 0, + USB_KNOWNDEV_NOPROD, + "B.U.G., Inc.", + NULL, + }, + { + USB_VENDOR_ALLIEDTELESYN, 0, + USB_KNOWNDEV_NOPROD, + "Allied Telesyn International", + NULL, + }, + { + USB_VENDOR_AVERMEDIA, 0, + USB_KNOWNDEV_NOPROD, + "AVerMedia Technologies, Inc.", + NULL, + }, + { USB_VENDOR_SIIG, 0, USB_KNOWNDEV_NOPROD, "SIIG", NULL, }, { + USB_VENDOR_APTIO, 0, + USB_KNOWNDEV_NOPROD, + "Aptio Products, Inc.", + NULL, + }, + { + USB_VENDOR_ARASAN, 0, + USB_KNOWNDEV_NOPROD, + "Arasan Chip Systems", + NULL, + }, + { + USB_VENDOR_ALLIEDCABLE, 0, + USB_KNOWNDEV_NOPROD, + "Allied Cable Corp.", + NULL, + }, + { USB_VENDOR_ZOOM, 0, USB_KNOWNDEV_NOPROD, - "Zoom Telephonics Inc.", + "Zoom Telephonics, Inc.", + NULL, + }, + { + USB_VENDOR_BROADLOGIC, 0, + USB_KNOWNDEV_NOPROD, + "BroadLogic, Inc.", NULL, }, { USB_VENDOR_HANDSPRING, 0, USB_KNOWNDEV_NOPROD, - "Handspring Inc.", + "Handspring, Inc.", + NULL, + }, + { + USB_VENDOR_ACTIONSTAR, 0, + USB_KNOWNDEV_NOPROD, + "Action Star Enterprise Co., Ltd.", NULL, }, { @@ -1510,6 +1913,12 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_ACCTON, 0, + USB_KNOWNDEV_NOPROD, + "Accton Technology Corp.", + NULL, + }, + { USB_VENDOR_DIAMOND, 0, USB_KNOWNDEV_NOPROD, "Diamond", @@ -1518,19 +1927,187 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_NETGEAR, 0, USB_KNOWNDEV_NOPROD, - "BayNETGEAR Inc.", + "BayNETGEAR, Inc.", NULL, }, { USB_VENDOR_ACTIVEWIRE, 0, USB_KNOWNDEV_NOPROD, - "ActiveWire Inc.", + "ActiveWire, Inc.", + NULL, + }, + { + USB_VENDOR_ADESSOKBTEK, 0, + USB_KNOWNDEV_NOPROD, + "ADESSO/Kbtek America, Inc.", + NULL, + }, + { + USB_VENDOR_APT, 0, + USB_KNOWNDEV_NOPROD, + "APT Technologies, Inc.", + NULL, + }, + { + USB_VENDOR_BOCARESEARCH, 0, + USB_KNOWNDEV_NOPROD, + "Boca Research, Inc.", + NULL, + }, + { + USB_VENDOR_ANDREA, 0, + USB_KNOWNDEV_NOPROD, + "Andrea Electronics", + NULL, + }, + { + USB_VENDOR_BURRBROWN, 0, + USB_KNOWNDEV_NOPROD, + "Burr-Brown Japan, Ltd.", + NULL, + }, + { + USB_VENDOR_2WIRE, 0, + USB_KNOWNDEV_NOPROD, + "2Wire, Inc", + NULL, + }, + { + USB_VENDOR_AIPTEK, 0, + USB_KNOWNDEV_NOPROD, + "AIPTEK International, Inc.", NULL, }, { USB_VENDOR_BILLIONTON, 0, USB_KNOWNDEV_NOPROD, - "Billionton Systems Inc.", + "Billionton Systems, Inc.", + NULL, + }, + { + USB_VENDOR_AUTHENTEC, 0, + USB_KNOWNDEV_NOPROD, + "AuthenTec, Inc.", + NULL, + }, + { + USB_VENDOR_ALATION, 0, + USB_KNOWNDEV_NOPROD, + "Alation Systems, Inc.", + NULL, + }, + { + USB_VENDOR_BIOMETRIC, 0, + USB_KNOWNDEV_NOPROD, + "American Biometric Company", + NULL, + }, + { + USB_VENDOR_BLUEWATER, 0, + USB_KNOWNDEV_NOPROD, + "BlueWater Systems, Inc.", + NULL, + }, + { + USB_VENDOR_AGILENT, 0, + USB_KNOWNDEV_NOPROD, + "Agilent Technologies, Inc.", + NULL, + }, + { + USB_VENDOR_ADIRONDACK, 0, + USB_KNOWNDEV_NOPROD, + "Adirondack Wire & Cable", + NULL, + }, + { + USB_VENDOR_BECKHOFF, 0, + USB_KNOWNDEV_NOPROD, + "Beckhoff Gmbh", + NULL, + }, + { + USB_VENDOR_ALTIUS, 0, + USB_KNOWNDEV_NOPROD, + "Altius Solutions, Inc.", + NULL, + }, + { + USB_VENDOR_ARRIS, 0, + USB_KNOWNDEV_NOPROD, + "Arris Interactive LLC", + NULL, + }, + { + USB_VENDOR_ACTIVCARD, 0, + USB_KNOWNDEV_NOPROD, + "ACTIVCARD, INC.", + NULL, + }, + { + USB_VENDOR_ACTISYS, 0, + USB_KNOWNDEV_NOPROD, + "ACTiSYS Corp.", + NULL, + }, + { + USB_VENDOR_AFOURTECH, 0, + USB_KNOWNDEV_NOPROD, + "A-FOUR TECH CO., LTD.", + NULL, + }, + { + USB_VENDOR_AIMEX, 0, + USB_KNOWNDEV_NOPROD, + "AIMEX Corp.", + NULL, + }, + { + USB_VENDOR_ADDONICS, 0, + USB_KNOWNDEV_NOPROD, + "Addonics Technologies Corp.", + NULL, + }, + { + USB_VENDOR_AKAI, 0, + USB_KNOWNDEV_NOPROD, + "AKAI professional M.I. Corp.", + NULL, + }, + { + USB_VENDOR_ARESCOM, 0, + USB_KNOWNDEV_NOPROD, + "ARESCOM", + NULL, + }, + { + USB_VENDOR_BAY, 0, + USB_KNOWNDEV_NOPROD, + "Bay Associates", + NULL, + }, + { + USB_VENDOR_ALTERA, 0, + USB_KNOWNDEV_NOPROD, + "Altera", + NULL, + }, + { + USB_VENDOR_ASAHIOPTICAL, 0, + USB_KNOWNDEV_NOPROD, + "Asahi Optical Co., Ltd.", + NULL, + }, + { + USB_VENDOR_BOCASYSTEMS, 0, + USB_KNOWNDEV_NOPROD, + "Boca Systems, Inc.", + NULL, + }, + { + USB_VENDOR_BROADCOM, 0, + USB_KNOWNDEV_NOPROD, + "Broadcom Corp.", NULL, }, { @@ -1558,6 +2135,12 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_ACTIONTEC, 0, + USB_KNOWNDEV_NOPROD, + "Actiontec Electronics, Inc.", + NULL, + }, + { USB_VENDOR_DLINK, 0, USB_KNOWNDEV_NOPROD, "D-Link Corp", |