Module Name: src Committed By: eadler Date: Tue Jun 5 09:28:26 UTC 2018
Modified Files: src/sys/dev/usb: usbdevs Log Message: usbdevs: misc updates from FreeBSD This syncs some vendor changes from FreeBSD (r334649). Prefer longer "canonical" names where the names differed. ok leot@ To generate a diff of this commit: cvs rdiff -u -r1.748 -r1.749 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.748 src/sys/dev/usb/usbdevs:1.749 --- src/sys/dev/usb/usbdevs:1.748 Sat Jun 2 21:15:33 2018 +++ src/sys/dev/usb/usbdevs Tue Jun 5 09:28:26 2018 @@ -1,6 +1,6 @@ -$NetBSD: usbdevs,v 1.748 2018/06/02 21:15:33 sevan Exp $ +$NetBSD: usbdevs,v 1.749 2018/06/05 09:28:26 eadler Exp $ -/* +/*- * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. * All rights reserved. * @@ -62,7 +62,8 @@ vendor UNKNOWN1 0x0053 Unknown vendor vendor UNKNOWN2 0x0105 Unknown vendor vendor EGALAX2 0x0123 eGalax, Inc. vendor QUAN 0x01e1 Quan -vendor CHIPSBANK 0x0204 Chipsbank +vendor CHIPSBANK 0x0204 Chipsbank Microelectronics Co. +vendor HUMAX 0x02ad HUMAX vendor AOX 0x03e8 AOX vendor ATMEL 0x03eb Atmel vendor MITSUMI 0x03ee Mitsumi @@ -91,9 +92,10 @@ vendor ALPS 0x044e Alps Electric vendor THRUST 0x044f Thrustmaster vendor TI 0x0451 Texas Instruments vendor ANALOGDEVICES 0x0456 Analog Devices -vendor SIS 0x0457 Silicon Integrated Systems +vendor SIS 0x0457 Silicon Integrated Systems Corp. vendor KYE 0x0458 KYE Systems vendor DIAMOND2 0x045a Diamond (Supra) +vendor RENESAS 0x045b Renesas vendor MICROSOFT 0x045e Microsoft vendor PRIMAX 0x0461 Primax Electronics vendor MGE 0x0463 MGE UPS Systems @@ -103,12 +105,14 @@ vendor MEGATRENDS 0x046b American Megatr vendor LOGITECH 0x046d Logitech vendor BTC 0x046e Behavior Tech. Computer vendor PHILIPS 0x0471 Philips +vendor SUN2 0x0472 Sun Microsystems (official) vendor SANYO 0x0474 Sanyo Electric +vendor SEAGATE 0x0477 Seagate vendor CONNECTIX 0x0478 Connectix vendor KENSINGTON 0x047d Kensington vendor LUCENT 0x047e Lucent vendor PLANTRONICS 0x047f Plantronics -vendor KYOCERA 0x0482 Kyocera +vendor KYOCERA 0x0482 Kyocera Wireless Corp. vendor STMICRO 0x0483 STMicroelectronics vendor FOXCONN 0x0489 Foxconn / Hon Hai vendor MEIZU 0x0492 Meizu Electronics @@ -116,6 +120,7 @@ vendor YAMAHA 0x0499 YAMAHA vendor COMPAQ 0x049f Compaq vendor HITACHI 0x04a4 Hitachi vendor ACERP 0x04a5 Acer Peripherals +vendor DAVIDCOM 0x04a6 Davicom vendor VISIONEER 0x04a7 Visioneer vendor CANON 0x04a9 Canon vendor NIKON 0x04b0 Nikon @@ -145,6 +150,7 @@ vendor ALTEC 0x04d2 Altec Lansing vendor MICROCHIP 0x04d8 Microchip Technology vendor HOLTEK 0x04d9 Holtek Semiconductor vendor PANASONIC 0x04da Panasonic (Matsushita) +vendor HUANHSIN 0x04dc Huan Hsin vendor SHARP 0x04dd Sharp vendor IIYAMA 0x04e1 Iiyama vendor SHUTTLE 0x04e6 Shuttle Technology @@ -318,8 +324,8 @@ vendor APTIO 0x07d2 Aptio Products vendor ARASAN 0x07da Arasan Chip Systems vendor ALLIEDCABLE 0x07e6 Allied Cable vendor STSN 0x07ef STSN -vendor CENTURY 0x07f7 CENTURY Corporation vendor BEWAN 0x07fa Bewan +vendor CENTURY 0x07f7 CENTURY Corporation vendor ZOOM 0x0803 Zoom Telephonics vendor SYNET 0x0812 Synet Electronics vendor BROADLOGIC 0x0827 BroadLogic @@ -354,7 +360,7 @@ vendor TRUMPION 0x090a Trumpion Microel vendor ALATION 0x0910 Alation Systems vendor GLOBESPAN 0x0915 Globespan vendor CONCORDCAMERA 0x0919 Concord Camera -vendor GARMIN 0x091e Garmin +vendor GARMIN 0x091e Garmin International vendor GOHUBS 0x0921 GoHubs vendor BIOMETRIC 0x0929 American Biometric Company vendor TOSHIBA 0x0930 Toshiba @@ -378,7 +384,7 @@ vendor ALTIUS 0x09b3 Altius Solutions vendor ARRIS 0x09c1 Arris Interactive vendor ACTIVCARD 0x09c3 ACTIVCARD vendor ACTISYS 0x09c4 ACTiSYS -vendor NOVATEL 0x09d7 NovAtel +vendor NOVATEL 0x09d7 Novatel Wireless vendor AFOURTECH 0x09da A-FOUR TECH vendor AIMEX 0x09dc AIMEX vendor ADDONICS 0x09df Addonics Technologies @@ -397,7 +403,7 @@ vendor GREENHOUSE 0x0a6b GREENHOUSE vendor GEOCAST 0x0a79 Geocast Network Systems vendor ZYDAS 0x0ace Zydas Technology Corporation vendor NEODIO 0x0aec Neodio -vendor OPTIONNV 0x0af0 Option N.V: +vendor OPTIONNV 0x0af0 Option N.V. vendor ASUSTEK 0x0b05 ASUSTeK Computer vendor TODOS 0x0b0c Todos Data System vendor SIIG2 0x0b39 SIIG @@ -405,7 +411,7 @@ vendor TEKRAM 0x0b3b Tekram Technology vendor HAL 0x0b41 HAL Corporation vendor EMS 0x0b43 EMS Production vendor NEC2 0x0b62 NEC -vendor ATI2 0x0b6f ATI +vendor ATI2 0x0b6f ATI Technologies vendor ZEEVO 0x0b7a Zeevo, Inc. vendor KURUSUGAWA 0x0b7e Kurusugawa Electronics, Inc. vendor ASIX 0x0b95 ASIX Electronics @@ -557,6 +563,7 @@ vendor PARA 0x20b8 PARA Industrial vendor TRENDNET 0x20f4 TRENDnet vendor RTSYS 0x2100 RT Systems vendor DLINK3 0x2101 D-Link +vendor INTENSO 0x2109 INTENSO vendor VIALABS 0x2109 VIA Labs vendor ERICSSON 0x2282 Ericsson vendor MOTOROLA2 0x22b8 Motorola @@ -612,7 +619,7 @@ vendor USRP 0xfffe GNU Radio USRP product 3COM HOMECONN 0x009d HomeConnect USB Camera product 3COM 3CREB96 0x00a0 Bluetooth USB Adapter product 3COM 3C19250 0x03e8 3C19250 Ethernet adapter -product 3COM 3CRSHEW696 0x0a01 3CRSHEW696 +product 3COM 3CRSHEW696 0x0a01 3CRSHEW696 Wireless Adapter product 3COM 3C460 0x11f8 HomeConnect 3C460 product 3COM USR56K 0x3021 U.S.Robotics 56000 Voice Faxmodem Pro product 3COM 3C460B 0x4601 HomeConnect 3C460B @@ -3509,6 +3516,9 @@ product ZINWELL RT3070 0x5257 RT3070 product ZOOM 2986L 0x9700 2986L Fax modem product ZOOM 3095 0x3095 3095 USB Fax modem +/* Zoran Microelectronics products */ +product ZORAN EX20DSC 0x4343 Digital Camera EX-20 DSC + /* ZTE products */ product ZTE MF622 0x0001 MF622 modem product ZTE MF628 0x0015 MF628 modem @@ -3544,5 +3554,7 @@ product ZYXEL NWD211AN 0x3418 NWD-211AN product ZYXEL RT2870_2 0x341a RT2870 product ZYXEL NWD2105 0x341e NWD2105 product ZYXEL RTL8192CU 0x341f RTL8192CU +product ZYXEL NWD2705 0x3421 NWD2705 +product ZYXEL NWD6605 0x3426 ND6605 product ZYXEL RT3070 0x343e RT3070 product ZYXEL PRESTIGE 0x401a Prestige