diff options
| -rw-r--r-- | sys/dev/usb/usbdevs.h | 368 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs_data.h | 582 |
2 files changed, 475 insertions, 475 deletions
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index 5e1b723ae15..06d941fb46d 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -1,10 +1,10 @@ -/* $OpenBSD: usbdevs.h,v 1.27 2000/12/05 21:37:44 deraadt Exp $ */ +/* $OpenBSD: usbdevs.h,v 1.28 2000/12/05 22:58:03 deraadt Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.28 2000/12/05 21:37:39 deraadt Exp + * OpenBSD: usbdevs,v 1.29 2000/12/05 22:58:00 deraadt Exp */ /* $NetBSD: usbdevs,v 1.127 2000/11/15 14:36:09 augustss Exp $ */ @@ -49,237 +49,237 @@ * List of known USB vendors */ -#define USB_VENDOR_AOX 0x03e8 /* AOX, Inc. */ -#define USB_VENDOR_ATMEL 0x03eb /* Atmel Corp. */ +#define USB_VENDOR_AOX 0x03e8 /* AOX */ +#define USB_VENDOR_ATMEL 0x03eb /* Atmel */ #define USB_VENDOR_HP 0x03f0 /* Hewlett Packard */ -#define USB_VENDOR_ADAPTEC 0x03f3 /* Adaptec, Inc. */ +#define USB_VENDOR_ADAPTEC 0x03f3 /* Adaptec */ #define USB_VENDOR_NATIONAL 0x0400 /* National Semiconductor */ -#define USB_VENDOR_ACERLABS 0x0402 /* Acer Labs, Inc. */ +#define USB_VENDOR_ACERLABS 0x0402 /* Acer Labs */ #define USB_VENDOR_FTDI 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_KODAK 0x040a /* Eastman Kodak */ +#define USB_VENDOR_MELCO 0x0411 /* Melco */ #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. */ +#define USB_VENDOR_ADI 0x0422 /* ADI Systems */ +#define USB_VENDOR_CATC 0x0423 /* Computer Access Technology */ +#define USB_VENDOR_GRAVIS 0x0428 /* Advanced Gravis Computer Tech. */ #define USB_VENDOR_SUN 0x0430 /* Sun Microsystems */ #define USB_VENDOR_AMD 0x0438 /* Advanced Micro Devices */ -#define USB_VENDOR_LEXMARK 0x043d /* Lexmark International, Inc. */ +#define USB_VENDOR_LEXMARK 0x043d /* Lexmark International */ #define USB_VENDOR_NANAO 0x0440 /* NANAO Corp. */ -#define USB_VENDOR_ALPS 0x044e /* Alps Electric Co., Ltd. */ +#define USB_VENDOR_ALPS 0x044e /* Alps Electric */ #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_ANALOGDEVICES 0x0456 /* Analog Devices */ +#define USB_VENDOR_KYE 0x0458 /* KYE Systems */ #define USB_VENDOR_DIAMOND2 0x045a /* Diamond (Supra) */ #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_AMP 0x0464 /* AMP */ +#define USB_VENDOR_CHERRY 0x046a /* Cherry Mikroschalter */ #define USB_VENDOR_MEGATRENDS 0x046b /* American Megatrends */ -#define USB_VENDOR_LOGITECH 0x046d /* Logitech, Inc. */ +#define USB_VENDOR_LOGITECH 0x046d /* Logitech */ #define USB_VENDOR_BTC 0x046e /* Behavior Tech. Computer */ #define USB_VENDOR_PHILIPS 0x0471 /* Philips */ -#define USB_VENDOR_CONNECTIX 0x0478 /* Connectix Corp. */ +#define USB_VENDOR_CONNECTIX 0x0478 /* Connectix */ #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_ACERP 0x04a5 /* Acer Peripherals */ #define USB_VENDOR_VISIONEER 0x04a7 /* Visioneer */ -#define USB_VENDOR_CANON 0x04a9 /* Canon, Inc. */ +#define USB_VENDOR_CANON 0x04a9 /* Canon */ #define USB_VENDOR_IBM 0x04b3 /* IBM Corporation */ #define USB_VENDOR_CYPRESS 0x04b4 /* Cypress Semiconductor */ #define USB_VENDOR_EPSON 0x04b8 /* Seiko Epson Corp. */ #define USB_VENDOR_RAINBOW 0x04b9 /* Rainbow Technologies */ #define USB_VENDOR_IODATA 0x04bb /* I/O Data */ #define USB_VENDOR_3COMUSR 0x04c1 /* U.S. Robotics */ -#define USB_VENDOR_METHODE 0x04c2 /* Methode Electronics Far East PTE Ltd. */ -#define USB_VENDOR_MAXISWITCH 0x04c3 /* Maxi Switch, Inc. */ +#define USB_VENDOR_METHODE 0x04c2 /* Methode Electronics Far East */ +#define USB_VENDOR_MAXISWITCH 0x04c3 /* Maxi Switch */ #define USB_VENDOR_LOCKHEEDMER 0x04c4 /* Lockheed Martin Energy Research */ -#define USB_VENDOR_FUJITSU 0x04c5 /* Fujitsu Ltd. */ +#define USB_VENDOR_FUJITSU 0x04c5 /* Fujitsu */ #define USB_VENDOR_TOSHIBAAM 0x04c6 /* Toshiba America Electronic Components */ #define USB_VENDOR_MICROMACRO 0x04c7 /* Micro Macro Technologies */ -#define USB_VENDOR_KONICA 0x04c8 /* Konica Corp. */ -#define USB_VENDOR_LITEON 0x04ca /* Lite-On Technology Corp. */ -#define USB_VENDOR_FUJIPHOTO 0x04cb /* Fuji Photo Film Co., Ltd. */ +#define USB_VENDOR_KONICA 0x04c8 /* Konica */ +#define USB_VENDOR_LITEON 0x04ca /* Lite-On Technology */ +#define USB_VENDOR_FUJIPHOTO 0x04cb /* Fuji Photo Film */ #define USB_VENDOR_PHILIPSSEMI 0x04cc /* Philips Semiconductors */ #define USB_VENDOR_TATUNG 0x04cd /* Tatung Co. Of America */ -#define USB_VENDOR_SCANLOGIC 0x04ce /* ScanLogic Corp. */ -#define USB_VENDOR_MYSON 0x04cf /* Myson Technology Inc. */ +#define USB_VENDOR_SCANLOGIC 0x04ce /* ScanLogic */ +#define USB_VENDOR_MYSON 0x04cf /* Myson Technology */ #define USB_VENDOR_DIGI2 0x04d0 /* Digi International */ #define USB_VENDOR_ITTCANON 0x04d1 /* ITT Canon */ -#define USB_VENDOR_ALTEC 0x04d2 /* Altec Lansing Technologies, Inc. */ +#define USB_VENDOR_ALTEC 0x04d2 /* Altec Lansing Technologies */ #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, Ltd. */ +#define USB_VENDOR_CHICONY 0x04f2 /* Chicony Electronics */ +#define USB_VENDOR_BROTHER 0x04f9 /* Brother Industries */ #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_ACER 0x0502 /* Acer */ +#define USB_VENDOR_3COM 0x0506 /* 3Com */ +#define USB_VENDOR_AZTECH 0x0509 /* Aztech Systems */ #define USB_VENDOR_BELKIN 0x050d /* Belkin Components */ -#define USB_VENDOR_KAWATSU 0x050f /* Kawatsu Semiconductor, Inc. */ +#define USB_VENDOR_KAWATSU 0x050f /* Kawatsu Semiconductor */ #define USB_VENDOR_APC 0x051d /* American Power Conversion */ -#define USB_VENDOR_CONNECTEK 0x0522 /* Advanced Connectek USA, Inc. */ +#define USB_VENDOR_CONNECTEK 0x0522 /* Advanced Connectek USA */ #define USB_VENDOR_NETCHIP 0x0525 /* NetChip Technology */ #define USB_VENDOR_ALTRA 0x0527 /* ALTRA */ -#define USB_VENDOR_ATI 0x0528 /* ATI Technologies, Inc. */ +#define USB_VENDOR_ATI 0x0528 /* ATI Technologies */ #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_SONY 0x054c /* Sony Corp. */ -#define USB_VENDOR_VISION 0x0553 /* VLSI Vision Ltd. */ -#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_ALCOR2 0x0566 /* Alcor Micro, Inc. */ -#define USB_VENDOR_WACOM 0x056a /* WACOM Corp. Ltd. */ +#define USB_VENDOR_ANCHOR 0x0547 /* Anchor Chips */ +#define USB_VENDOR_SONY 0x054c /* Sony */ +#define USB_VENDOR_VISION 0x0553 /* VLSI Vision */ +#define USB_VENDOR_ASAHIKASEI 0x0556 /* Asahi Kasei Microsystems */ +#define USB_VENDOR_ATEN 0x0557 /* ATEN International */ +#define USB_VENDOR_MUSTEK 0x055f /* Mustek Systems */ +#define USB_VENDOR_TELEX 0x0562 /* Telex Communications */ +#define USB_VENDOR_PERACOM 0x0565 /* Peracom Networks */ +#define USB_VENDOR_ALCOR2 0x0566 /* Alcor Micro */ +#define USB_VENDOR_WACOM 0x056a /* WACOM */ #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_ELECOM 0x056e /* Elecom */ #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_AVM 0x057c /* AVM */ #define USB_VENDOR_QUICKSHOT 0x057f /* Quickshot */ #define USB_VENDOR_ROCKFIRE 0x0583 /* Rockfire */ -#define USB_VENDOR_ZYXEL 0x0586 /* ZyXEL Communication Co. */ -#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_ZYXEL 0x0586 /* ZyXEL Communication */ +#define USB_VENDOR_ALCOR 0x058f /* Alcor Micro */ +#define USB_VENDOR_IOMEGA 0x059b /* Iomega */ +#define USB_VENDOR_ATREND 0x059c /* A-Trend Technology */ #define USB_VENDOR_AID 0x059d /* Advanced Input Devices */ #define USB_VENDOR_LACIE 0x059f /* LaCie */ #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_QTRONIX 0x05c7 /* Qtronix */ +#define USB_VENDOR_ELSA 0x05cc /* ELSA */ #define USB_VENDOR_BRAINBOXES 0x05d1 /* Brainboxes Limited */ #define USB_VENDOR_AXIOHM 0x05d9 /* Axiohm Transaction Solutions */ #define USB_VENDOR_MICROTEK 0x05da /* Microtek */ #define USB_VENDOR_SYMBOL 0x05e0 /* Symbol Technologies */ -#define USB_VENDOR_GENESYS 0x05e3 /* Genesys Logic, Inc. */ -#define USB_VENDOR_FUJI 0x05e5 /* Fuji Electric Co., Ltd. */ +#define USB_VENDOR_GENESYS 0x05e3 /* Genesys Logic */ +#define USB_VENDOR_FUJI 0x05e5 /* Fuji Electric */ #define USB_VENDOR_KEITHLEY 0x05e6 /* Keithley Instruments */ #define USB_VENDOR_EIZONANAO 0x05e7 /* EIZO Nanao */ #define USB_VENDOR_KLSI 0x05e9 /* Kawasaki LSI */ #define USB_VENDOR_FFC 0x05eb /* FFC Limited */ -#define USB_VENDOR_ANKO 0x05ef /* Anko Electronic Co., Ltd. */ +#define USB_VENDOR_ANKO 0x05ef /* Anko Electronic */ #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_BRIDGE 0x0607 /* Bridge Information */ #define USB_VENDOR_SOLIDYEAR 0x060b /* Solid Year */ #define USB_VENDOR_BIORAD 0x0614 /* Bio-Rad Laboratories */ #define USB_VENDOR_MACALLY 0x0618 /* Macally */ -#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_ACTLABS 0x061c /* Act Labs */ +#define USB_VENDOR_ALARIS 0x0620 /* Alaris */ +#define USB_VENDOR_APEX 0x0624 /* Apex */ +#define USB_VENDOR_AVISION 0x0638 /* Avision */ #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_LINKSYS 0x066b /* Linksys */ +#define USB_VENDOR_ACERSA 0x066e /* Acer Semiconductor America */ +#define USB_VENDOR_AIWA 0x0677 /* Aiwa */ +#define USB_VENDOR_ACARD 0x0678 /* ACARD Technology */ +#define USB_VENDOR_PROLIFIC 0x067b /* Prolific Technology */ +#define USB_VENDOR_ADVANCELOGIC 0x0680 /* Avance Logic */ #define USB_VENDOR_CTX 0x0698 /* Chuntex */ -#define USB_VENDOR_ASKEY 0x069a /* Askey Computer Corp. */ +#define USB_VENDOR_ASKEY 0x069a /* Askey Computer */ #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_ASIAMD 0x06be /* Asia Microelectronic Development */ +#define USB_VENDOR_BIZLINK 0x06c4 /* Bizlink International */ #define USB_VENDOR_AASHIMA 0x06d6 /* Aashima Technology B.V. */ #define USB_VENDOR_MULTITECH 0x06e0 /* MultiTech */ -#define USB_VENDOR_ADS 0x06e1 /* ADS Technologies, Inc. */ +#define USB_VENDOR_ADS 0x06e1 /* ADS Technologies */ #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_MCT 0x0711 /* MCT Corp. */ +#define USB_VENDOR_SMC 0x0707 /* Standard Microsystems */ +#define USB_VENDOR_MCT 0x0711 /* MCT */ #define USB_VENDOR_AUREAL 0x0755 /* Aureal Semiconductor */ #define USB_VENDOR_MIDIMAN 0x0763 /* Midiman */ -#define USB_VENDOR_GRIFFIN 0x077d /* Griffin Technology, Inc. */ -#define USB_VENDOR_SANDISK 0x0781 /* SanDisk Corp */ -#define USB_VENDOR_BRIMAX 0x078e /* Brimax, Inc. */ +#define USB_VENDOR_GRIFFIN 0x077d /* Griffin Technology */ +#define USB_VENDOR_SANDISK 0x0781 /* SanDisk */ +#define USB_VENDOR_BRIMAX 0x078e /* Brimax */ #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_ABL 0x0794 /* ABL Electronics */ +#define USB_VENDOR_ALFADATA 0x079d /* Alfadata Computer */ #define USB_VENDOR_NATIONALTECH 0x07a2 /* National Technical Systems */ -#define USB_VENDOR_ONNTO 0x07a3 /* Onnto Corp. */ -#define USB_VENDOR_BE 0x07a4 /* Be, Inc. */ -#define USB_VENDOR_ADMTEK 0x07a6 /* ADMtek, Inc. */ +#define USB_VENDOR_ONNTO 0x07a3 /* Onnto */ +#define USB_VENDOR_BE 0x07a4 /* Be */ +#define USB_VENDOR_ADMTEK 0x07a6 /* ADMtek */ #define USB_VENDOR_COREGA 0x07aa /* Corega */ #define USB_VENDOR_FREECOM 0x07ab /* Freecom */ #define USB_VENDOR_MICROTECH 0x07af /* Microtech */ -#define USB_VENDOR_ABOCOM 0x07b8 /* AboCom Systems, Inc. */ -#define USB_VENDOR_KEISOKUGIKEN 0x07c1 /* Keisokugiken Corp. */ +#define USB_VENDOR_ABOCOM 0x07b8 /* AboCom Systems */ +#define USB_VENDOR_KEISOKUGIKEN 0x07c1 /* Keisokugiken */ #define USB_VENDOR_APG 0x07c5 /* APG Cash Drawer */ -#define USB_VENDOR_BUG 0x07c8 /* B.U.G., Inc. */ +#define USB_VENDOR_BUG 0x07c8 /* B.U.G. */ #define USB_VENDOR_ALLIEDTELESYN 0x07c9 /* Allied Telesyn International */ -#define USB_VENDOR_AVERMEDIA 0x07ca /* AVerMedia Technologies, Inc. */ +#define USB_VENDOR_AVERMEDIA 0x07ca /* AVerMedia Technologies */ #define USB_VENDOR_SIIG 0x07cc /* SIIG */ -#define USB_VENDOR_APTIO 0x07d2 /* Aptio Products, Inc. */ +#define USB_VENDOR_APTIO 0x07d2 /* Aptio Products */ #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_ALLIEDCABLE 0x07e6 /* Allied Cable */ +#define USB_VENDOR_ZOOM 0x0803 /* Zoom Telephonics */ +#define USB_VENDOR_BROADLOGIC 0x0827 /* BroadLogic */ +#define USB_VENDOR_HANDSPRING 0x082d /* Handspring */ +#define USB_VENDOR_ACTIONSTAR 0x0835 /* Action Star Enterprise */ +#define USB_VENDOR_PALM 0x0830 /* Palm Computing */ +#define USB_VENDOR_ACCTON 0x083a /* Accton Technology */ #define USB_VENDOR_DIAMOND 0x0841 /* Diamond */ -#define USB_VENDOR_NETGEAR 0x0846 /* BayNETGEAR, Inc. */ -#define USB_VENDOR_ACTIVEWIRE 0x0854 /* ActiveWire, Inc. */ +#define USB_VENDOR_NETGEAR 0x0846 /* BayNETGEAR */ +#define USB_VENDOR_ACTIVEWIRE 0x0854 /* ActiveWire */ #define USB_VENDOR_METRICOM 0x0870 /* Metricom */ -#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_ADESSOKBTEK 0x087c /* ADESSO/Kbtek America */ +#define USB_VENDOR_APT 0x0880 /* APT Technologies */ +#define USB_VENDOR_BOCARESEARCH 0x0885 /* Boca Research */ #define USB_VENDOR_ANDREA 0x08a8 /* Andrea Electronics */ -#define USB_VENDOR_BURRBROWN 0x08bb /* Burr-Brown Japan, Ltd. */ +#define USB_VENDOR_BURRBROWN 0x08bb /* Burr-Brown Japan */ #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_AIPTEK 0x08ca /* AIPTEK International */ +#define USB_VENDOR_SMARTBRIDGES 0x08d1 /* SmartBridges */ +#define USB_VENDOR_BILLIONTON 0x08dd /* Billionton Systems */ +#define USB_VENDOR_EXTENDED 0x08e9 /* Extended Systems */ +#define USB_VENDOR_AUTHENTEC 0x08ff /* AuthenTec */ +#define USB_VENDOR_ALATION 0x0910 /* Alation Systems */ #define USB_VENDOR_BIOMETRIC 0x0929 /* American Biometric Company */ #define USB_VENDOR_YANO 0x094f /* Yano */ #define USB_VENDOR_KINGSTON 0x0951 /* Kingston Technology */ -#define USB_VENDOR_BLUEWATER 0x0956 /* BlueWater Systems, Inc. */ -#define USB_VENDOR_AGILENT 0x0957 /* Agilent Technologies, Inc. */ +#define USB_VENDOR_BLUEWATER 0x0956 /* BlueWater Systems */ +#define USB_VENDOR_AGILENT 0x0957 /* Agilent Technologies */ #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_BECKHOFF 0x0978 /* Beckhoff */ +#define USB_VENDOR_ALTIUS 0x09b3 /* Altius Solutions */ +#define USB_VENDOR_ARRIS 0x09c1 /* Arris Interactive */ +#define USB_VENDOR_ACTIVCARD 0x09c3 /* ACTIVCARD */ +#define USB_VENDOR_ACTISYS 0x09c4 /* ACTiSYS */ +#define USB_VENDOR_AFOURTECH 0x09da /* A-FOUR TECH */ +#define USB_VENDOR_AIMEX 0x09dc /* AIMEX */ +#define USB_VENDOR_ADDONICS 0x09df /* Addonics Technologies */ +#define USB_VENDOR_AKAI 0x09e8 /* AKAI professional M.I. */ #define USB_VENDOR_ARESCOM 0x09f5 /* ARESCOM */ #define USB_VENDOR_BAY 0x09f9 /* Bay Associates */ #define USB_VENDOR_ALTERA 0x09fb /* Altera */ #define USB_VENDOR_TREK 0x0a16 /* Trek Technology */ -#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_ASAHIOPTICAL 0x0a17 /* Asahi Optical */ +#define USB_VENDOR_BOCASYSTEMS 0x0a43 /* Boca Systems */ +#define USB_VENDOR_BROADCOM 0x0a5c /* Broadcom */ #define USB_VENDOR_GEOCAST 0x0a79 /* Geocast Network Systems */ #define USB_VENDOR_MOTOROLA 0x1063 /* Motorola */ #define USB_VENDOR_PLX 0x10b5 /* PLX */ -#define USB_VENDOR_BELKIN2 0x1293 /* Belkin Components (2nd) */ -#define USB_VENDOR_UMAX 0x1606 /* UMAX Data Systems, Inc. */ +#define USB_VENDOR_BELKIN2 0x1293 /* Belkin Components */ +#define USB_VENDOR_UMAX 0x1606 /* UMAX Data Systems */ #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_ACTIONTEC 0x1668 /* Actiontec Electronics */ +#define USB_VENDOR_DLINK 0x2001 /* D-Link */ #define USB_VENDOR_INTEL 0x8086 /* Intel */ #define USB_VENDOR_HP2 0xf003 /* Hewlett Packard */ @@ -288,11 +288,11 @@ */ /* 3Com products */ -#define USB_PRODUCT_3COM_HOMECONN 0x009d /* HomeConnect USB Camera */ -#define USB_PRODUCT_3COM_3C19250 0x03E8 /* 3C19250 Ethernet adapter */ +#define USB_PRODUCT_3COM_HOMECONN 0x009d /* HomeConnect Camera */ +#define USB_PRODUCT_3COM_3C19250 0x03E8 /* 3C19250 Ethernet */ #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_3COM_3C460 0x11f8 /* HomeConnect Ethernet */ #define USB_PRODUCT_3COMUSR_OFFICECONN 0x0082 /* 3Com OfficeConnect Analog Modem */ #define USB_PRODUCT_3COMUSR_USRISDN 0x008f /* 3Com U.S. Robotics Pro ISDN TA */ @@ -300,21 +300,21 @@ #define USB_PRODUCT_3COMUSR_USR56K 0x3021 /* U.S.Robotics 56000 Voice Faxmodem Pro */ -/* Acer Peripherals, Inc. products */ +/* Acer Peripherals products */ #define USB_PRODUCT_ACERP_ACERSCAN_C310U 0x12a6 /* Acerscan C310U */ #define USB_PRODUCT_ACERP_ACERSCAN_320U 0x2022 /* Acerscan 320U */ #define USB_PRODUCT_ACERP_ACERSCAN_640U 0x2040 /* Acerscan 640U */ #define USB_PRODUCT_ACERP_ACERSCAN_620U 0x2060 /* Acerscan 620U */ -/* ActiveWire, Inc. products */ +/* ActiveWire products */ #define USB_PRODUCT_ACTIVEWIRE_IOBOARD 0x0100 /* I/O Board */ -#define USB_PRODUCT_ACTIVEWIRE_IOBOARD_FW1 0x0101 /* I/O Board, rev. 1 firmware */ +#define USB_PRODUCT_ACTIVEWIRE_IOBOARD_FW1 0x0101 /* I/O Board, rev. 1 */ /* ADMtek products */ -#define USB_PRODUCT_ADMTEK_PEGASUS 0x0986 /* AN986 USB Ethernet adapter */ +#define USB_PRODUCT_ADMTEK_PEGASUS 0x0986 /* AN986 Ethernet */ /* ADS products */ -#define USB_PRODUCT_ADS_UBS10BT 0x0008 /* UBS-10BT Ethernet adapter */ +#define USB_PRODUCT_ADS_UBS10BT 0x0008 /* UBS-10BT Ethernet */ /* Agiler products */ #define USB_PRODUCT_ELECOM_MOUSE29UO 0x0002 /* mouse 29UO */ @@ -327,7 +327,7 @@ /* AKS products */ #define USB_PRODUCT_AKS_USBHASP 0x0001 /* USB-HASP 0.06 */ -/* Alcor Micro, Inc. products */ +/* Alcor Micro products */ #define USB_PRODUCT_ALCOR2_KBD_HUB 0x2802 /* Kbd Hub */ #define USB_PRODUCT_ALCOR_MA_KBD_HUB 0x9213 /* MacAlly Kbd Hub */ @@ -346,8 +346,8 @@ #define USB_PRODUCT_ANCHOR_EZUSB 0x2131 /* EZUSB */ #define USB_PRODUCT_ANCHOR_EZLINK 0x2720 /* EZLINK */ -/* AOX, Inc. products */ -#define USB_PRODUCT_AOX_USB101 0x0008 /* USB ethernet controller engine */ +/* AOX products */ +#define USB_PRODUCT_AOX_USB101 0x0008 /* USB Ethernet controller engine */ /* Apple Computer products */ #define USB_PRODUCT_APPLE_OPTMOUSE 0x0302 /* Optical mouse */ @@ -355,18 +355,18 @@ /* ATen products */ #define USB_PRODUCT_ATEN_UC1284 0x2001 /* Parallel printer adapter */ -#define USB_PRODUCT_ATEN_UC10T 0x2002 /* 10Mbps ethernet adapter */ +#define USB_PRODUCT_ATEN_UC10T 0x2002 /* 10Mbps Ethernet */ #define USB_PRODUCT_ATEN_UC232A 0x2008 /* Serial adapter */ /* Avision products */ #define USB_PRODUCT_AVISION_1200U 0x0268 /* 1200U scanner */ /* Belkin products */ -/*product BELKIN F5U111 0x???? F5U111 Ethernet adapter*/ +/*product BELKIN F5U111 0x???? F5U111 Ethernet */ #define USB_PRODUCT_BELKIN2_F5U002 0x0002 /* F5U002 Parallel printer adapter */ /* Billionton products */ -#define USB_PRODUCT_BILLIONTON_USB100 0x0986 /* USB100N 10/100 FastEthernet Adapter */ +#define USB_PRODUCT_BILLIONTON_USB100 0x0986 /* USB100N 10/100 Ethernet */ /* Brother Industries products */ #define USB_PRODUCT_BROTHER_HL1050 0x0002 /* HL-1050 laser printer */ @@ -374,12 +374,12 @@ /* Behavior Technology Computer products */ #define USB_PRODUCT_BTC_BTC7932 0x6782 /* Keyboard with mouse port */ -/* Canon, Inc. products */ +/* Canon products */ #define USB_PRODUCT_CANON_S10 0x3041 /* PowerShot S10 */ /* CATC products */ -#define USB_PRODUCT_CATC_NETMATE 0x000a /* Netmate ethernet adapter */ -#define USB_PRODUCT_CATC_NETMATE2 0x000c /* Netmate2 ethernet adapter */ +#define USB_PRODUCT_CATC_NETMATE 0x000a /* Netmate Ethernet */ +#define USB_PRODUCT_CATC_NETMATE2 0x000c /* Netmate2 Ethernet */ #define USB_PRODUCT_CATC_CHIEF 0x000d /* USB Chief Bus & Protocol Analyzer */ #define USB_PRODUCT_CATC_ANDROMEDA 0x1237 /* Andromeda hub */ @@ -389,7 +389,7 @@ /* Chic Technology products */ #define USB_PRODUCT_CHIC_MOUSE1 0x0001 /* mouse */ -#define USB_PRODUCT_CHIC_CYPRESS 0x0003 /* Cypress USB Mouse */ +#define USB_PRODUCT_CHIC_CYPRESS 0x0003 /* Cypress Mouse */ /* Chicony products */ #define USB_PRODUCT_CHICONY_KB8933 0x0001 /* KB-8933 keyboard */ @@ -418,10 +418,10 @@ /* D-Link products */ /*product DLINK DSBS25 0x0100 DSB-S25 serial adapter*/ -#define USB_PRODUCT_DLINK_DSB650C 0x4000 /* 10Mbps ethernet adapter */ -#define USB_PRODUCT_DLINK_DSB650TX 0x4002 /* 10/100 ethernet adapter */ -#define USB_PRODUCT_DLINK_DSB650TX_PNA 0x4003 /* 1/10/100 ethernet adapter */ -#define USB_PRODUCT_DLINK_DSB650 0xABC1 /* 10/100 ethernet adapter */ +#define USB_PRODUCT_DLINK_DSB650C 0x4000 /* 10Mbps Ethernet */ +#define USB_PRODUCT_DLINK_DSB650TX 0x4002 /* 10/100 Ethernet */ +#define USB_PRODUCT_DLINK_DSB650TX_PNA 0x4003 /* 1/10/100 Ethernet */ +#define USB_PRODUCT_DLINK_DSB650 0xABC1 /* 10/100 Ethernet */ /* Dallas Semiconductor products */ #define USB_PRODUCT_DALLAS_J6502 0x4201 /* J-6502 speakers */ @@ -430,9 +430,9 @@ #define USB_PRODUCT_DIAMOND_RIO500USB 0x0001 /* Rio 500 USB */ /* Digi International products */ -#define USB_PRODUCT_DIGI_ACCELEPORT2 0x0002 /* AccelePort USB 2 */ -#define USB_PRODUCT_DIGI_ACCELEPORT4 0x0004 /* AccelePort USB 4 */ -#define USB_PRODUCT_DIGI_ACCELEPORT8 0x0008 /* AccelePort USB 8 */ +#define USB_PRODUCT_DIGI_ACCELEPORT2 0x0002 /* AccelePort 2 */ +#define USB_PRODUCT_DIGI_ACCELEPORT4 0x0004 /* AccelePort 4 */ +#define USB_PRODUCT_DIGI_ACCELEPORT8 0x0008 /* AccelePort 8 */ /* EIZO products */ #define USB_PRODUCT_EIZO_HUB 0x0000 /* hub */ @@ -446,7 +446,7 @@ #define USB_PRODUCT_ENTREGA_2S 0x0002 /* 2S serial connector */ #define USB_PRODUCT_ENTREGA_1S25 0x0003 /* 1S25 serial connector */ #define USB_PRODUCT_ENTREGA_4S 0x0004 /* 4S serial connector */ -#define USB_PRODUCT_ENTREGA_E45 0x0005 /* E45 Ethernet adapter */ +#define USB_PRODUCT_ENTREGA_E45 0x0005 /* E45 Ethernet */ #define USB_PRODUCT_ENTREGA_CENTRONICS 0x0006 /* Centronics connector */ #define USB_PRODUCT_ENTREGA_1S9 0x0093 /* 1S9 serial connector */ #define USB_PRODUCT_ENTREGA_EZUSB 0x8000 /* EZ-USB */ @@ -456,8 +456,8 @@ /* Epson products */ #define USB_PRODUCT_EPSON_PRINTER1 0x0001 /* USB Printer */ -#define USB_PRODUCT_EPSON_PRINTER2 0x0002 /* ISD USB Smart Cable for Mac */ -#define USB_PRODUCT_EPSON_PRINTER3 0x0003 /* ISD USB Smart Cable */ +#define USB_PRODUCT_EPSON_PRINTER2 0x0002 /* ISD Smart Cable for Mac */ +#define USB_PRODUCT_EPSON_PRINTER3 0x0003 /* ISD Smart Cable */ #define USB_PRODUCT_EPSON_636 0x0101 /* Perfection 636U / 636Photo scanner */ #define USB_PRODUCT_EPSON_610 0x0103 /* Perfection 610 scanner */ #define USB_PRODUCT_EPSON_1200 0x0104 /* Perfection 1200U / 1200Photo scanner */ @@ -484,7 +484,7 @@ /* Fuji photo products */ #define USB_PRODUCT_FUJIPHOTO_MASS0100 0x0100 /* Mass Storage */ -/* Handspring, Inc. */ +/* Handspring */ #define USB_PRODUCT_HANDSPRING_VISOR 0x0100 /* Handspring Visor */ /* HP products */ @@ -528,7 +528,7 @@ #define USB_PRODUCT_IOMEGA_ZIP250 0x0030 /* Zip 250 */ /* Kawasaki products */ -#define USB_PRODUCT_KLSI_DUH3E10BT 0x0008 /* USB ethernet controller engine */ +#define USB_PRODUCT_KLSI_DUH3E10BT 0x0008 /* USB Ethernet controller engine */ /* Kawatsu products */ #define USB_PRODUCT_KAWATSU_MH4000P 0x0003 /* MiniHub 4000P */ @@ -537,14 +537,14 @@ #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 */ +#define USB_PRODUCT_KLSI_DUH3E10BT 0x0008 /* 10BT Ethernet */ /* Kensington products */ #define USB_PRODUCT_KENSINGTON_ORBIT 0x1003 /* Orbit USB/PS2 trackball */ #define USB_PRODUCT_KENSINGTON_TURBOBALL 0x1005 /* TurboBall */ /* Kingston products */ -#define USB_PRODUCT_KINGSTON_KNU101TX 0x000a /* KNU101TX USB Ethernet */ +#define USB_PRODUCT_KINGSTON_KNU101TX 0x000a /* KNU101TX Ethernet */ /* Kodak products */ #define USB_PRODUCT_KODAK_DC220 0x0100 /* Digital Science DC220 */ @@ -638,7 +638,7 @@ /* Mustek products */ #define USB_PRODUCT_MUSTEK_1200CU 0x0001 /* 1200 CU scanner */ #define USB_PRODUCT_MUSTEK_600CU 0x0002 /* 600 CU scanner */ -#define USB_PRODUCT_MUSTEK_1200USB 0x0003 /* 1200 USB scanner */ +#define USB_PRODUCT_MUSTEK_1200USB 0x0003 /* 1200 scanner */ #define USB_PRODUCT_MUSTEK_1200UB 0x0006 /* 1200 UB scanner */ #define USB_PRODUCT_MUSTEK_MDC800 0xa800 /* MDC-800 digital camera */ @@ -653,20 +653,20 @@ #define USB_PRODUCT_NETCHIP_TURBOCONNECT 0x1080 /* Turbo-Connect */ /* Netgear products */ -#define USB_PRODUCT_NETGEAR_EA101 0x1001 /* Ethernet adapter */ +#define USB_PRODUCT_NETGEAR_EA101 0x1001 /* Ethernet */ -/* OmniVision Technologies, Inc. products */ +/* OmniVision Technologies products */ #define USB_PRODUCT_OMNIVISION_OV511 0x0511 /* OV511 Camera */ #define USB_PRODUCT_OMNIVISION_OV511PLUS 0xa511 /* OV511+ Camera */ -/* Palm Computing, Inc. */ +/* Palm Computing */ #define USB_PRODUCT_PALM_SERIAL 0x0080 /* USB Serial Adaptor */ /* 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 */ +#define USB_PRODUCT_PERACOM_ENET 0x0002 /* Ethernet */ +#define USB_PRODUCT_PERACOM_ENET3 0x0003 /* At-Home Ethernet */ +#define USB_PRODUCT_PERACOM_ENET2 0x0005 /* Ethernet */ /* Philips products */ #define USB_PRODUCT_PHILIPS_DSS350 0x0101 /* DSS 350 Digital Speaker System */ @@ -676,7 +676,7 @@ #define USB_PRODUCT_PHILIPS_DSS150 0x0471 /* DSS 150 Digital Speaker System */ /* P.I. Engineering products */ -#define USB_PRODUCT_PIENGINEERING_PS2USB 0x020b /* PS2 to Mac USB Adapter */ +#define USB_PRODUCT_PIENGINEERING_PS2USB 0x020b /* PS2 to Mac Adapter */ /* PLX products */ #define USB_PRODUCT_PLX_TESTBOARD 0x9060 /* test board */ @@ -686,9 +686,9 @@ #define USB_PRODUCT_PRIMAX_G2E300 0x0301 /* G2E-300 scanner */ #define USB_PRODUCT_PRIMAX_G2300 0x0302 /* G2-300 scanner */ #define USB_PRODUCT_PRIMAX_G2E3002 0x0303 /* G2E-300 scanner */ -#define USB_PRODUCT_PRIMAX_9600 0x0340 /* Colorado USB 9600 scanner */ +#define USB_PRODUCT_PRIMAX_9600 0x0340 /* Colorado 9600 scanner */ #define USB_PRODUCT_PRIMAX_600U 0x0341 /* Colorado 600u scanner */ -#define USB_PRODUCT_PRIMAX_19200 0x0360 /* Colorado USB 19200 scanner */ +#define USB_PRODUCT_PRIMAX_19200 0x0360 /* Colorado 19200 scanner */ #define USB_PRODUCT_PRIMAX_1200U 0x0361 /* Colorado 1200u scanner */ #define USB_PRODUCT_PRIMAX_G600 0x0380 /* G2-600 scanner */ #define USB_PRODUCT_PRIMAX_636I 0x0381 /* ReadyScan 636i */ @@ -728,21 +728,21 @@ #define USB_PRODUCT_SIRIUS_ROADSTER 0x0001 /* NetComm Roadster II 56 USB */ /* SmartBridges products */ -#define USB_PRODUCT_SMARTBRIDGES_SMARTLINK 0x0001 /* SmartLink USB ethernet adapter */ +#define USB_PRODUCT_SMARTBRIDGES_SMARTLINK 0x0001 /* SmartLink Ethernet */ /* SMC products */ -#define USB_PRODUCT_SMC_2102USB 0x0100 /* 10Mbps ethernet adapter */ -#define USB_PRODUCT_SMC_2202USB 0x0200 /* 10/100 ethernet adapter */ +#define USB_PRODUCT_SMC_2102USB 0x0100 /* 10Mbps Ethernet */ +#define USB_PRODUCT_SMC_2202USB 0x0200 /* 10/100 Ethernet */ /* SOLID YEAR products */ -#define USB_PRODUCT_SOLIDYEAR_KEYBOARD 0x2101 /* Solid Year USB keyboard */ +#define USB_PRODUCT_SOLIDYEAR_KEYBOARD 0x2101 /* Solid Year keyboard */ /* SONY products */ -#define USB_PRODUCT_SONY_DSC 0x0010 /* Sony DSC cameras */ -#define USB_PRODUCT_SONY_MSC 0x0032 /* Sony MSC memory stick slot */ +#define USB_PRODUCT_SONY_DSC 0x0010 /* Sony DSC Cameras */ +#define USB_PRODUCT_SONY_MSC 0x0032 /* Sony MSC Memorystick slot */ /* STMicroelectronics products */ -#define USB_PRODUCT_STMICRO_COMMUNICATOR 0x7554 /* USB Communicator */ +#define USB_PRODUCT_STMICRO_COMMUNICATOR 0x7554 /* Communicator */ /* Sun Microsystems products */ #define USB_PRODUCT_SUN_KEYBOARD 0x0005 /* Type 6 USB */ @@ -751,16 +751,16 @@ /* Supra products */ #define USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K 0x07da /* Supra Express 56K modem */ #define USB_PRODUCT_DIAMOND2_SUPRA2890 0x0b4a /* SupraMax 2890 56K Modem */ -#define USB_PRODUCT_DIAMOND2_RIO600USB 0x5001 /* Rio 600 USB */ - +#define USB_PRODUCT_DIAMOND2_RIO600USB 0x5001 /* Rio 600 */ + /* TEAC products */ -#define USB_PRODUCT_TEAC_FD05PUB 0x0000 /* FD-05PUB floppy */ +#define USB_PRODUCT_TEAC_FD05PUB 0x0000 /* FD-05PUB Floppy */ /* Telex Communications products */ -#define USB_PRODUCT_TELEX_MIC1 0x0001 /* Enhanced USB Microphone */ +#define USB_PRODUCT_TELEX_MIC1 0x0001 /* Microphone */ /* Texas Intel products */ -#define USB_PRODUCT_TI_UTUSB41 0x1446 /* UT-USB41 hub */ +#define USB_PRODUCT_TI_UTUSB41 0x1446 /* UT-USB41 */ /* Thrustmaster products */ #define USB_PRODUCT_THRUST_FUSION_PAD 0xa0a3 /* Fusion Digital Gamepad */ @@ -776,7 +776,7 @@ #define USB_PRODUCT_UMAX_ASTRA2200U 0x0230 /* Astra 2200U Scanner */ /* Universal Access products */ -#define USB_PRODUCT_UNIACCESS_PANACHE 0x0101 /* Panache Surf USB ISDN Adapter */ +#define USB_PRODUCT_UNIACCESS_PANACHE 0x0101 /* Panache Surf ISDN Adapter */ /* Vision products */ #define USB_PRODUCT_VISION_VC6452V002 0x0002 /* CPiA Camera */ @@ -788,19 +788,19 @@ #define USB_PRODUCT_VISIONEER_6200 0x0311 /* OneTouch 6200 */ #define USB_PRODUCT_VISIONEER_8100 0x0321 /* OneTouch 8100 */ #define USB_PRODUCT_VISIONEER_8600 0x0331 /* OneTouch 8600 */ - + /* Wacom products */ #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 */ #define USB_PRODUCT_YEDATA_FLASHBUSTERU 0x0000 /* Flashbuster-U */ /* Yano products */ #define USB_PRODUCT_YANO_U640MO 0x0101 /* U640MO-03 */ -/* Zoom Telephonics, Inc. products */ +/* Zoom Telephonics products */ #define USB_PRODUCT_ZOOM_2986L 0x9700 /* 2986L Fax modem */ /* ZyXEL Communication Co. products */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index 0561bb78eaa..863b226284e 100644 --- a/sys/dev/usb/usbdevs_data.h +++ b/sys/dev/usb/usbdevs_data.h @@ -1,10 +1,10 @@ -/* $OpenBSD: usbdevs_data.h,v 1.27 2000/12/05 21:37:44 deraadt Exp $ */ +/* $OpenBSD: usbdevs_data.h,v 1.28 2000/12/05 22:58:03 deraadt Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.28 2000/12/05 21:37:39 deraadt Exp + * OpenBSD: usbdevs,v 1.29 2000/12/05 22:58:00 deraadt Exp */ /* $NetBSD: usbdevs,v 1.127 2000/11/15 14:36:09 augustss Exp $ */ @@ -49,26 +49,26 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_3COM, USB_PRODUCT_3COM_HOMECONN, 0, - "3Com Corp.", - "HomeConnect USB Camera", + "3Com", + "HomeConnect Camera", }, { USB_VENDOR_3COM, USB_PRODUCT_3COM_3C19250, 0, - "3Com Corp.", - "3C19250 Ethernet adapter", + "3Com", + "3C19250 Ethernet", }, { USB_VENDOR_3COM, USB_PRODUCT_3COM_USR56K, 0, - "3Com Corp.", + "3Com", "U.S.Robotics 56000 Voice Faxmodem Pro", }, { USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460, 0, - "3Com Corp.", - "HomeConnect Ethernet USB Adapter", + "3Com", + "HomeConnect Ethernet", }, { USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_OFFICECONN, @@ -97,55 +97,55 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_C310U, 0, - "Acer Peripherals, Inc.", + "Acer Peripherals", "Acerscan C310U", }, { USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_320U, 0, - "Acer Peripherals, Inc.", + "Acer Peripherals", "Acerscan 320U", }, { USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_640U, 0, - "Acer Peripherals, Inc.", + "Acer Peripherals", "Acerscan 640U", }, { USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_620U, 0, - "Acer Peripherals, Inc.", + "Acer Peripherals", "Acerscan 620U", }, { USB_VENDOR_ACTIVEWIRE, USB_PRODUCT_ACTIVEWIRE_IOBOARD, 0, - "ActiveWire, Inc.", + "ActiveWire", "I/O Board", }, { USB_VENDOR_ACTIVEWIRE, USB_PRODUCT_ACTIVEWIRE_IOBOARD_FW1, 0, - "ActiveWire, Inc.", - "I/O Board, rev. 1 firmware", + "ActiveWire", + "I/O Board, rev. 1", }, { USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS, 0, - "ADMtek, Inc.", - "AN986 USB Ethernet adapter", + "ADMtek", + "AN986 Ethernet", }, { USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BT, 0, - "ADS Technologies, Inc.", - "UBS-10BT Ethernet adapter", + "ADS Technologies", + "UBS-10BT Ethernet", }, { USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_MOUSE29UO, 0, - "Elecom Corp. Ltd.", + "Elecom", "mouse 29UO", }, { @@ -175,43 +175,43 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ALCOR2, USB_PRODUCT_ALCOR2_KBD_HUB, 0, - "Alcor Micro, Inc.", + "Alcor Micro", "Kbd Hub", }, { USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_MA_KBD_HUB, 0, - "Alcor Micro, Inc.", + "Alcor Micro", "MacAlly Kbd Hub", }, { USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_AU9814, 0, - "Alcor Micro, Inc.", + "Alcor Micro", "AU9814 Hub", }, { USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_SM_KBD, 0, - "Alcor Micro, Inc.", + "Alcor Micro", "MicroConnectors/StrongMan Keyboard", }, { USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_NEC_KBD_HUB, 0, - "Alcor Micro, Inc.", + "Alcor Micro", "NEC Kbd Hub", }, { USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ADA70, 0, - "Altec Lansing Technologies, Inc.", + "Altec Lansing Technologies", "ADA70 Speakers", }, { USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ASC495, 0, - "Altec Lansing Technologies, Inc.", + "Altec Lansing Technologies", "ASC495 Speakers", }, { @@ -223,20 +223,20 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ANCHOR, USB_PRODUCT_ANCHOR_EZUSB, 0, - "Anchor Chips, Inc.", + "Anchor Chips", "EZUSB", }, { USB_VENDOR_ANCHOR, USB_PRODUCT_ANCHOR_EZLINK, 0, - "Anchor Chips, Inc.", + "Anchor Chips", "EZLINK", }, { USB_VENDOR_AOX, USB_PRODUCT_AOX_USB101, 0, - "AOX, Inc.", - "USB ethernet controller engine", + "AOX", + "USB Ethernet controller engine", }, { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_OPTMOUSE, @@ -253,43 +253,43 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC1284, 0, - "ATEN International Co. Ltd.", + "ATEN International", "Parallel printer adapter", }, { USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC10T, 0, - "ATEN International Co. Ltd.", - "10Mbps ethernet adapter", + "ATEN International", + "10Mbps Ethernet", }, { USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC232A, 0, - "ATEN International Co. Ltd.", + "ATEN International", "Serial adapter", }, { USB_VENDOR_AVISION, USB_PRODUCT_AVISION_1200U, 0, - "Avision, Inc.", + "Avision", "1200U scanner", }, { USB_VENDOR_BELKIN2, USB_PRODUCT_BELKIN2_F5U002, 0, - "Belkin Components (2nd)", + "Belkin Components", "F5U002 Parallel printer adapter", }, { USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100, 0, - "Billionton Systems, Inc.", - "USB100N 10/100 FastEthernet Adapter", + "Billionton Systems", + "USB100N 10/100 Ethernet", }, { USB_VENDOR_BROTHER, USB_PRODUCT_BROTHER_HL1050, 0, - "Brother Industries, Ltd.", + "Brother Industries", "HL-1050 laser printer", }, { @@ -301,43 +301,43 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_CANON, USB_PRODUCT_CANON_S10, 0, - "Canon, Inc.", + "Canon", "PowerShot S10", }, { USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE, 0, - "Computer Access Technology Corp.", - "Netmate ethernet adapter", + "Computer Access Technology", + "Netmate Ethernet", }, { USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE2, 0, - "Computer Access Technology Corp.", - "Netmate2 ethernet adapter", + "Computer Access Technology", + "Netmate2 Ethernet", }, { USB_VENDOR_CATC, USB_PRODUCT_CATC_CHIEF, 0, - "Computer Access Technology Corp.", + "Computer Access Technology", "USB Chief Bus & Protocol Analyzer", }, { USB_VENDOR_CATC, USB_PRODUCT_CATC_ANDROMEDA, 0, - "Computer Access Technology Corp.", + "Computer Access Technology", "Andromeda hub", }, { USB_VENDOR_CHERRY, USB_PRODUCT_CHERRY_MY3000KBD, 0, - "Cherry Mikroschalter GmbH", + "Cherry Mikroschalter", "My3000 keyboard", }, { USB_VENDOR_CHERRY, USB_PRODUCT_CHERRY_MY3000HUB, 0, - "Cherry Mikroschalter GmbH", + "Cherry Mikroschalter", "My3000 hub", }, { @@ -350,12 +350,12 @@ struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_CHIC, USB_PRODUCT_CHIC_CYPRESS, 0, "Chic Technology", - "Cypress USB Mouse", + "Cypress Mouse", }, { USB_VENDOR_CHICONY, USB_PRODUCT_CHICONY_KB8933, 0, - "Chicony Electronics Co., Ltd.", + "Chicony Electronics", "KB-8933 keyboard", }, { @@ -367,7 +367,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_CONNECTIX, USB_PRODUCT_CONNECTIX_QUICKCAM, 0, - "Connectix Corp.", + "Connectix", "QuickCam", }, { @@ -421,26 +421,26 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650C, 0, - "D-Link Corp", - "10Mbps ethernet adapter", + "D-Link", + "10Mbps Ethernet", }, { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX, 0, - "D-Link Corp", - "10/100 ethernet adapter", + "D-Link", + "10/100 Ethernet", }, { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX_PNA, 0, - "D-Link Corp", - "1/10/100 ethernet adapter", + "D-Link", + "1/10/100 Ethernet", }, { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650, 0, - "D-Link Corp", - "10/100 ethernet adapter", + "D-Link", + "10/100 Ethernet", }, { USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502, @@ -458,19 +458,19 @@ struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT2, 0, "Digi International", - "AccelePort USB 2", + "AccelePort 2", }, { USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT4, 0, "Digi International", - "AccelePort USB 4", + "AccelePort 4", }, { USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT8, 0, "Digi International", - "AccelePort USB 8", + "AccelePort 8", }, { USB_VENDOR_EIZO, USB_PRODUCT_EIZO_HUB, @@ -487,7 +487,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ELSA, USB_PRODUCT_ELSA_MODEM1, 0, - "ELSA Gmbh", + "ELSA", "ELSA Modem Board", }, { @@ -518,7 +518,7 @@ struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_E45, 0, "Entrega", - "E45 Ethernet adapter", + "E45 Ethernet", }, { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_CENTRONICS, @@ -554,13 +554,13 @@ struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER2, 0, "Seiko Epson Corp.", - "ISD USB Smart Cable for Mac", + "ISD Smart Cable for Mac", }, { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER3, 0, "Seiko Epson Corp.", - "ISD USB Smart Cable", + "ISD Smart Cable", }, { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_636, @@ -595,19 +595,19 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_EXTENDED, USB_PRODUCT_EXTENDED_XTNDACCESS, 0, - "Extended Systems, Inc.", + "Extended Systems", "XTNDAccess IrDA", }, { USB_VENDOR_GRAVIS, USB_PRODUCT_GRAVIS_GAMEPADPRO, 0, - "Advanced Gravis Computer Tech. Ltd.", + "Advanced Gravis Computer Tech.", "GamePad Pro", }, { USB_VENDOR_GRIFFIN, USB_PRODUCT_GRIFFIN_IMATE, 0, - "Griffin Technology, Inc.", + "Griffin Technology", "iMate, ABD adapter", }, { @@ -625,13 +625,13 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_FUJIPHOTO, USB_PRODUCT_FUJIPHOTO_MASS0100, 0, - "Fuji Photo Film Co., Ltd.", + "Fuji Photo Film", "Mass Storage", }, { USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_VISOR, 0, - "Handspring, Inc.", + "Handspring", "Handspring Visor", }, { @@ -769,38 +769,38 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP100, 0, - "Iomega Corp.", + "Iomega", "Zip 100", }, { USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP250, 0, - "Iomega Corp.", + "Iomega", "Zip 250", }, { USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BT, 0, "Kawasaki LSI", - "USB ethernet controller engine", + "USB Ethernet controller engine", }, { USB_VENDOR_KAWATSU, USB_PRODUCT_KAWATSU_MH4000P, 0, - "Kawatsu Semiconductor, Inc.", + "Kawatsu Semiconductor", "MiniHub 4000P", }, { USB_VENDOR_KEISOKUGIKEN, USB_PRODUCT_KEISOKUGIKEN_USBDAQ, 0, - "Keisokugiken Corp.", + "Keisokugiken", "HKS-0200 USBDAQ", }, { USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BT, 0, "Kawasaki LSI", - "10BT Ethernet adapter, in the DU-H3E", + "10BT Ethernet", }, { USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_ORBIT, @@ -818,72 +818,72 @@ struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_KNU101TX, 0, "Kingston Technology", - "KNU101TX USB Ethernet", + "KNU101TX Ethernet", }, { USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC220, 0, - "Eastman Kodak Corp.", + "Eastman Kodak", "Digital Science DC220", }, { USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC260, 0, - "Eastman Kodak Corp.", + "Eastman Kodak", "Digital Science DC260", }, { USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC265, 0, - "Eastman Kodak Corp.", + "Eastman Kodak", "Digital Science DC265", }, { USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC290, 0, - "Eastman Kodak Corp.", + "Eastman Kodak", "Digital Science DC290", }, { USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC240, 0, - "Eastman Kodak Corp.", + "Eastman Kodak", "Digital Science DC240", }, { USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC280, 0, - "Eastman Kodak Corp.", + "Eastman Kodak", "Digital Science DC280", }, { USB_VENDOR_KONICA, USB_PRODUCT_KONICA_CAMERA, 0, - "Konica Corp.", + "Konica", "Digital Color Camera", }, { USB_VENDOR_KYE, USB_PRODUCT_KYE_NICHE, 0, - "KYE Systems Corp.", + "KYE Systems", "Niche mouse", }, { USB_VENDOR_KYE, USB_PRODUCT_KYE_NETSCROLL, 0, - "KYE Systems Corp.", + "KYE Systems", "Genius NetScroll mouse", }, { USB_VENDOR_KYE, USB_PRODUCT_KYE_FLIGHT2000, 0, - "KYE Systems Corp.", + "KYE Systems", "Flight 2000 joystick", }, { USB_VENDOR_KYE, USB_PRODUCT_KYE_VIVIDPRO, 0, - "KYE Systems Corp.", + "KYE Systems", "ColorPage Vivid-Pro scanner", }, { @@ -895,121 +895,121 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_LEXMARK, USB_PRODUCT_LEXMARK_S2450, 0, - "Lexmark International, Inc.", + "Lexmark International", "Optra S 2450", }, { USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10T, 0, - "Linksys, Inc.", + "Linksys", "USB10T Ethernet", }, { USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100TX, 0, - "Linksys, Inc.", + "Linksys", "USB100TX Ethernet", }, { USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100H1, 0, - "Linksys, Inc.", + "Linksys", "USB100H1 Ethernet/HPNA", }, { USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TA, 0, - "Linksys, Inc.", + "Linksys", "USB10TA Ethernet", }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M2452, 0, - "Logitech, Inc.", + "Logitech", "M2452 keyboard", }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M4848, 0, - "Logitech, Inc.", + "Logitech", "M4848 mouse", }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_PAGESCAN, 0, - "Logitech, Inc.", + "Logitech", "PageScan", }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMWEB, 0, - "Logitech, Inc.", + "Logitech", "QuickCam Web", }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO, 0, - "Logitech, Inc.", + "Logitech", "QuickCam Pro", }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMEXP, 0, - "Logitech, Inc.", + "Logitech", "QuickCam Express", }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAM, 0, - "Logitech, Inc.", + "Logitech", "QuickCam", }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_N43, 0, - "Logitech, Inc.", + "Logitech", "N43", }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_N48, 0, - "Logitech, Inc.", + "Logitech", "N48 mouse", }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_MBA47, 0, - "Logitech, Inc.", + "Logitech", "M-BA47 mouse", }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMMOUSE, 0, - "Logitech, Inc.", + "Logitech", "WingMan Gaming Mouse", }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_BB13, 0, - "Logitech, Inc.", + "Logitech", "USB-PS/2 Trackball", }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMPAD, 0, - "Logitech, Inc.", + "Logitech", "WingMan GamePad Extreme", }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMJOY, 0, - "Logitech, Inc.", + "Logitech", "WingMan Force joystick", }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO2, 0, - "Logitech, Inc.", + "Logitech", "QuickCam Pro", }, { @@ -1027,19 +1027,19 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_MCT, USB_PRODUCT_MCT_HUB0100, 0, - "MCT Corp.", + "MCT", "Hub", }, { USB_VENDOR_MCT, USB_PRODUCT_MCT_USB232, 0, - "MCT Corp.", + "MCT", "USB-232 Interface", }, { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX, 0, - "Melco, Inc.", + "Melco", "LU-ATX Ethernet", }, { @@ -1153,31 +1153,31 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CU, 0, - "Mustek Systems, Inc.", + "Mustek Systems", "1200 CU scanner", }, { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_600CU, 0, - "Mustek Systems, Inc.", + "Mustek Systems", "600 CU scanner", }, { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200USB, 0, - "Mustek Systems, Inc.", - "1200 USB scanner", + "Mustek Systems", + "1200 scanner", }, { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200UB, 0, - "Mustek Systems, Inc.", + "Mustek Systems", "1200 UB scanner", }, { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_MDC800, 0, - "Mustek Systems, Inc.", + "Mustek Systems", "MDC-800 digital camera", }, { @@ -1207,8 +1207,8 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101, 0, - "BayNETGEAR, Inc.", - "Ethernet adapter", + "BayNETGEAR", + "Ethernet", }, { USB_VENDOR_OMNIVISION, USB_PRODUCT_OMNIVISION_OV511, @@ -1225,32 +1225,32 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_PALM, USB_PRODUCT_PALM_SERIAL, 0, - "Palm Computing, Inc.", + "Palm Computing", "USB Serial Adaptor", }, { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1, 0, - "Peracom Networks, Inc.", + "Peracom Networks", "Serial Converter", }, { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET, 0, - "Peracom Networks, Inc.", - "Ethernet adapter", + "Peracom Networks", + "Ethernet", }, { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET3, 0, - "Peracom Networks, Inc.", - "At Home Ethernet Adapter", + "Peracom Networks", + "At-Home Ethernet", }, { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET2, 0, - "Peracom Networks, Inc.", - "Ethernet adapter", + "Peracom Networks", + "Ethernet", }, { USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DSS350, @@ -1286,7 +1286,7 @@ struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_PIENGINEERING, USB_PRODUCT_PIENGINEERING_PS2USB, 0, "P.I. Engineering", - "PS2 to Mac USB Adapter", + "PS2 to Mac Adapter", }, { USB_VENDOR_PLX, USB_PRODUCT_PLX_TESTBOARD, @@ -1322,7 +1322,7 @@ struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_9600, 0, "Primax Electronics", - "Colorado USB 9600 scanner", + "Colorado 9600 scanner", }, { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_600U, @@ -1334,7 +1334,7 @@ struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_19200, 0, "Primax Electronics", - "Colorado USB 19200 scanner", + "Colorado 19200 scanner", }, { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_1200U, @@ -1387,25 +1387,25 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2301, 0, - "Prolific Technology Inc.", + "Prolific Technology", "PL2301 Host-Host interface", }, { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2302, 0, - "Prolific Technology Inc.", + "Prolific Technology", "PL2302 Host-Host interface", }, { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_ATAPI4, 0, - "Prolific Technology Inc.", + "Prolific Technology", "ATAPI-4 Bridge Controller", }, { USB_VENDOR_QTRONIX, USB_PRODUCT_QTRONIX_980N, 0, - "Qtronix Corp", + "Qtronix", "Scorpion-980N keyboard", }, { @@ -1429,7 +1429,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_IMAGEMATE, 0, - "SanDisk Corp", + "SanDisk", "USB ImageMate", }, { @@ -1453,44 +1453,44 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTLINK, 0, - "SmartBridges Pte Ltd.", - "SmartLink USB ethernet adapter", + "SmartBridges", + "SmartLink Ethernet", }, { USB_VENDOR_SMC, USB_PRODUCT_SMC_2102USB, 0, - "Standard Microsystems Corp", - "10Mbps ethernet adapter", + "Standard Microsystems", + "10Mbps Ethernet", }, { USB_VENDOR_SMC, USB_PRODUCT_SMC_2202USB, 0, - "Standard Microsystems Corp", - "10/100 ethernet adapter", + "Standard Microsystems", + "10/100 Ethernet", }, { USB_VENDOR_SOLIDYEAR, USB_PRODUCT_SOLIDYEAR_KEYBOARD, 0, "Solid Year", - "Solid Year USB keyboard", + "Solid Year keyboard", }, { USB_VENDOR_SONY, USB_PRODUCT_SONY_DSC, 0, - "Sony Corp.", - "Sony DSC cameras", + "Sony", + "Sony DSC Cameras", }, { USB_VENDOR_SONY, USB_PRODUCT_SONY_MSC, 0, - "Sony Corp.", - "Sony MSC memory stick slot", + "Sony", + "Sony MSC Memorystick slot", }, { USB_VENDOR_STMICRO, USB_PRODUCT_STMICRO_COMMUNICATOR, 0, "STMicroelectronics", - "USB Communicator", + "Communicator", }, { USB_VENDOR_SUN, USB_PRODUCT_SUN_KEYBOARD, @@ -1514,25 +1514,25 @@ struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_RIO600USB, 0, "Diamond (Supra)", - "Rio 600 USB", + "Rio 600", }, { USB_VENDOR_TEAC, USB_PRODUCT_TEAC_FD05PUB, 0, "TEAC", - "FD-05PUB floppy", + "FD-05PUB Floppy", }, { USB_VENDOR_TELEX, USB_PRODUCT_TELEX_MIC1, 0, - "Telex Communications, Inc.", - "Enhanced USB Microphone", + "Telex Communications", + "Microphone", }, { USB_VENDOR_TI, USB_PRODUCT_TI_UTUSB41, 0, "Texas Instruments", - "UT-USB41 hub", + "UT-USB41", }, { USB_VENDOR_THRUST, USB_PRODUCT_THRUST_FUSION_PAD, @@ -1549,43 +1549,43 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1236U, 0, - "UMAX Data Systems, Inc.", + "UMAX Data Systems", "Astra 1236U Scanner", }, { USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1220U, 0, - "UMAX Data Systems, Inc.", + "UMAX Data Systems", "Astra 1220U Scanner", }, { USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2000U, 0, - "UMAX Data Systems, Inc.", + "UMAX Data Systems", "Astra 2000U Scanner", }, { USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2100U, 0, - "UMAX Data Systems, Inc.", + "UMAX Data Systems", "Astra 2100U Scanner", }, { USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2200U, 0, - "UMAX Data Systems, Inc.", + "UMAX Data Systems", "Astra 2200U Scanner", }, { USB_VENDOR_UNIACCESS, USB_PRODUCT_UNIACCESS_PANACHE, 0, "Universal Access", - "Panache Surf USB ISDN Adapter", + "Panache Surf ISDN Adapter", }, { USB_VENDOR_VISION, USB_PRODUCT_VISION_VC6452V002, 0, - "VLSI Vision Ltd.", + "VLSI Vision", "CPiA Camera", }, { @@ -1627,19 +1627,19 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_WACOM, USB_PRODUCT_WACOM_CT0405U, 0, - "WACOM Corp. Ltd.", + "WACOM", "CT-0405-U Tablet", }, { USB_VENDOR_WACOM, USB_PRODUCT_WACOM_GRAPHIRE, 0, - "WACOM Corp. Ltd.", + "WACOM", "Graphire", }, { USB_VENDOR_WACOM, USB_PRODUCT_WACOM_INTUOSA5, 0, - "WACOM Corp. Ltd.", + "WACOM", "Intuos A5", }, { @@ -1657,25 +1657,25 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ZOOM, USB_PRODUCT_ZOOM_2986L, 0, - "Zoom Telephonics, Inc.", + "Zoom Telephonics", "2986L Fax modem", }, { USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_980N, 0, - "ZyXEL Communication Co.", + "ZyXEL Communication", "Scorpion-980N keyboard", }, { USB_VENDOR_AOX, 0, USB_KNOWNDEV_NOPROD, - "AOX, Inc.", + "AOX", NULL, }, { USB_VENDOR_ATMEL, 0, USB_KNOWNDEV_NOPROD, - "Atmel Corp.", + "Atmel", NULL, }, { @@ -1687,7 +1687,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ADAPTEC, 0, USB_KNOWNDEV_NOPROD, - "Adaptec, Inc.", + "Adaptec", NULL, }, { @@ -1699,7 +1699,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ACERLABS, 0, USB_KNOWNDEV_NOPROD, - "Acer Labs, Inc.", + "Acer Labs", NULL, }, { @@ -1717,13 +1717,13 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_KODAK, 0, USB_KNOWNDEV_NOPROD, - "Eastman Kodak Corp.", + "Eastman Kodak", NULL, }, { USB_VENDOR_MELCO, 0, USB_KNOWNDEV_NOPROD, - "Melco, Inc.", + "Melco", NULL, }, { @@ -1735,19 +1735,19 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ADI, 0, USB_KNOWNDEV_NOPROD, - "ADI Systems, Inc.", + "ADI Systems", NULL, }, { USB_VENDOR_CATC, 0, USB_KNOWNDEV_NOPROD, - "Computer Access Technology Corp.", + "Computer Access Technology", NULL, }, { USB_VENDOR_GRAVIS, 0, USB_KNOWNDEV_NOPROD, - "Advanced Gravis Computer Tech. Ltd.", + "Advanced Gravis Computer Tech.", NULL, }, { @@ -1765,7 +1765,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_LEXMARK, 0, USB_KNOWNDEV_NOPROD, - "Lexmark International, Inc.", + "Lexmark International", NULL, }, { @@ -1777,7 +1777,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ALPS, 0, USB_KNOWNDEV_NOPROD, - "Alps Electric Co., Ltd.", + "Alps Electric", NULL, }, { @@ -1795,13 +1795,13 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ANALOGDEVICES, 0, USB_KNOWNDEV_NOPROD, - "Analog Devices, Inc.", + "Analog Devices", NULL, }, { USB_VENDOR_KYE, 0, USB_KNOWNDEV_NOPROD, - "KYE Systems Corp.", + "KYE Systems", NULL, }, { @@ -1825,13 +1825,13 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_AMP, 0, USB_KNOWNDEV_NOPROD, - "AMP, Inc.", + "AMP", NULL, }, { USB_VENDOR_CHERRY, 0, USB_KNOWNDEV_NOPROD, - "Cherry Mikroschalter GmbH", + "Cherry Mikroschalter", NULL, }, { @@ -1843,7 +1843,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_LOGITECH, 0, USB_KNOWNDEV_NOPROD, - "Logitech, Inc.", + "Logitech", NULL, }, { @@ -1861,7 +1861,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_CONNECTIX, 0, USB_KNOWNDEV_NOPROD, - "Connectix Corp.", + "Connectix", NULL, }, { @@ -1891,7 +1891,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ACERP, 0, USB_KNOWNDEV_NOPROD, - "Acer Peripherals, Inc.", + "Acer Peripherals", NULL, }, { @@ -1903,7 +1903,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_CANON, 0, USB_KNOWNDEV_NOPROD, - "Canon, Inc.", + "Canon", NULL, }, { @@ -1945,13 +1945,13 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_METHODE, 0, USB_KNOWNDEV_NOPROD, - "Methode Electronics Far East PTE Ltd.", + "Methode Electronics Far East", NULL, }, { USB_VENDOR_MAXISWITCH, 0, USB_KNOWNDEV_NOPROD, - "Maxi Switch, Inc.", + "Maxi Switch", NULL, }, { @@ -1963,7 +1963,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_FUJITSU, 0, USB_KNOWNDEV_NOPROD, - "Fujitsu Ltd.", + "Fujitsu", NULL, }, { @@ -1981,19 +1981,19 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_KONICA, 0, USB_KNOWNDEV_NOPROD, - "Konica Corp.", + "Konica", NULL, }, { USB_VENDOR_LITEON, 0, USB_KNOWNDEV_NOPROD, - "Lite-On Technology Corp.", + "Lite-On Technology", NULL, }, { USB_VENDOR_FUJIPHOTO, 0, USB_KNOWNDEV_NOPROD, - "Fuji Photo Film Co., Ltd.", + "Fuji Photo Film", NULL, }, { @@ -2011,13 +2011,13 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_SCANLOGIC, 0, USB_KNOWNDEV_NOPROD, - "ScanLogic Corp.", + "ScanLogic", NULL, }, { USB_VENDOR_MYSON, 0, USB_KNOWNDEV_NOPROD, - "Myson Technology Inc.", + "Myson Technology", NULL, }, { @@ -2035,7 +2035,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ALTEC, 0, USB_KNOWNDEV_NOPROD, - "Altec Lansing Technologies, Inc.", + "Altec Lansing Technologies", NULL, }, { @@ -2053,13 +2053,13 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_CHICONY, 0, USB_KNOWNDEV_NOPROD, - "Chicony Electronics Co., Ltd.", + "Chicony Electronics", NULL, }, { USB_VENDOR_BROTHER, 0, USB_KNOWNDEV_NOPROD, - "Brother Industries, Ltd.", + "Brother Industries", NULL, }, { @@ -2071,19 +2071,19 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ACER, 0, USB_KNOWNDEV_NOPROD, - "Acer, Inc.", + "Acer", NULL, }, { USB_VENDOR_3COM, 0, USB_KNOWNDEV_NOPROD, - "3Com Corp.", + "3Com", NULL, }, { USB_VENDOR_AZTECH, 0, USB_KNOWNDEV_NOPROD, - "Aztech Systems Ltd", + "Aztech Systems", NULL, }, { @@ -2095,7 +2095,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_KAWATSU, 0, USB_KNOWNDEV_NOPROD, - "Kawatsu Semiconductor, Inc.", + "Kawatsu Semiconductor", NULL, }, { @@ -2107,7 +2107,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_CONNECTEK, 0, USB_KNOWNDEV_NOPROD, - "Advanced Connectek USA, Inc.", + "Advanced Connectek USA", NULL, }, { @@ -2125,7 +2125,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ATI, 0, USB_KNOWNDEV_NOPROD, - "ATI Technologies, Inc.", + "ATI Technologies", NULL, }, { @@ -2143,61 +2143,61 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ANCHOR, 0, USB_KNOWNDEV_NOPROD, - "Anchor Chips, Inc.", + "Anchor Chips", NULL, }, { USB_VENDOR_SONY, 0, USB_KNOWNDEV_NOPROD, - "Sony Corp.", + "Sony", NULL, }, { USB_VENDOR_VISION, 0, USB_KNOWNDEV_NOPROD, - "VLSI Vision Ltd.", + "VLSI Vision", NULL, }, { USB_VENDOR_ASAHIKASEI, 0, USB_KNOWNDEV_NOPROD, - "Asahi Kasei Microsystems Co., Ltd", + "Asahi Kasei Microsystems", NULL, }, { USB_VENDOR_ATEN, 0, USB_KNOWNDEV_NOPROD, - "ATEN International Co. Ltd.", + "ATEN International", NULL, }, { USB_VENDOR_MUSTEK, 0, USB_KNOWNDEV_NOPROD, - "Mustek Systems, Inc.", + "Mustek Systems", NULL, }, { USB_VENDOR_TELEX, 0, USB_KNOWNDEV_NOPROD, - "Telex Communications, Inc.", + "Telex Communications", NULL, }, { USB_VENDOR_PERACOM, 0, USB_KNOWNDEV_NOPROD, - "Peracom Networks, Inc.", + "Peracom Networks", NULL, }, { USB_VENDOR_ALCOR2, 0, USB_KNOWNDEV_NOPROD, - "Alcor Micro, Inc.", + "Alcor Micro", NULL, }, { USB_VENDOR_WACOM, 0, USB_KNOWNDEV_NOPROD, - "WACOM Corp. Ltd.", + "WACOM", NULL, }, { @@ -2215,7 +2215,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ELECOM, 0, USB_KNOWNDEV_NOPROD, - "Elecom Corp. Ltd.", + "Elecom", NULL, }, { @@ -2233,7 +2233,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_AVM, 0, USB_KNOWNDEV_NOPROD, - "AVM GmbH", + "AVM", NULL, }, { @@ -2251,25 +2251,25 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ZYXEL, 0, USB_KNOWNDEV_NOPROD, - "ZyXEL Communication Co.", + "ZyXEL Communication", NULL, }, { USB_VENDOR_ALCOR, 0, USB_KNOWNDEV_NOPROD, - "Alcor Micro, Inc.", + "Alcor Micro", NULL, }, { USB_VENDOR_IOMEGA, 0, USB_KNOWNDEV_NOPROD, - "Iomega Corp.", + "Iomega", NULL, }, { USB_VENDOR_ATREND, 0, USB_KNOWNDEV_NOPROD, - "A-Trend Technology Co., Ltd.", + "A-Trend Technology", NULL, }, { @@ -2311,13 +2311,13 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_QTRONIX, 0, USB_KNOWNDEV_NOPROD, - "Qtronix Corp", + "Qtronix", NULL, }, { USB_VENDOR_ELSA, 0, USB_KNOWNDEV_NOPROD, - "ELSA Gmbh", + "ELSA", NULL, }, { @@ -2347,13 +2347,13 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_GENESYS, 0, USB_KNOWNDEV_NOPROD, - "Genesys Logic, Inc.", + "Genesys Logic", NULL, }, { USB_VENDOR_FUJI, 0, USB_KNOWNDEV_NOPROD, - "Fuji Electric Co., Ltd.", + "Fuji Electric", NULL, }, { @@ -2383,7 +2383,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ANKO, 0, USB_KNOWNDEV_NOPROD, - "Anko Electronic Co., Ltd.", + "Anko Electronic", NULL, }, { @@ -2413,7 +2413,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_BRIDGE, 0, USB_KNOWNDEV_NOPROD, - "Bridge Information Co., Ltd.", + "Bridge Information", NULL, }, { @@ -2437,25 +2437,25 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ACTLABS, 0, USB_KNOWNDEV_NOPROD, - "Act Labs, Ltd.", + "Act Labs", NULL, }, { USB_VENDOR_ALARIS, 0, USB_KNOWNDEV_NOPROD, - "Alaris, Inc.", + "Alaris", NULL, }, { USB_VENDOR_APEX, 0, USB_KNOWNDEV_NOPROD, - "Apex, Inc.", + "Apex", NULL, }, { USB_VENDOR_AVISION, 0, USB_KNOWNDEV_NOPROD, - "Avision, Inc.", + "Avision", NULL, }, { @@ -2467,37 +2467,37 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_LINKSYS, 0, USB_KNOWNDEV_NOPROD, - "Linksys, Inc.", + "Linksys", NULL, }, { USB_VENDOR_ACERSA, 0, USB_KNOWNDEV_NOPROD, - "Acer Semiconductor America, Inc.", + "Acer Semiconductor America", NULL, }, { USB_VENDOR_AIWA, 0, USB_KNOWNDEV_NOPROD, - "Aiwa Co., Ltd.", + "Aiwa", NULL, }, { USB_VENDOR_ACARD, 0, USB_KNOWNDEV_NOPROD, - "ACARD Technology Corp.", + "ACARD Technology", NULL, }, { USB_VENDOR_PROLIFIC, 0, USB_KNOWNDEV_NOPROD, - "Prolific Technology Inc.", + "Prolific Technology", NULL, }, { USB_VENDOR_ADVANCELOGIC, 0, USB_KNOWNDEV_NOPROD, - "Avance Logic, Inc.", + "Avance Logic", NULL, }, { @@ -2509,7 +2509,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ASKEY, 0, USB_KNOWNDEV_NOPROD, - "Askey Computer Corp.", + "Askey Computer", NULL, }, { @@ -2527,13 +2527,13 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ASIAMD, 0, USB_KNOWNDEV_NOPROD, - "Asia Microelectronic Development, Inc.", + "Asia Microelectronic Development", NULL, }, { USB_VENDOR_BIZLINK, 0, USB_KNOWNDEV_NOPROD, - "Bizlink International Corp.", + "Bizlink International", NULL, }, { @@ -2551,7 +2551,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ADS, 0, USB_KNOWNDEV_NOPROD, - "ADS Technologies, Inc.", + "ADS Technologies", NULL, }, { @@ -2575,13 +2575,13 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_SMC, 0, USB_KNOWNDEV_NOPROD, - "Standard Microsystems Corp", + "Standard Microsystems", NULL, }, { USB_VENDOR_MCT, 0, USB_KNOWNDEV_NOPROD, - "MCT Corp.", + "MCT", NULL, }, { @@ -2599,19 +2599,19 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_GRIFFIN, 0, USB_KNOWNDEV_NOPROD, - "Griffin Technology, Inc.", + "Griffin Technology", NULL, }, { USB_VENDOR_SANDISK, 0, USB_KNOWNDEV_NOPROD, - "SanDisk Corp", + "SanDisk", NULL, }, { USB_VENDOR_BRIMAX, 0, USB_KNOWNDEV_NOPROD, - "Brimax, Inc.", + "Brimax", NULL, }, { @@ -2623,13 +2623,13 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ABL, 0, USB_KNOWNDEV_NOPROD, - "ABL Electronics Corp.", + "ABL Electronics", NULL, }, { USB_VENDOR_ALFADATA, 0, USB_KNOWNDEV_NOPROD, - "Alfadata Computer Corp.", + "Alfadata Computer", NULL, }, { @@ -2641,19 +2641,19 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ONNTO, 0, USB_KNOWNDEV_NOPROD, - "Onnto Corp.", + "Onnto", NULL, }, { USB_VENDOR_BE, 0, USB_KNOWNDEV_NOPROD, - "Be, Inc.", + "Be", NULL, }, { USB_VENDOR_ADMTEK, 0, USB_KNOWNDEV_NOPROD, - "ADMtek, Inc.", + "ADMtek", NULL, }, { @@ -2677,13 +2677,13 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ABOCOM, 0, USB_KNOWNDEV_NOPROD, - "AboCom Systems, Inc.", + "AboCom Systems", NULL, }, { USB_VENDOR_KEISOKUGIKEN, 0, USB_KNOWNDEV_NOPROD, - "Keisokugiken Corp.", + "Keisokugiken", NULL, }, { @@ -2695,7 +2695,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_BUG, 0, USB_KNOWNDEV_NOPROD, - "B.U.G., Inc.", + "B.U.G.", NULL, }, { @@ -2707,7 +2707,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_AVERMEDIA, 0, USB_KNOWNDEV_NOPROD, - "AVerMedia Technologies, Inc.", + "AVerMedia Technologies", NULL, }, { @@ -2719,7 +2719,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_APTIO, 0, USB_KNOWNDEV_NOPROD, - "Aptio Products, Inc.", + "Aptio Products", NULL, }, { @@ -2731,43 +2731,43 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ALLIEDCABLE, 0, USB_KNOWNDEV_NOPROD, - "Allied Cable Corp.", + "Allied Cable", NULL, }, { USB_VENDOR_ZOOM, 0, USB_KNOWNDEV_NOPROD, - "Zoom Telephonics, Inc.", + "Zoom Telephonics", NULL, }, { USB_VENDOR_BROADLOGIC, 0, USB_KNOWNDEV_NOPROD, - "BroadLogic, Inc.", + "BroadLogic", NULL, }, { USB_VENDOR_HANDSPRING, 0, USB_KNOWNDEV_NOPROD, - "Handspring, Inc.", + "Handspring", NULL, }, { USB_VENDOR_ACTIONSTAR, 0, USB_KNOWNDEV_NOPROD, - "Action Star Enterprise Co., Ltd.", + "Action Star Enterprise", NULL, }, { USB_VENDOR_PALM, 0, USB_KNOWNDEV_NOPROD, - "Palm Computing, Inc.", + "Palm Computing", NULL, }, { USB_VENDOR_ACCTON, 0, USB_KNOWNDEV_NOPROD, - "Accton Technology Corp.", + "Accton Technology", NULL, }, { @@ -2779,13 +2779,13 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_NETGEAR, 0, USB_KNOWNDEV_NOPROD, - "BayNETGEAR, Inc.", + "BayNETGEAR", NULL, }, { USB_VENDOR_ACTIVEWIRE, 0, USB_KNOWNDEV_NOPROD, - "ActiveWire, Inc.", + "ActiveWire", NULL, }, { @@ -2797,19 +2797,19 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ADESSOKBTEK, 0, USB_KNOWNDEV_NOPROD, - "ADESSO/Kbtek America, Inc.", + "ADESSO/Kbtek America", NULL, }, { USB_VENDOR_APT, 0, USB_KNOWNDEV_NOPROD, - "APT Technologies, Inc.", + "APT Technologies", NULL, }, { USB_VENDOR_BOCARESEARCH, 0, USB_KNOWNDEV_NOPROD, - "Boca Research, Inc.", + "Boca Research", NULL, }, { @@ -2821,7 +2821,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_BURRBROWN, 0, USB_KNOWNDEV_NOPROD, - "Burr-Brown Japan, Ltd.", + "Burr-Brown Japan", NULL, }, { @@ -2833,37 +2833,37 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_AIPTEK, 0, USB_KNOWNDEV_NOPROD, - "AIPTEK International, Inc.", + "AIPTEK International", NULL, }, { USB_VENDOR_SMARTBRIDGES, 0, USB_KNOWNDEV_NOPROD, - "SmartBridges Pte Ltd.", + "SmartBridges", NULL, }, { USB_VENDOR_BILLIONTON, 0, USB_KNOWNDEV_NOPROD, - "Billionton Systems, Inc.", + "Billionton Systems", NULL, }, { USB_VENDOR_EXTENDED, 0, USB_KNOWNDEV_NOPROD, - "Extended Systems, Inc.", + "Extended Systems", NULL, }, { USB_VENDOR_AUTHENTEC, 0, USB_KNOWNDEV_NOPROD, - "AuthenTec, Inc.", + "AuthenTec", NULL, }, { USB_VENDOR_ALATION, 0, USB_KNOWNDEV_NOPROD, - "Alation Systems, Inc.", + "Alation Systems", NULL, }, { @@ -2887,13 +2887,13 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_BLUEWATER, 0, USB_KNOWNDEV_NOPROD, - "BlueWater Systems, Inc.", + "BlueWater Systems", NULL, }, { USB_VENDOR_AGILENT, 0, USB_KNOWNDEV_NOPROD, - "Agilent Technologies, Inc.", + "Agilent Technologies", NULL, }, { @@ -2905,55 +2905,55 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_BECKHOFF, 0, USB_KNOWNDEV_NOPROD, - "Beckhoff Gmbh", + "Beckhoff", NULL, }, { USB_VENDOR_ALTIUS, 0, USB_KNOWNDEV_NOPROD, - "Altius Solutions, Inc.", + "Altius Solutions", NULL, }, { USB_VENDOR_ARRIS, 0, USB_KNOWNDEV_NOPROD, - "Arris Interactive LLC", + "Arris Interactive", NULL, }, { USB_VENDOR_ACTIVCARD, 0, USB_KNOWNDEV_NOPROD, - "ACTIVCARD, INC.", + "ACTIVCARD", NULL, }, { USB_VENDOR_ACTISYS, 0, USB_KNOWNDEV_NOPROD, - "ACTiSYS Corp.", + "ACTiSYS", NULL, }, { USB_VENDOR_AFOURTECH, 0, USB_KNOWNDEV_NOPROD, - "A-FOUR TECH CO., LTD.", + "A-FOUR TECH", NULL, }, { USB_VENDOR_AIMEX, 0, USB_KNOWNDEV_NOPROD, - "AIMEX Corp.", + "AIMEX", NULL, }, { USB_VENDOR_ADDONICS, 0, USB_KNOWNDEV_NOPROD, - "Addonics Technologies Corp.", + "Addonics Technologies", NULL, }, { USB_VENDOR_AKAI, 0, USB_KNOWNDEV_NOPROD, - "AKAI professional M.I. Corp.", + "AKAI professional M.I.", NULL, }, { @@ -2983,19 +2983,19 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ASAHIOPTICAL, 0, USB_KNOWNDEV_NOPROD, - "Asahi Optical Co., Ltd.", + "Asahi Optical", NULL, }, { USB_VENDOR_BOCASYSTEMS, 0, USB_KNOWNDEV_NOPROD, - "Boca Systems, Inc.", + "Boca Systems", NULL, }, { USB_VENDOR_BROADCOM, 0, USB_KNOWNDEV_NOPROD, - "Broadcom Corp.", + "Broadcom", NULL, }, { @@ -3019,13 +3019,13 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_BELKIN2, 0, USB_KNOWNDEV_NOPROD, - "Belkin Components (2nd)", + "Belkin Components", NULL, }, { USB_VENDOR_UMAX, 0, USB_KNOWNDEV_NOPROD, - "UMAX Data Systems, Inc.", + "UMAX Data Systems", NULL, }, { @@ -3043,13 +3043,13 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ACTIONTEC, 0, USB_KNOWNDEV_NOPROD, - "Actiontec Electronics, Inc.", + "Actiontec Electronics", NULL, }, { USB_VENDOR_DLINK, 0, USB_KNOWNDEV_NOPROD, - "D-Link Corp", + "D-Link", NULL, }, { |