diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c index efd589152780..50797aafc389 100644 --- a/sys/dev/usb/uplcom.c +++ b/sys/dev/usb/uplcom.c @@ -1,4 +1,4 @@ -/* $NetBSD: uplcom.c,v 1.39 2004/09/13 12:55:49 drochner Exp $ */ +/* $NetBSD: uplcom.c,v 1.40 2004/10/22 09:34:55 augustss Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. @@ -41,7 +41,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.39 2004/09/13 12:55:49 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.40 2004/10/22 09:34:55 augustss Exp $"); #include #include @@ -174,7 +174,7 @@ static const struct usb_devno uplcom_devs[] = { /* TDK USB-PDC Adapter UPA9664 */ { USB_VENDOR_TDK, USB_PRODUCT_TDK_UPA9664 }, /* Sony Ericsson USB Cable */ - { USB_VENDOR_SONYERICSSON, USB_PRODUCT_SONYERICSSON_DCU10 }, + { USB_VENDOR_SUSTEEN, USB_PRODUCT_SUSTEEN_DCU10 }, /* SOURCENEXT KeikaiDenwa 8 */ { USB_VENDOR_SOURCENEXT, USB_PRODUCT_SOURCENEXT_KEIKAI8 }, /* SOURCENEXT KeikaiDenwa 8 with charger */ @@ -182,7 +182,7 @@ static const struct usb_devno uplcom_devs[] = { /* HAL Corporation Crossam2+USB */ { USB_VENDOR_HAL, USB_PRODUCT_HAL_IMR001 }, /* Sitecom USB to serial cable */ - { USB_VENDOR_SITECOM, USB_PRODUCT_SITECOM_SERIAL }, + { USB_VENDOR_SITECOM, USB_PRODUCT_SITECOM_CN104 }, }; #define uplcom_lookup(v, p) usb_lookup(uplcom_devs, v, p) diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index b3dfd845934f..93f3ad2dc608 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.380 2004/10/21 21:00:31 rjs Exp $ +$NetBSD: usbdevs,v 1.381 2004/10/22 09:34:55 augustss Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -68,11 +68,11 @@ vendor FTDI 0x0403 Future Technology Devices vendor NEC 0x0409 NEC vendor KODAK 0x040a Eastman Kodak vendor MELCO 0x0411 Melco -vendor CREATIVE 0x041e Creative +vendor CREATIVE 0x041e Creative Labs vendor ADI 0x0422 ADI Systems vendor CATC 0x0423 Computer Access Technology vendor SMC2 0x0424 Standard Microsystems -vendor GRAVIS 0x0428 Advanced Gravis Computer Tech. +vendor GRAVIS 0x0428 Advanced Gravis Computer vendor SUN 0x0430 Sun Microsystems vendor TAUGA 0x0436 Taugagreining HF vendor AMD 0x0438 Advanced Micro Devices @@ -97,15 +97,16 @@ vendor CONNECTIX 0x0478 Connectix vendor KENSINGTON 0x047d Kensington vendor LUCENT 0x047e Lucent vendor PLANTRONICS 0x047f Plantronics +vendor KYOCERA 0x0482 Kyocera vendor STMICRO 0x0483 STMicroelectronics vendor YAMAHA 0x0499 YAMAHA -vendor COMPAQ 0x049f Compaq Computers +vendor COMPAQ 0x049f Compaq vendor HITACHI 0x04a4 Hitachi vendor ACERP 0x04a5 Acer Peripherals vendor VISIONEER 0x04a7 Visioneer vendor CANON 0x04a9 Canon vendor NIKON 0x04b0 Nikon -vendor IBM 0x04b3 IBM Corporation +vendor IBM 0x04b3 IBM vendor CYPRESS 0x04b4 Cypress Semiconductor vendor EPSON 0x04b8 Seiko Epson vendor RAINBOW 0x04b9 Rainbow Technologies @@ -116,7 +117,7 @@ vendor METHODE 0x04c2 Methode Electronics Far East vendor MAXISWITCH 0x04c3 Maxi Switch vendor LOCKHEEDMER 0x04c4 Lockheed Martin Energy Research vendor FUJITSU 0x04c5 Fujitsu -vendor TOSHIBAAM 0x04c6 Toshiba America Electronic Components +vendor TOSHIBAAM 0x04c6 Toshiba America vendor MICROMACRO 0x04c7 Micro Macro Technologies vendor KONICA 0x04c8 Konica vendor LITEON 0x04ca Lite-On Technology @@ -125,10 +126,11 @@ vendor PHILIPSSEMI 0x04cc Philips Semiconductors vendor TATUNG 0x04cd Tatung Co. Of America vendor SCANLOGIC 0x04ce ScanLogic vendor MYSON 0x04cf Myson Technology -vendor DIGI2 0x04d0 Digi International +vendor DIGI2 0x04d0 Digi vendor ITTCANON 0x04d1 ITT Canon -vendor ALTEC 0x04d2 Altec Lansing Technologies +vendor ALTEC 0x04d2 Altec Lansing vendor PANASONIC 0x04da Panasonic (Matsushita) +vendor SHARP 0x04dd Sharp vendor IIYAMA 0x04e1 Iiyama vendor SHUTTLE 0x04e6 Shuttle Technology vendor SAMSUNG 0x04e8 Samsung Electronics @@ -150,6 +152,7 @@ vendor ALTRA 0x0527 ALTRA vendor ATI 0x0528 ATI Technologies vendor AKS 0x0529 Aladdin Knowledge Systems vendor UNIACCESS 0x0540 Universal Access +vendor VIEWSONIC 0x0543 ViewSonic vendor XIRLINK 0x0545 Xirlink vendor ANCHOR 0x0547 Anchor Chips vendor SONY 0x054c Sony @@ -167,11 +170,11 @@ vendor ELECOM 0x056e Elecom vendor HAUPPAUGE 0x0573 Hauppauge Computer Works vendor BAFO 0x0576 BAFO/Quality Computer Accessories vendor YEDATA 0x057b Y-E Data -vendor AVM 0x057c AVM GmbH +vendor AVM 0x057c AVM vendor QUICKSHOT 0x057f Quickshot vendor ROLAND 0x0582 Roland vendor ROCKFIRE 0x0583 Rockfire -vendor RATOC 0x0584 RATOC Systems, Inc. +vendor RATOC 0x0584 RATOC Systems vendor ZYXEL 0x0586 ZyXEL Communication vendor ALCOR 0x058f Alcor Micro vendor IOMEGA 0x059b Iomega @@ -224,6 +227,7 @@ vendor SIEMENS 0x067c Siemens vendor AVANCELOGIC 0x0680 Avance Logic vendor HAGIWARA 0x0693 Hagiwara Sys-Com vendor MINOLTA 0x0686 Minolta +vendor CHPRODUCTS 0x068e CH Products vendor CTX 0x0698 Chuntex vendor ASKEY 0x069a Askey Computer vendor SAITEK 0x06a3 Saitek @@ -237,18 +241,20 @@ vendor MULTITECH 0x06e0 MultiTech vendor ADS 0x06e1 ADS Technologies vendor ALCATELM 0x06e4 Alcatel Microelectronics vendor SIRIUS 0x06ea Sirius Technologies +vendor GUILLEMOT 0x06f8 Guillemot vendor BOSTON 0x06fd Boston Acoustics vendor SMC 0x0707 Standard Microsystems vendor PUTERCOM 0x0708 Putercom vendor MCT 0x0711 MCT -vendor SONYERICSSON 0x0731 Sony Ericsson +vendor IMATION 0x0718 Imation +vendor SUSTEEN 0x0731 Susteen vendor EICON 0x0734 Eicon Networks vendor DIGITALSTREAM 0x074e Digital Stream vendor AUREAL 0x0755 Aureal Semiconductor vendor MIDIMAN 0x0763 Midiman vendor LINKSYS2 0x077b Linksys vendor GRIFFIN 0x077d Griffin Technology -vendor SANDISK 0x0781 SanDisk Corp +vendor SANDISK 0x0781 SanDisk vendor JENOPTIK 0x0784 Jenoptik vendor BRIMAX 0x078e Brimax vendor AXIS 0x0792 Axis Communications @@ -267,7 +273,7 @@ vendor GENERALINSTMNTS 0x07b2 General Instruments (Motorola) vendor OLYMPUS 0x07b4 Olympus vendor ABOCOM 0x07b8 AboCom Systems vendor KEISOKUGIKEN 0x07c1 Keisokugiken -vendor ONSPEC 0x07c4 OnSpec Electronic, Inc. +vendor ONSPEC 0x07c4 OnSpec vendor APG 0x07c5 APG Cash Drawer vendor BUG 0x07c8 B.U.G. vendor ALLIEDTELESYN 0x07c9 Allied Telesyn International @@ -289,6 +295,7 @@ vendor DIAMOND 0x0841 Diamond vendor NETGEAR 0x0846 BayNETGEAR vendor ACTIVEWIRE 0x0854 ActiveWire vendor PORTGEAR 0x085a PortGear +vendor SYSTEMTALKS 0x086e System Talks vendor METRICOM 0x0870 Metricom vendor ADESSOKBTEK 0x087c ADESSO/Kbtek America vendor JATON 0x087d Jaton @@ -309,8 +316,9 @@ vendor ALATION 0x0910 Alation Systems vendor CONCORDCAMERA 0x0919 Concord Camera vendor GOHUBS 0x0921 GoHubs vendor BIOMETRIC 0x0929 American Biometric Company -vendor TOSHIBA 0x0930 Toshiba Corporation +vendor TOSHIBA 0x0930 Toshiba vendor PLEXTOR 0x093b Plextor +vendor INTREPIDCS 0x093c Intrepid vendor YANO 0x094f Yano vendor KINGSTON 0x0951 Kingston Technology vendor BLUEWATER 0x0956 BlueWater Systems @@ -342,6 +350,8 @@ vendor GREENHOUSE 0x0a6b GREENHOUSE vendor GEOCAST 0x0a79 Geocast Network Systems vendor NEODIO 0x0aec Neodio vendor TODOS 0x0b0c Todos Data System +vendor SIIG2 0x0b39 SIIG +vendor TEKRAM 0x0b3b Tekram Technology vendor HAL 0x0b41 HAL Corporation vendor EMS 0x0b43 EMS Production vendor NEC2 0x0b62 NEC @@ -349,21 +359,24 @@ vendor ATI2 0x0b6f ATI vendor ZEEVO 0x0b7a Zeevo, Inc. vendor KURUSUGAWA 0x0b7e Kurusugawa Electronics, Inc. vendor ASIX 0x0b95 ASIX Electronics +vendor USR 0x0baf U.S. Robotics vendor REALTEK 0x0bda Realtek vendor ADDONICS2 0x0bf6 Addonics Technology vendor AGATE 0x0c08 Agate Technologies vendor DMI 0x0c0b DMI vendor CHICONY2 0x0c45 Chicony Electronics vendor LUWEN 0x0c76 EasyDisk +vendor ZCOM 0x0cde Z-Com vendor TANGTOP 0x0d3d Tangtop vendor SMC3 0x0d5c Standard Microsystems vendor PEN 0x0d7d Pen Drive vendor ACDC 0x0d7e American Computer & Digital Components -vendor MSI 0x0db0 Micro Star International -vendor HAWKING 0x0e66 Hawking Technologies -vendor OTI 0x0ea0 Ours Technology Inc. +vendor ABC 0x0d8c ABC +vendor MSI 0x0db0 Micro Star +vendor HAWKING 0x0e66 Hawking +vendor OTI 0x0ea0 Ours Technology vendor PILOTECH 0x0eaf Pilotech -vendor EGALAX 0x0eef eGalax, Inc. +vendor EGALAX 0x0eef eGalax vendor QUALCOMM 0x1004 Qualcomm vendor MOTOROLA 0x1063 Motorola vendor CCYU 0x1065 CCYU Technology @@ -372,9 +385,12 @@ vendor ASANTE 0x10bd Asante vendor JRC 0x1145 Japan Radio Company vendor SERVERWORKS 0x1166 ServerWorks vendor ACERCM 0x1189 Acer Communications & Multimedia +vendor TSUNAMI 0x1241 Tsunami +vendor CREATIVE2 0x1292 Creative Labs vendor BELKIN2 0x1293 Belkin Components vendor MOBILITY 0x1342 Mobility vendor SHARK 0x13d2 Shark +vendor SILICOM 0x1485 Silicom vendor SILICONPORTALS 0x1527 Silicon Portals vendor SOHOWARE 0x15e8 SOHOware vendor UMAX 0x1606 UMAX Data Systems @@ -387,13 +403,17 @@ vendor MOTOROLA2 0x22b8 Motorola vendor TRIPPLITE 0x2478 Tripp-Lite vendor HIROSE 0x2631 Hirose Electric vendor NHJ 0x2770 NHJ +vendor PLANEX 0x2c02 Planex Communications vendor VIDZMEDIA 0x3275 VidzMedia Pte Ltd vendor AEI 0x3334 AEI vendor PQI 0x3538 PQI vendor DAISY 0x3579 Daisy Technology vendor NI 0x3923 National Instruments +vendor MICRONET 0x3980 Micronet Communications vendor IODATA2 0x40bb I-O Data +vendor IRIVER 0x4102 iRiver vendor DELL 0x413c Dell +vendor AVERATEC 0x50c2 Averatec vendor ONSPEC2 0x55aa OnSpec Electronic Inc. vendor SITECOM 0x6189 Sitecom vendor INTEL 0x8086 Intel @@ -406,7 +426,7 @@ vendor HP2 0xf003 Hewlett Packard /* 3Com products */ product 3COM HOMECONN 0x009d HomeConnect USB Camera product 3COM 3CREB96 0x00a0 Bluetooth USB Adapter -product 3COM 3C19250 0x03E8 3C19250 Ethernet adapter +product 3COM 3C19250 0x03e8 3C19250 Ethernet adapter product 3COM USR56K 0x3021 U.S.Robotics 56000 Voice Faxmodem Pro product 3COM 3C460 0x11f8 HomeConnect 3C460 product 3COM 3C460B 0x4601 HomeConnect 3C460B @@ -431,6 +451,7 @@ product ABOCOM XX4 0x4004 XX4 product ABOCOM XX5 0x4007 XX5 product ABOCOM XX6 0x400b XX6 product ABOCOM XX7 0x400c XX7 +product ABOCOM LCS8138TX 0x401a LCS-8138TX product ABOCOM XX8 0x4102 XX8 product ABOCOM XX9 0x4104 XX9 product ABOCOM UFE2000 0x420a UFE2000 USB2.0 Fast Ethernet Adapter @@ -438,6 +459,7 @@ product ABOCOM XX10 0xabc1 XX10 /* Accton products */ product ACCTON USB320_EC 0x1046 USB320-EC Ethernet Adapter +product ACCTON 111 0x3503 T-Sinus 111 WLAN product ACCTON SS1001 0x5046 SpeedStream Ethernet Adapter /* Acer Peripherals, Inc. products */ @@ -453,6 +475,7 @@ product ACERW WARPLINK 0x0204 Warplink /* Actiontec products */ product ACTIONTEC PRISM_25 0x0408 Prism2.5 WLAN product ACTIONTEC PRISM_25A 0x0421 Prism2.5 WLAN A +product ACTIONTEC FREELAN 0x6106 ROPEX FreeLan 802.11b product ACTIONTEC UAT1 0x7605 UAT1 Wireless Ethernet adapter /* ACTiSYS products */ @@ -462,19 +485,23 @@ product ACTISYS IR2000U 0x0011 ACT-IR2000U FIR product ACTIVEWIRE IOBOARD 0x0100 I/O Board product ACTIVEWIRE IOBOARD_FW1 0x0101 I/O Board, rev. 1 firmware -/* AEI products */ -product AEI USBTOLAN 0x1701 AEI USB to Lan adapter +/* Adaptec products */ +product ADAPTEC AWN8020 0x0020 AWN-8020 WLAN /* Addonics products */ product ADDONICS2 205 0xa001 Cable 205 /* ADMtek products */ -product ADMTEK PEGASUS 0x0986 AN986 USB Ethernet adapter -product ADMTEK PEGASUSII 0x8511 AN8511 USB Ethernet adapter +product ADMTEK PEGASUS 0x0986 AN986 USB Ethernet +product ADMTEK PEGASUSII 0x8511 AN8511 USB Ethernet +product ADMTEK PEGASUSII_2 0x8513 AN8513 Ethernet /* ADS products */ -product ADS UBS10BT 0x0008 UBS-10BT Ethernet adapter -product ADS UBS10BTX 0x0009 UBS-10BT Ethernet adapter +product ADS UBS10BT 0x0008 UBS-10BT Ethernet +product ADS UBS10BTX 0x0009 UBS-10BT Ethernet + +/* AEI products */ +product AEI USBTOLAN 0x1701 AEI USB to Lan adapter /* Agate Technologies products */ product AGATE QDRIVE 0x0378 Q-Drive @@ -554,6 +581,9 @@ product AUDIOTECHNICA ATCHA4USB 0x0009 ATC-HA4USB USB headphone /* Avance Logic products */ product AVANCELOGIC USBAUDIO 0x0100 USB Audio Speaker +/* Averatec products */ +product AVERATEC USBWLAN 0x4013 WLAN + /* Avision products */ product AVISION 1200U 0x0268 1200U scanner @@ -562,9 +592,11 @@ product AVISION 1200U 0x0268 1200U scanner product BELKIN2 F5U002 0x0002 F5U002 Parallel printer adapter product BELKIN F5U103 0x0103 F5U103 Serial adapter product BELKIN F5U109 0x0109 F5U109 Serial adapter +product BELKIN F5U409 0x0409 F5U409 Serial product BELKIN SCSI 0x0115 SCSI Adaptor product BELKIN USB2LAN 0x0121 USB to LAN Converter product BELKIN F5U208 0x0208 F5U208 VideoBus II +product BELKIN F5U237 0x0237 F5U237 USB 2.0 7-Port Hub product BELKIN F5U120 0x1203 F5U120-PC Hub /* Billionton products */ @@ -624,10 +656,17 @@ product CHIC CYPRESS 0x0003 Cypress USB Mouse product CHICONY KB8933 0x0001 KB-8933 keyboard product CHICONY2 TWINKLECAM 0x600d TwinkleCam USB camera +/* CH Products */ +product CHPRODUCTS PROTHROTTLE 0x00f1 Pro Throttle +product CHPRODUCTS PROPEDALS 0x00f2 Pro Pedals +product CHPRODUCTS FIGHTERSTICK 0x00f3 Fighterstick +product CHPRODUCTS FLIGHTYOKE 0x00ff Flight Sim Yoke + /* Compaq products */ product COMPAQ IPAQPOCKETPC 0x0003 iPAQ PocketPC product COMPAQ A1500 0x0012 A1500 product COMPAQ W100 0x0033 W100 +product COMPAQ W200 0x0076 WLAN MultiPort W200 product COMPAQ PJB100 0x504a Personal Jukebox PJB100 product COMPAQ IPAQLINUX 0x505a iPAQ Linux product COMPAQ HNE200 0x8511 HNE-200 USB Ethernet adapter @@ -644,10 +683,16 @@ product COREGA FETHER_USB_TX 0x0004 FEther USB-TX product COREGA WLAN_USB_USB_11 0x000c WirelessLAN USB-11 product COREGA FETHER_USB_TXS 0x000d FEther USB-TXS product COREGA WLANUSB 0x0012 Wireless LAN USB Stick-11 +product COREGA FETHER_USB2_TX 0x0017 FEther USB2-TX +product COREGA WLUSB_11_KEY 0x001a ULUSB-11 Key product COREGA FETHER_USB_TXC 0x9601 FEther USB-TXC /* Creative products */ product CREATIVE NOMAD_II 0x1002 Nomad II MP3 player +product CREATIVE NOMAD_IIMG 0x4004 Nomad II MG +product CREATIVE NOMAD 0x4106 Nomad + +product CREATIVE2 VOIP_BLASTER 0x0258 Voip Blaster /* Cambridge Silicon Radio products */ product CSR BLUETOOTH 0x0001 Bluetooth USB Adapter @@ -671,9 +716,10 @@ product DALLAS J6502 0x4201 J-6502 speakers product DALLAS USB_FOB_IBUTTON 0x2490 USB-FOB/iBUTTON /* Dell products */ -product DELL BC02 0x8000 Dell BC02 Bluetooth USB Adapter product DELL X3 0x4002 Dell Axim X3 PDA product DELL X30 0x4003 Dell Axim X30 PDA +product DELL BC02 0x8000 Dell BC02 Bluetooth USB Adapter +product DELL TM1180 0x8100 TrueMobile 1180 WLAN /* Diamond products */ product DIAMOND RIO500USB 0x0001 Rio 500 USB @@ -690,6 +736,7 @@ product DIGITALSTREAM PS2 0x0001 PS/2 Active Adapter /*product DLINK DSBS25 0x0100 DSB-S25 serial adapter*/ product DLINK DUBE100 0x1a00 10/100 ethernet adapter product DLINK DSB650TX4 0x200c 10/100 ethernet adapter +product DLINK DWL122 0x3700 Wireless DWL122 product DLINK DSB650C 0x4000 10Mbps ethernet adapter product DLINK DSB650TX1 0x4001 10/100 ethernet adapter product DLINK DSB650TX 0x4002 10/100 ethernet adapter @@ -720,6 +767,7 @@ product ELECOM LDUSBTX1 0x4002 LD-USB/TX product ELECOM LDUSBLTX 0x4005 LD-USBL/TX product ELECOM LDUSBTX2 0x400b LD-USB/TX product ELECOM UCSGT 0x5003 UC-SGT serial adapter +product ELECOM UCSGT0 0x5004 UC-SGT0 Serial product ELECOM LDUSBTX3 0xabc1 LD-USB/TX /* Elsa products */ @@ -774,11 +822,16 @@ product EXTENDED XTNDACCESS 0x0100 XTNDAccess IrDA product FREECOM DVD 0xfc01 Connector for DVD drive /* Future Technology Devices products */ -product FTDI SERIAL_8U100AX 0x8372 8U100AX Serial converter product FTDI SERIAL_8U232AM 0x6001 8U232AM Serial converter +product FTDI PS2KBDMS 0x8371 PS/2 Keyboard/Mouse +product FTDI SERIAL_8U100AX 0x8372 8U100AX Serial converter product FTDI LCD_MX200_USB 0xfa01 Matrix Orbital MX200 Series LCD -product FTDI LCD_LK202_24_USB 0xfa03 Matrix Orbital LK202-24 USB LCD -product FTDI CFA_631 0xfc0c Crystalfontz CFA-631 USB LCD +product FTDI LCD_LK202_24_USB 0xfa03 Matrix Orbital LK202-24 LCD +product FTDI LCD_LK204_24 0xfa04 Matrix Orbital LK204-24 LCD +product FTDI LCD_CFA_632 0xfc08 Crystalfontz CFA-632 LCD +product FTDI LCD_CFA_634 0xfc09 Crystalfontz CFA-634 LCD +product FTDI LCD_CFA_633 0xfc0b Crystalfontz CFA-633 LCD +product FTDI CFA_631 0xfc0c Crystalfontz CFA-631 LCD product FTDI SEMC_DSS20 0xfc82 SEMC DSS-20 SyncStation /* Fuji photo products */ @@ -791,6 +844,7 @@ product FUJITSU AH_F401U 0x105b AH-F401U Air H device product GENERALINSTMNTS SB5100 0x5100 SURFboard SB5100 Cable modem /* Genesys Logic products */ +product GENESYS GENELINK 0x05e3 GeneLink Host-Host Bridge product GENESYS GL650 0x0604 GL650 Hub product GENESYS GL641USB 0x0700 GL641USB CompactFlash Card Reader product GENESYS GL641USB2IDE_2 0x0701 GL641USB USB-IDE Bridge @@ -809,6 +863,9 @@ product GREENHOUSE KANA21 0x0001 CF-writer with Portable MP3 Player product GRIFFIN IMATE 0x0405 iMate, ADB adapter product GRIFFIN POWERMATE 0x0410 PowerMate Assignable Controller +/* Guillemot Corporation */ +product GUILLEMOT DALEADER 0xa300 DA Leader + /* Hagiwara products */ product HAGIWARA FGSM 0x0002 FlashGate SmartMedia Card Reader product HAGIWARA FGCF 0x0003 FlashGate CompactFlash Card Reader @@ -877,11 +934,15 @@ product HP HN210E 0x811c Ethernet HN210E product HP2 C500 0x6002 PhotoSmart C500 /* IBM Corporation */ +product IBM OPTTRAVELMOUSE 0x3107 Optical product IBM USBCDROMDRIVE 0x4427 USB CD-ROM Drive /* Iiyama products */ product IIYAMA HUB 0x0201 Hub +/* Imation */ +product IMATION FLASHGO 0xb000 Flash Go! + /* Inside Out Networks products */ product INSIDEOUT EDGEPORT4 0x0001 EdgePort/4 RS232 product INSIDEOUT HUBPORT7 0x0002 Hubport/7 @@ -924,6 +985,10 @@ product INTEL TESTBOARD 0x9890 82930 test board /* Intersil products */ product INTERSIL PRISM_2X 0x3642 Prism2.x WLAN +/* Interpid Control Systems products */ +product INTREPIDCS VALUECAN 0x0601 ValueCAN +product INTREPIDCS NEOVI 0x0701 NeoVI Blue + /* I-O DATA products */ product IODATA IU_CD2 0x0204 DVD Multi-plus unit iU-CD2 product IODATA DVR_UEH8 0x0206 DVD Multi-plus unit DVR-UEH8 @@ -942,6 +1007,11 @@ product IOMEGA ZIP250 0x0030 Zip 250 product IOMEGA ZIP250_2 0x0032 Zip 250 product IOMEGA CDRW 0x0055 CDRW 9602 +/* iRiver products */ +product IRIVER IFP_1XX 0x1101 iFP-1xx +product IRIVER IFP_3XX 0x1103 iFP-3xx +product IRIVER IFP_5XX 0x1105 iFP-5xx + /* Jaton products */ product JATON EDA 0x5704 Ethernet Device Adapter @@ -954,6 +1024,9 @@ product JRC AH_J3001V_J3002V 0x0001 AirH\"PHONE AH-J3001V/J3002V /* JVC products */ product JVC GR_DX95 0x000a GR-DX95 +/* JVC products */ +product JVC MP_XP7250_WL 0x3009 MP-XP7250 Builtin WLAN + /* Kawasaki products */ product KLSI DUH3E10BT 0x0008 10BT Ethernet adapter, in the DU-H3E product KLSI DUH3E10BTN 0x0009 10BT Ethernet adapter, in the DU-H3E @@ -1023,6 +1096,9 @@ product KYE G07 0x1002 MaxFire G-07 gamepad product KYE FLIGHT2000 0x1004 Flight 2000 joystick product KYE VIVIDPRO 0x2001 ColorPage Vivid-Pro scanner +/* Kyocera products */ +product KYOCERA AHK3001V 0x0203 AH-K3001V + /* LaCie products */ product LACIE HD 0xa601 Hard Disk product LACIE CDRW 0xa602 CD R/W @@ -1073,11 +1149,11 @@ product LOGITECH BD58 0xc00c BD58 mouse product LOGITECH UN58A 0xc030 iFeel Mouse product LOGITECH WMRPAD 0xc20a WingMan RumblePad product LOGITECH WMFFGP 0xc293 WingMan Formula Force GP (GT-Force) -product LOGITECH BB13 0xc401 USB-PS/2 Trackball -product LOGITECH BB18 0xc404 TrackMan Wheel product LOGITECH WMPAD 0xc208 WingMan GamePad Extreme product LOGITECH WMRPAD 0xc20a WingMan RumblePad product LOGITECH WMJOY 0xc281 WingMan Force joystick +product LOGITECH BB13 0xc401 USB-PS/2 Trackball +product LOGITECH BB18 0xc404 TrackMan Wheel product LOGITECH RK53 0xc501 Cordless mouse product LOGITECH RB6 0xc503 Cordless keyboard product LOGITECH CDO 0xc504 Cordless Desktop Optical @@ -1110,6 +1186,7 @@ product MELCO MCRSM2 0x001b MCR-SM2 SmartMedia Card Reader/Writer product MELCO DUBPXXG 0x001c USB-IDE Bridge: DUB-PxxG product MELCO KS11G 0x0027 WLI-USB-KS11G USB-wlan product MELCO LUAU2KTX 0x003d LUA-U2-KTX Ethernet +product MELCO KB11 0x0044 WLI-USB-KB11 WLAN /* Metricom products */ product METRICOM RICOCHET_GS 0x0001 Ricochet GS @@ -1117,6 +1194,9 @@ product METRICOM RICOCHET_GS 0x0001 Ricochet GS /* Micro Star International products */ product MSI BLUETOOTH 0x1967 Bluetooth USB Adapter +/* Micronet Communications products */ +product MICRONET SP128AR 0x0003 SP128AR EtherFast + /* Microsoft products */ product MICROSOFT SIDEPREC 0x0008 SideWinder Precision Pro product MICROSOFT INTELLIMOUSE 0x0009 IntelliMouse @@ -1155,7 +1235,9 @@ product MINDSATWORK DW 0x0001 Digital Wallet product MINOLTA 2300 0x4001 Dimage 2300 product MINOLTA S304 0x4007 Dimage S304 product MINOLTA X 0x4009 Dimage X +product MINOLTA DIMAGE7I 0x400b Dimage 7i product MINOLTA 5400 0x400e Dimage 5400 +product MINOLTA DIMAGEA1 0x401a Dimage A1 product MINOLTA XT 0x4015 Dimage Xt /* Mitsumi products */ @@ -1257,6 +1339,8 @@ product ONSPEC LC1 0xa109 CF + SM Combo (LC1) product ONSPEC UCF100 0xa400 FlashLink UCF-100 CompactFlash Reader product ONSPEC MD1II 0xb006 Datafab MD1-II PC-Card Reader +product ONSPEC2 8IN2 0xb012 8In2 + /* Ours Technology Inc. */ product OTI SOLID 0x6803 Solid state disk product OTI FLASHDISK 0x6828 Flash Disk 128M @@ -1320,6 +1404,9 @@ product PIENGINEERING XKEYS 0x0233 Xkeys Programmable Keyboard /* Pilotech Systems Co., Ltd products */ product PILOTECH CRW600 0x0001 CRW-600 6-in-1 Reader +/* Planex Communications products */ +product PLANEX GW_US11H 0x14ea GW-US11H WLAN + /* Plantronics products */ product PLANTRONICS HEADSET 0x0ca1 Platronics DSP-400 Headset @@ -1367,6 +1454,7 @@ product PROLIFIC RSAQ2 0x04bb PL2303 Serial adapter (IODATA USB-RSAQ2) product PROLIFIC PL2303 0x2303 PL2303 Serial adapter (ATEN/IOGEAR UC232A) product PROLIFIC PL2305 0x2305 Parallel printer adapter product PROLIFIC ATAPI4 0x2307 ATAPI-4 Bridge Controller +product PROLIFIC PL2501 0x2501 PL2501 Host-Host interface /* Putercom products */ product PUTERCOM UPA100 0x047e USB-1284 BRIDGE @@ -1383,6 +1471,9 @@ product QUICKSHOT STRIKEPAD 0x6238 USB StrikePad /* Rainbow Technologies products */ product RAINBOW IKEY2000 0x1200 i-Key 2000 +/* RATOC Systems products */ +product RATOC REXUSB60 0xb000 USB serial REX-USB60 + /* Realtek products */ product REALTEK RTL8150L 0x8150 Realtek RTL8150L USB-Ethernet Bridge @@ -1447,6 +1538,13 @@ product SGI SN1_L1_SC 0x1234 SN1 L1 System Controller /* Shark products */ product SHARK PA 0x0400 Pocket Adapter +/* Sharp products */ +product SHARP SL5500 0x8004 SL5500 +product SHARP A300 0x8005 A300 +product SHARP SL5600 0x8006 SL5600 +product SHARP C700 0x8007 C700 +product SHARP C750 0x9031 C750 + /* Shuttle Technology products */ product SHUTTLE EUSB 0x0001 E-USB Bridge product SHUTTLE EUSCSI 0x0002 eUSCSI Bridge @@ -1476,6 +1574,11 @@ product SIIG DIGIFILMREADER 0x0004 DigiFilm-Combo Reader product SIIG UISDMC2S 0x0200 MULTICARDREADER product SIIG MULTICARDREADER 0x0201 MULTICARDREADER +product SIIG2 US2308 0x0421 Serial + +/* Silicom products */ +product SILICOM U2E 0x0001 U2E + /* Silicon Portals Inc. */ product SILICONPORTALS YAPPH_NF 0x0200 YAP Phone (no firmware) product SILICONPORTALS YAPPHONE 0x0201 YAP Phone @@ -1484,7 +1587,8 @@ product SILICONPORTALS YAPPHONE 0x0201 YAP Phone product SIRIUS ROADSTER 0x0001 NetComm Roadster II 56 USB /* Sitecom products */ -product SITECOM SERIAL 0x2068 USB to serial cable +product SITECOM LN029 0x182d LN029 +product SITECOM CN104 0x2068 CN104 serial /* SmartBridges products */ product SMARTBRIDGES SMARTLINK 0x0001 SmartLink USB ethernet adapter @@ -1521,10 +1625,8 @@ product SONY CLIE_S360 0x0095 Sony Clie s360 product SONY CLIE_41_MS 0x0099 Sony Clie v4.1 Memory Stick slot product SONY CLIE_41 0x009a Sony Clie v4.1 product SONY CLIE_NX60 0x00da Sony Clie nx60 +product SONY CLIE_TJ25 0x0169 Sony Clie tj25 -/* Sony Ericsson products */ -product SONYERICSSON DCU10 0x0528 USB Cable - /* SOURCENEXT products */ product SOURCENEXT KEIKAI8 0x039f KeikaiDenwa 8 product SOURCENEXT KEIKAI8_CHG 0x012e KeikaiDenwa 8 with charger @@ -1544,12 +1646,19 @@ product SUNTAC PS64P1 0x0005 SUNTAC U-Cable type P1 product SUNTAC VS10U 0x0009 SUNTAC Slipper U product SUNTAC IS96U 0x000a SUNTAC Ir-Trinity product SUNTAC AS64LX 0x000b SUNTAC U-Cable type A3 +product SUNTAC AS144L4 0x0011 U-Cable type A4 /* Sun Microsystems products */ product SUN KEYBOARD 0x0005 Type 6 USB keyboard /* XXX The above is a North American PC style keyboard possibly */ product SUN MOUSE 0x0100 Type 6 USB mouse +/* Susteen products */ +product SUSTEEN DCU10 0x0528 USB Cable + +/* System TALKS, Inc. */ +product SYSTEMTALKS SGCX2UL 0x1920 SGC-X2UL + /* Supra products */ product DIAMOND2 SUPRAEXPRESS56K 0x07da Supra Express 56K modem product DIAMOND2 SUPRA2890 0x0b4a SupraMax 2890 56K Modem @@ -1573,6 +1682,10 @@ product TDK BT_DONGLE 0x0309 Bluetooth USB dongle /* TEAC products */ product TEAC FD05PUB 0x0000 FD-05PUB floppy +/* Tekram Technology products */ +product TEKRAM 0193 0x1601 ALLNET 0193 WLAN +product TEKRAM ZYAIR_B200 0x1602 ZyXEL ZyAIR B200 WLAN + /* Telex Communications products */ product TELEX MIC1 0x0001 Enhanced USB Microphone @@ -1601,6 +1714,9 @@ product TRIPPLITE U209 0x2008 U209 Serial adapter product TRUMPION T33521 0x1003 USB/MP3 decoder product TRUMPION XXX1100 0x1100 XXX 1100 +/* Tsunami products */ +product TSUNAMI SM2000 0x1111 SM-2000 + /* Ultima products */ product ULTIMA 1200UBPLUS 0x4002 1200 UB Plus scanner @@ -1615,9 +1731,17 @@ product UMAX ASTRA3400 0x0060 Astra 3400 Scanner /* Universal Access products */ product UNIACCESS PANACHE 0x0101 Panache Surf USB ISDN Adapter +/* U.S. Robotics products */ +product USR USR1120 0x00eb USR1120 WLAN + /* VidzMedia products */ product VIDZMEDIA MONSTERTV 0x4fb1 MonsterTV P2H +/* ViewSonic products */ +product VIEWSONIC G773HUB 0x00fe G773 Monitor Hub +product VIEWSONIC P815HUB 0x00ff P815 Monitor Hub +product VIEWSONIC G773CTRL 0x4153 G773 Monitor Control + /* Vision products */ product VISION VC6452V002 0x0002 CPiA Camera @@ -1673,6 +1797,9 @@ product YANO U640MO 0x0101 U640MO-03 /* Zeevo, Inc. products */ product ZEEVO BLUETOOTH 0x07d0 BT-500 Bluetooth USB Adapter +/* Z-Com products */ +product ZCOM 725 0x0002 725/726 Prism2.5 WLAN + /* 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 93dc11ee6168..fec081a64302 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -1,4 +1,4 @@ -/* $FreeBSD$ */ +/* $NetBSD: usbdevs.h,v 1.384 2004/10/22 09:34:55 augustss Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -75,11 +75,11 @@ #define USB_VENDOR_NEC 0x0409 /* NEC */ #define USB_VENDOR_KODAK 0x040a /* Eastman Kodak */ #define USB_VENDOR_MELCO 0x0411 /* Melco */ -#define USB_VENDOR_CREATIVE 0x041e /* Creative */ +#define USB_VENDOR_CREATIVE 0x041e /* Creative Labs */ #define USB_VENDOR_ADI 0x0422 /* ADI Systems */ #define USB_VENDOR_CATC 0x0423 /* Computer Access Technology */ #define USB_VENDOR_SMC2 0x0424 /* Standard Microsystems */ -#define USB_VENDOR_GRAVIS 0x0428 /* Advanced Gravis Computer Tech. */ +#define USB_VENDOR_GRAVIS 0x0428 /* Advanced Gravis Computer */ #define USB_VENDOR_SUN 0x0430 /* Sun Microsystems */ #define USB_VENDOR_TAUGA 0x0436 /* Taugagreining HF */ #define USB_VENDOR_AMD 0x0438 /* Advanced Micro Devices */ @@ -104,15 +104,16 @@ #define USB_VENDOR_KENSINGTON 0x047d /* Kensington */ #define USB_VENDOR_LUCENT 0x047e /* Lucent */ #define USB_VENDOR_PLANTRONICS 0x047f /* Plantronics */ +#define USB_VENDOR_KYOCERA 0x0482 /* Kyocera */ #define USB_VENDOR_STMICRO 0x0483 /* STMicroelectronics */ #define USB_VENDOR_YAMAHA 0x0499 /* YAMAHA */ -#define USB_VENDOR_COMPAQ 0x049f /* Compaq Computers */ +#define USB_VENDOR_COMPAQ 0x049f /* Compaq */ #define USB_VENDOR_HITACHI 0x04a4 /* Hitachi */ #define USB_VENDOR_ACERP 0x04a5 /* Acer Peripherals */ #define USB_VENDOR_VISIONEER 0x04a7 /* Visioneer */ #define USB_VENDOR_CANON 0x04a9 /* Canon */ #define USB_VENDOR_NIKON 0x04b0 /* Nikon */ -#define USB_VENDOR_IBM 0x04b3 /* IBM Corporation */ +#define USB_VENDOR_IBM 0x04b3 /* IBM */ #define USB_VENDOR_CYPRESS 0x04b4 /* Cypress Semiconductor */ #define USB_VENDOR_EPSON 0x04b8 /* Seiko Epson */ #define USB_VENDOR_RAINBOW 0x04b9 /* Rainbow Technologies */ @@ -123,7 +124,7 @@ #define USB_VENDOR_MAXISWITCH 0x04c3 /* Maxi Switch */ #define USB_VENDOR_LOCKHEEDMER 0x04c4 /* Lockheed Martin Energy Research */ #define USB_VENDOR_FUJITSU 0x04c5 /* Fujitsu */ -#define USB_VENDOR_TOSHIBAAM 0x04c6 /* Toshiba America Electronic Components */ +#define USB_VENDOR_TOSHIBAAM 0x04c6 /* Toshiba America */ #define USB_VENDOR_MICROMACRO 0x04c7 /* Micro Macro Technologies */ #define USB_VENDOR_KONICA 0x04c8 /* Konica */ #define USB_VENDOR_LITEON 0x04ca /* Lite-On Technology */ @@ -132,10 +133,11 @@ #define USB_VENDOR_TATUNG 0x04cd /* Tatung Co. Of America */ #define USB_VENDOR_SCANLOGIC 0x04ce /* ScanLogic */ #define USB_VENDOR_MYSON 0x04cf /* Myson Technology */ -#define USB_VENDOR_DIGI2 0x04d0 /* Digi International */ +#define USB_VENDOR_DIGI2 0x04d0 /* Digi */ #define USB_VENDOR_ITTCANON 0x04d1 /* ITT Canon */ -#define USB_VENDOR_ALTEC 0x04d2 /* Altec Lansing Technologies */ +#define USB_VENDOR_ALTEC 0x04d2 /* Altec Lansing */ #define USB_VENDOR_PANASONIC 0x04da /* Panasonic (Matsushita) */ +#define USB_VENDOR_SHARP 0x04dd /* Sharp */ #define USB_VENDOR_IIYAMA 0x04e1 /* Iiyama */ #define USB_VENDOR_SHUTTLE 0x04e6 /* Shuttle Technology */ #define USB_VENDOR_SAMSUNG 0x04e8 /* Samsung Electronics */ @@ -157,6 +159,7 @@ #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_VIEWSONIC 0x0543 /* ViewSonic */ #define USB_VENDOR_XIRLINK 0x0545 /* Xirlink */ #define USB_VENDOR_ANCHOR 0x0547 /* Anchor Chips */ #define USB_VENDOR_SONY 0x054c /* Sony */ @@ -174,11 +177,11 @@ #define USB_VENDOR_HAUPPAUGE 0x0573 /* Hauppauge Computer Works */ #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_ROLAND 0x0582 /* Roland */ #define USB_VENDOR_ROCKFIRE 0x0583 /* Rockfire */ -#define USB_VENDOR_RATOC 0x0584 /* RATOC Systems, Inc. */ +#define USB_VENDOR_RATOC 0x0584 /* RATOC Systems */ #define USB_VENDOR_ZYXEL 0x0586 /* ZyXEL Communication */ #define USB_VENDOR_ALCOR 0x058f /* Alcor Micro */ #define USB_VENDOR_IOMEGA 0x059b /* Iomega */ @@ -231,6 +234,7 @@ #define USB_VENDOR_AVANCELOGIC 0x0680 /* Avance Logic */ #define USB_VENDOR_HAGIWARA 0x0693 /* Hagiwara Sys-Com */ #define USB_VENDOR_MINOLTA 0x0686 /* Minolta */ +#define USB_VENDOR_CHPRODUCTS 0x068e /* CH Products */ #define USB_VENDOR_CTX 0x0698 /* Chuntex */ #define USB_VENDOR_ASKEY 0x069a /* Askey Computer */ #define USB_VENDOR_SAITEK 0x06a3 /* Saitek */ @@ -244,18 +248,20 @@ #define USB_VENDOR_ADS 0x06e1 /* ADS Technologies */ #define USB_VENDOR_ALCATELM 0x06e4 /* Alcatel Microelectronics */ #define USB_VENDOR_SIRIUS 0x06ea /* Sirius Technologies */ +#define USB_VENDOR_GUILLEMOT 0x06f8 /* Guillemot */ #define USB_VENDOR_BOSTON 0x06fd /* Boston Acoustics */ #define USB_VENDOR_SMC 0x0707 /* Standard Microsystems */ #define USB_VENDOR_PUTERCOM 0x0708 /* Putercom */ #define USB_VENDOR_MCT 0x0711 /* MCT */ -#define USB_VENDOR_SONYERICSSON 0x0731 /* Sony Ericsson */ +#define USB_VENDOR_IMATION 0x0718 /* Imation */ +#define USB_VENDOR_SUSTEEN 0x0731 /* Susteen */ #define USB_VENDOR_EICON 0x0734 /* Eicon Networks */ #define USB_VENDOR_DIGITALSTREAM 0x074e /* Digital Stream */ #define USB_VENDOR_AUREAL 0x0755 /* Aureal Semiconductor */ #define USB_VENDOR_MIDIMAN 0x0763 /* Midiman */ #define USB_VENDOR_LINKSYS2 0x077b /* Linksys */ #define USB_VENDOR_GRIFFIN 0x077d /* Griffin Technology */ -#define USB_VENDOR_SANDISK 0x0781 /* SanDisk Corp */ +#define USB_VENDOR_SANDISK 0x0781 /* SanDisk */ #define USB_VENDOR_JENOPTIK 0x0784 /* Jenoptik */ #define USB_VENDOR_BRIMAX 0x078e /* Brimax */ #define USB_VENDOR_AXIS 0x0792 /* Axis Communications */ @@ -274,7 +280,7 @@ #define USB_VENDOR_OLYMPUS 0x07b4 /* Olympus */ #define USB_VENDOR_ABOCOM 0x07b8 /* AboCom Systems */ #define USB_VENDOR_KEISOKUGIKEN 0x07c1 /* Keisokugiken */ -#define USB_VENDOR_ONSPEC 0x07c4 /* OnSpec Electronic, Inc. */ +#define USB_VENDOR_ONSPEC 0x07c4 /* OnSpec */ #define USB_VENDOR_APG 0x07c5 /* APG Cash Drawer */ #define USB_VENDOR_BUG 0x07c8 /* B.U.G. */ #define USB_VENDOR_ALLIEDTELESYN 0x07c9 /* Allied Telesyn International */ @@ -296,6 +302,7 @@ #define USB_VENDOR_NETGEAR 0x0846 /* BayNETGEAR */ #define USB_VENDOR_ACTIVEWIRE 0x0854 /* ActiveWire */ #define USB_VENDOR_PORTGEAR 0x085a /* PortGear */ +#define USB_VENDOR_SYSTEMTALKS 0x086e /* System Talks */ #define USB_VENDOR_METRICOM 0x0870 /* Metricom */ #define USB_VENDOR_ADESSOKBTEK 0x087c /* ADESSO/Kbtek America */ #define USB_VENDOR_JATON 0x087d /* Jaton */ @@ -316,8 +323,9 @@ #define USB_VENDOR_CONCORDCAMERA 0x0919 /* Concord Camera */ #define USB_VENDOR_GOHUBS 0x0921 /* GoHubs */ #define USB_VENDOR_BIOMETRIC 0x0929 /* American Biometric Company */ -#define USB_VENDOR_TOSHIBA 0x0930 /* Toshiba Corporation */ +#define USB_VENDOR_TOSHIBA 0x0930 /* Toshiba */ #define USB_VENDOR_PLEXTOR 0x093b /* Plextor */ +#define USB_VENDOR_INTREPIDCS 0x093c /* Intrepid */ #define USB_VENDOR_YANO 0x094f /* Yano */ #define USB_VENDOR_KINGSTON 0x0951 /* Kingston Technology */ #define USB_VENDOR_BLUEWATER 0x0956 /* BlueWater Systems */ @@ -349,6 +357,8 @@ #define USB_VENDOR_GEOCAST 0x0a79 /* Geocast Network Systems */ #define USB_VENDOR_NEODIO 0x0aec /* Neodio */ #define USB_VENDOR_TODOS 0x0b0c /* Todos Data System */ +#define USB_VENDOR_SIIG2 0x0b39 /* SIIG */ +#define USB_VENDOR_TEKRAM 0x0b3b /* Tekram Technology */ #define USB_VENDOR_HAL 0x0b41 /* HAL Corporation */ #define USB_VENDOR_EMS 0x0b43 /* EMS Production */ #define USB_VENDOR_NEC2 0x0b62 /* NEC */ @@ -356,21 +366,24 @@ #define USB_VENDOR_ZEEVO 0x0b7a /* Zeevo, Inc. */ #define USB_VENDOR_KURUSUGAWA 0x0b7e /* Kurusugawa Electronics, Inc. */ #define USB_VENDOR_ASIX 0x0b95 /* ASIX Electronics */ +#define USB_VENDOR_USR 0x0baf /* U.S. Robotics */ #define USB_VENDOR_REALTEK 0x0bda /* Realtek */ #define USB_VENDOR_ADDONICS2 0x0bf6 /* Addonics Technology */ #define USB_VENDOR_AGATE 0x0c08 /* Agate Technologies */ #define USB_VENDOR_DMI 0x0c0b /* DMI */ #define USB_VENDOR_CHICONY2 0x0c45 /* Chicony Electronics */ #define USB_VENDOR_LUWEN 0x0c76 /* EasyDisk */ +#define USB_VENDOR_ZCOM 0x0cde /* Z-Com */ #define USB_VENDOR_TANGTOP 0x0d3d /* Tangtop */ #define USB_VENDOR_SMC3 0x0d5c /* Standard Microsystems */ #define USB_VENDOR_PEN 0x0d7d /* Pen Drive */ #define USB_VENDOR_ACDC 0x0d7e /* American Computer & Digital Components */ -#define USB_VENDOR_MSI 0x0db0 /* Micro Star International */ -#define USB_VENDOR_HAWKING 0x0e66 /* Hawking Technologies */ -#define USB_VENDOR_OTI 0x0ea0 /* Ours Technology Inc. */ +#define USB_VENDOR_ABC 0x0d8c /* ABC */ +#define USB_VENDOR_MSI 0x0db0 /* Micro Star */ +#define USB_VENDOR_HAWKING 0x0e66 /* Hawking */ +#define USB_VENDOR_OTI 0x0ea0 /* Ours Technology */ #define USB_VENDOR_PILOTECH 0x0eaf /* Pilotech */ -#define USB_VENDOR_EGALAX 0x0eef /* eGalax, Inc. */ +#define USB_VENDOR_EGALAX 0x0eef /* eGalax */ #define USB_VENDOR_QUALCOMM 0x1004 /* Qualcomm */ #define USB_VENDOR_MOTOROLA 0x1063 /* Motorola */ #define USB_VENDOR_CCYU 0x1065 /* CCYU Technology */ @@ -379,9 +392,12 @@ #define USB_VENDOR_JRC 0x1145 /* Japan Radio Company */ #define USB_VENDOR_SERVERWORKS 0x1166 /* ServerWorks */ #define USB_VENDOR_ACERCM 0x1189 /* Acer Communications & Multimedia */ +#define USB_VENDOR_TSUNAMI 0x1241 /* Tsunami */ +#define USB_VENDOR_CREATIVE2 0x1292 /* Creative Labs */ #define USB_VENDOR_BELKIN2 0x1293 /* Belkin Components */ #define USB_VENDOR_MOBILITY 0x1342 /* Mobility */ #define USB_VENDOR_SHARK 0x13d2 /* Shark */ +#define USB_VENDOR_SILICOM 0x1485 /* Silicom */ #define USB_VENDOR_SILICONPORTALS 0x1527 /* Silicon Portals */ #define USB_VENDOR_SOHOWARE 0x15e8 /* SOHOware */ #define USB_VENDOR_UMAX 0x1606 /* UMAX Data Systems */ @@ -394,13 +410,17 @@ #define USB_VENDOR_TRIPPLITE 0x2478 /* Tripp-Lite */ #define USB_VENDOR_HIROSE 0x2631 /* Hirose Electric */ #define USB_VENDOR_NHJ 0x2770 /* NHJ */ +#define USB_VENDOR_PLANEX 0x2c02 /* Planex Communications */ #define USB_VENDOR_VIDZMEDIA 0x3275 /* VidzMedia Pte Ltd */ #define USB_VENDOR_AEI 0x3334 /* AEI */ #define USB_VENDOR_PQI 0x3538 /* PQI */ #define USB_VENDOR_DAISY 0x3579 /* Daisy Technology */ #define USB_VENDOR_NI 0x3923 /* National Instruments */ +#define USB_VENDOR_MICRONET 0x3980 /* Micronet Communications */ #define USB_VENDOR_IODATA2 0x40bb /* I-O Data */ +#define USB_VENDOR_IRIVER 0x4102 /* iRiver */ #define USB_VENDOR_DELL 0x413c /* Dell */ +#define USB_VENDOR_AVERATEC 0x50c2 /* Averatec */ #define USB_VENDOR_ONSPEC2 0x55aa /* OnSpec Electronic Inc. */ #define USB_VENDOR_SITECOM 0x6189 /* Sitecom */ #define USB_VENDOR_INTEL 0x8086 /* Intel */ @@ -413,7 +433,7 @@ /* 3Com products */ #define USB_PRODUCT_3COM_HOMECONN 0x009d /* HomeConnect USB Camera */ #define USB_PRODUCT_3COM_3CREB96 0x00a0 /* Bluetooth USB Adapter */ -#define USB_PRODUCT_3COM_3C19250 0x03E8 /* 3C19250 Ethernet adapter */ +#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 3C460 */ #define USB_PRODUCT_3COM_3C460B 0x4601 /* HomeConnect 3C460B */ @@ -438,6 +458,7 @@ #define USB_PRODUCT_ABOCOM_XX5 0x4007 /* XX5 */ #define USB_PRODUCT_ABOCOM_XX6 0x400b /* XX6 */ #define USB_PRODUCT_ABOCOM_XX7 0x400c /* XX7 */ +#define USB_PRODUCT_ABOCOM_LCS8138TX 0x401a /* LCS-8138TX */ #define USB_PRODUCT_ABOCOM_XX8 0x4102 /* XX8 */ #define USB_PRODUCT_ABOCOM_XX9 0x4104 /* XX9 */ #define USB_PRODUCT_ABOCOM_UFE2000 0x420a /* UFE2000 USB2.0 Fast Ethernet Adapter */ @@ -445,6 +466,7 @@ /* Accton products */ #define USB_PRODUCT_ACCTON_USB320_EC 0x1046 /* USB320-EC Ethernet Adapter */ +#define USB_PRODUCT_ACCTON_111 0x3503 /* T-Sinus 111 WLAN */ #define USB_PRODUCT_ACCTON_SS1001 0x5046 /* SpeedStream Ethernet Adapter */ /* Acer Peripherals, Inc. products */ @@ -460,6 +482,7 @@ /* Actiontec products */ #define USB_PRODUCT_ACTIONTEC_PRISM_25 0x0408 /* Prism2.5 WLAN */ #define USB_PRODUCT_ACTIONTEC_PRISM_25A 0x0421 /* Prism2.5 WLAN A */ +#define USB_PRODUCT_ACTIONTEC_FREELAN 0x6106 /* ROPEX FreeLan 802.11b */ #define USB_PRODUCT_ACTIONTEC_UAT1 0x7605 /* UAT1 Wireless Ethernet adapter */ /* ACTiSYS products */ @@ -469,19 +492,23 @@ #define USB_PRODUCT_ACTIVEWIRE_IOBOARD 0x0100 /* I/O Board */ #define USB_PRODUCT_ACTIVEWIRE_IOBOARD_FW1 0x0101 /* I/O Board, rev. 1 firmware */ -/* AEI products */ -#define USB_PRODUCT_AEI_USBTOLAN 0x1701 /* AEI USB to Lan adapter */ +/* Adaptec products */ +#define USB_PRODUCT_ADAPTEC_AWN8020 0x0020 /* AWN-8020 WLAN */ /* Addonics products */ #define USB_PRODUCT_ADDONICS2_205 0xa001 /* Cable 205 */ /* ADMtek products */ -#define USB_PRODUCT_ADMTEK_PEGASUS 0x0986 /* AN986 USB Ethernet adapter */ -#define USB_PRODUCT_ADMTEK_PEGASUSII 0x8511 /* AN8511 USB Ethernet adapter */ +#define USB_PRODUCT_ADMTEK_PEGASUS 0x0986 /* AN986 USB Ethernet */ +#define USB_PRODUCT_ADMTEK_PEGASUSII 0x8511 /* AN8511 USB Ethernet */ +#define USB_PRODUCT_ADMTEK_PEGASUSII_2 0x8513 /* AN8513 Ethernet */ /* ADS products */ -#define USB_PRODUCT_ADS_UBS10BT 0x0008 /* UBS-10BT Ethernet adapter */ -#define USB_PRODUCT_ADS_UBS10BTX 0x0009 /* UBS-10BT Ethernet adapter */ +#define USB_PRODUCT_ADS_UBS10BT 0x0008 /* UBS-10BT Ethernet */ +#define USB_PRODUCT_ADS_UBS10BTX 0x0009 /* UBS-10BT Ethernet */ + +/* AEI products */ +#define USB_PRODUCT_AEI_USBTOLAN 0x1701 /* AEI USB to Lan adapter */ /* Agate Technologies products */ #define USB_PRODUCT_AGATE_QDRIVE 0x0378 /* Q-Drive */ @@ -561,6 +588,9 @@ /* Avance Logic products */ #define USB_PRODUCT_AVANCELOGIC_USBAUDIO 0x0100 /* USB Audio Speaker */ +/* Averatec products */ +#define USB_PRODUCT_AVERATEC_USBWLAN 0x4013 /* WLAN */ + /* Avision products */ #define USB_PRODUCT_AVISION_1200U 0x0268 /* 1200U scanner */ @@ -569,9 +599,11 @@ #define USB_PRODUCT_BELKIN2_F5U002 0x0002 /* F5U002 Parallel printer adapter */ #define USB_PRODUCT_BELKIN_F5U103 0x0103 /* F5U103 Serial adapter */ #define USB_PRODUCT_BELKIN_F5U109 0x0109 /* F5U109 Serial adapter */ +#define USB_PRODUCT_BELKIN_F5U409 0x0409 /* F5U409 Serial */ #define USB_PRODUCT_BELKIN_SCSI 0x0115 /* SCSI Adaptor */ #define USB_PRODUCT_BELKIN_USB2LAN 0x0121 /* USB to LAN Converter */ #define USB_PRODUCT_BELKIN_F5U208 0x0208 /* F5U208 VideoBus II */ +#define USB_PRODUCT_BELKIN_F5U237 0x0237 /* F5U237 USB 2.0 7-Port Hub */ #define USB_PRODUCT_BELKIN_F5U120 0x1203 /* F5U120-PC Hub */ /* Billionton products */ @@ -631,10 +663,17 @@ #define USB_PRODUCT_CHICONY_KB8933 0x0001 /* KB-8933 keyboard */ #define USB_PRODUCT_CHICONY2_TWINKLECAM 0x600d /* TwinkleCam USB camera */ +/* CH Products */ +#define USB_PRODUCT_CHPRODUCTS_PROTHROTTLE 0x00f1 /* Pro Throttle */ +#define USB_PRODUCT_CHPRODUCTS_PROPEDALS 0x00f2 /* Pro Pedals */ +#define USB_PRODUCT_CHPRODUCTS_FIGHTERSTICK 0x00f3 /* Fighterstick */ +#define USB_PRODUCT_CHPRODUCTS_FLIGHTYOKE 0x00ff /* Flight Sim Yoke */ + /* Compaq products */ #define USB_PRODUCT_COMPAQ_IPAQPOCKETPC 0x0003 /* iPAQ PocketPC */ #define USB_PRODUCT_COMPAQ_A1500 0x0012 /* A1500 */ #define USB_PRODUCT_COMPAQ_W100 0x0033 /* W100 */ +#define USB_PRODUCT_COMPAQ_W200 0x0076 /* WLAN MultiPort W200 */ #define USB_PRODUCT_COMPAQ_PJB100 0x504a /* Personal Jukebox PJB100 */ #define USB_PRODUCT_COMPAQ_IPAQLINUX 0x505a /* iPAQ Linux */ #define USB_PRODUCT_COMPAQ_HNE200 0x8511 /* HNE-200 USB Ethernet adapter */ @@ -651,10 +690,16 @@ #define USB_PRODUCT_COREGA_WLAN_USB_USB_11 0x000c /* WirelessLAN USB-11 */ #define USB_PRODUCT_COREGA_FETHER_USB_TXS 0x000d /* FEther USB-TXS */ #define USB_PRODUCT_COREGA_WLANUSB 0x0012 /* Wireless LAN USB Stick-11 */ +#define USB_PRODUCT_COREGA_FETHER_USB2_TX 0x0017 /* FEther USB2-TX */ +#define USB_PRODUCT_COREGA_WLUSB_11_KEY 0x001a /* ULUSB-11 Key */ #define USB_PRODUCT_COREGA_FETHER_USB_TXC 0x9601 /* FEther USB-TXC */ /* Creative products */ #define USB_PRODUCT_CREATIVE_NOMAD_II 0x1002 /* Nomad II MP3 player */ +#define USB_PRODUCT_CREATIVE_NOMAD_IIMG 0x4004 /* Nomad II MG */ +#define USB_PRODUCT_CREATIVE_NOMAD 0x4106 /* Nomad */ + +#define USB_PRODUCT_CREATIVE2_VOIP_BLASTER 0x0258 /* Voip Blaster */ /* Cambridge Silicon Radio products */ #define USB_PRODUCT_CSR_BLUETOOTH 0x0001 /* Bluetooth USB Adapter */ @@ -678,9 +723,10 @@ #define USB_PRODUCT_DALLAS_USB_FOB_IBUTTON 0x2490 /* USB-FOB/iBUTTON */ /* Dell products */ -#define USB_PRODUCT_DELL_BC02 0x8000 /* Dell BC02 Bluetooth USB Adapter */ #define USB_PRODUCT_DELL_X3 0x4002 /* Dell Axim X3 PDA */ #define USB_PRODUCT_DELL_X30 0x4003 /* Dell Axim X30 PDA */ +#define USB_PRODUCT_DELL_BC02 0x8000 /* Dell BC02 Bluetooth USB Adapter */ +#define USB_PRODUCT_DELL_TM1180 0x8100 /* TrueMobile 1180 WLAN */ /* Diamond products */ #define USB_PRODUCT_DIAMOND_RIO500USB 0x0001 /* Rio 500 USB */ @@ -697,6 +743,7 @@ /*product DLINK DSBS25 0x0100 DSB-S25 serial adapter*/ #define USB_PRODUCT_DLINK_DUBE100 0x1a00 /* 10/100 ethernet adapter */ #define USB_PRODUCT_DLINK_DSB650TX4 0x200c /* 10/100 ethernet adapter */ +#define USB_PRODUCT_DLINK_DWL122 0x3700 /* Wireless DWL122 */ #define USB_PRODUCT_DLINK_DSB650C 0x4000 /* 10Mbps ethernet adapter */ #define USB_PRODUCT_DLINK_DSB650TX1 0x4001 /* 10/100 ethernet adapter */ #define USB_PRODUCT_DLINK_DSB650TX 0x4002 /* 10/100 ethernet adapter */ @@ -727,6 +774,7 @@ #define USB_PRODUCT_ELECOM_LDUSBLTX 0x4005 /* LD-USBL/TX */ #define USB_PRODUCT_ELECOM_LDUSBTX2 0x400b /* LD-USB/TX */ #define USB_PRODUCT_ELECOM_UCSGT 0x5003 /* UC-SGT serial adapter */ +#define USB_PRODUCT_ELECOM_UCSGT0 0x5004 /* UC-SGT0 Serial */ #define USB_PRODUCT_ELECOM_LDUSBTX3 0xabc1 /* LD-USB/TX */ /* Elsa products */ @@ -781,11 +829,16 @@ #define USB_PRODUCT_FREECOM_DVD 0xfc01 /* Connector for DVD drive */ /* Future Technology Devices products */ -#define USB_PRODUCT_FTDI_SERIAL_8U100AX 0x8372 /* 8U100AX Serial converter */ #define USB_PRODUCT_FTDI_SERIAL_8U232AM 0x6001 /* 8U232AM Serial converter */ +#define USB_PRODUCT_FTDI_PS2KBDMS 0x8371 /* PS/2 Keyboard/Mouse */ +#define USB_PRODUCT_FTDI_SERIAL_8U100AX 0x8372 /* 8U100AX Serial converter */ #define USB_PRODUCT_FTDI_LCD_MX200_USB 0xfa01 /* Matrix Orbital MX200 Series LCD */ -#define USB_PRODUCT_FTDI_LCD_LK202_24_USB 0xfa03 /* Matrix Orbital LK202-24 USB LCD */ -#define USB_PRODUCT_FTDI_CFA_631 0xfc0c /* Crystalfontz CFA-631 USB LCD */ +#define USB_PRODUCT_FTDI_LCD_LK202_24_USB 0xfa03 /* Matrix Orbital LK202-24 LCD */ +#define USB_PRODUCT_FTDI_LCD_LK204_24 0xfa04 /* Matrix Orbital LK204-24 LCD */ +#define USB_PRODUCT_FTDI_LCD_CFA_632 0xfc08 /* Crystalfontz CFA-632 LCD */ +#define USB_PRODUCT_FTDI_LCD_CFA_634 0xfc09 /* Crystalfontz CFA-634 LCD */ +#define USB_PRODUCT_FTDI_LCD_CFA_633 0xfc0b /* Crystalfontz CFA-633 LCD */ +#define USB_PRODUCT_FTDI_CFA_631 0xfc0c /* Crystalfontz CFA-631 LCD */ #define USB_PRODUCT_FTDI_SEMC_DSS20 0xfc82 /* SEMC DSS-20 SyncStation */ /* Fuji photo products */ @@ -798,6 +851,7 @@ #define USB_PRODUCT_GENERALINSTMNTS_SB5100 0x5100 /* SURFboard SB5100 Cable modem */ /* Genesys Logic products */ +#define USB_PRODUCT_GENESYS_GENELINK 0x05e3 /* GeneLink Host-Host Bridge */ #define USB_PRODUCT_GENESYS_GL650 0x0604 /* GL650 Hub */ #define USB_PRODUCT_GENESYS_GL641USB 0x0700 /* GL641USB CompactFlash Card Reader */ #define USB_PRODUCT_GENESYS_GL641USB2IDE_2 0x0701 /* GL641USB USB-IDE Bridge */ @@ -816,6 +870,9 @@ #define USB_PRODUCT_GRIFFIN_IMATE 0x0405 /* iMate, ADB adapter */ #define USB_PRODUCT_GRIFFIN_POWERMATE 0x0410 /* PowerMate Assignable Controller */ +/* Guillemot Corporation */ +#define USB_PRODUCT_GUILLEMOT_DALEADER 0xa300 /* DA Leader */ + /* Hagiwara products */ #define USB_PRODUCT_HAGIWARA_FGSM 0x0002 /* FlashGate SmartMedia Card Reader */ #define USB_PRODUCT_HAGIWARA_FGCF 0x0003 /* FlashGate CompactFlash Card Reader */ @@ -884,11 +941,15 @@ #define USB_PRODUCT_HP2_C500 0x6002 /* PhotoSmart C500 */ /* IBM Corporation */ +#define USB_PRODUCT_IBM_OPTTRAVELMOUSE 0x3107 /* Optical */ #define USB_PRODUCT_IBM_USBCDROMDRIVE 0x4427 /* USB CD-ROM Drive */ /* Iiyama products */ #define USB_PRODUCT_IIYAMA_HUB 0x0201 /* Hub */ +/* Imation */ +#define USB_PRODUCT_IMATION_FLASHGO 0xb000 /* Flash Go! */ + /* Inside Out Networks products */ #define USB_PRODUCT_INSIDEOUT_EDGEPORT4 0x0001 /* EdgePort/4 RS232 */ #define USB_PRODUCT_INSIDEOUT_HUBPORT7 0x0002 /* Hubport/7 */ @@ -931,6 +992,10 @@ /* Intersil products */ #define USB_PRODUCT_INTERSIL_PRISM_2X 0x3642 /* Prism2.x WLAN */ +/* Interpid Control Systems products */ +#define USB_PRODUCT_INTREPIDCS_VALUECAN 0x0601 /* ValueCAN */ +#define USB_PRODUCT_INTREPIDCS_NEOVI 0x0701 /* NeoVI Blue */ + /* I-O DATA products */ #define USB_PRODUCT_IODATA_IU_CD2 0x0204 /* DVD Multi-plus unit iU-CD2 */ #define USB_PRODUCT_IODATA_DVR_UEH8 0x0206 /* DVD Multi-plus unit DVR-UEH8 */ @@ -949,6 +1014,11 @@ #define USB_PRODUCT_IOMEGA_ZIP250_2 0x0032 /* Zip 250 */ #define USB_PRODUCT_IOMEGA_CDRW 0x0055 /* CDRW 9602 */ +/* iRiver products */ +#define USB_PRODUCT_IRIVER_IFP_1XX 0x1101 /* iFP-1xx */ +#define USB_PRODUCT_IRIVER_IFP_3XX 0x1103 /* iFP-3xx */ +#define USB_PRODUCT_IRIVER_IFP_5XX 0x1105 /* iFP-5xx */ + /* Jaton products */ #define USB_PRODUCT_JATON_EDA 0x5704 /* Ethernet Device Adapter */ @@ -961,6 +1031,9 @@ /* JVC products */ #define USB_PRODUCT_JVC_GR_DX95 0x000a /* GR-DX95 */ +/* JVC products */ +#define USB_PRODUCT_JVC_MP_XP7250_WL 0x3009 /* MP-XP7250 Builtin WLAN */ + /* Kawasaki products */ #define USB_PRODUCT_KLSI_DUH3E10BT 0x0008 /* 10BT Ethernet adapter, in the DU-H3E */ #define USB_PRODUCT_KLSI_DUH3E10BTN 0x0009 /* 10BT Ethernet adapter, in the DU-H3E */ @@ -1030,6 +1103,9 @@ #define USB_PRODUCT_KYE_FLIGHT2000 0x1004 /* Flight 2000 joystick */ #define USB_PRODUCT_KYE_VIVIDPRO 0x2001 /* ColorPage Vivid-Pro scanner */ +/* Kyocera products */ +#define USB_PRODUCT_KYOCERA_AHK3001V 0x0203 /* AH-K3001V */ + /* LaCie products */ #define USB_PRODUCT_LACIE_HD 0xa601 /* Hard Disk */ #define USB_PRODUCT_LACIE_CDRW 0xa602 /* CD R/W */ @@ -1080,11 +1156,11 @@ #define USB_PRODUCT_LOGITECH_UN58A 0xc030 /* iFeel Mouse */ #define USB_PRODUCT_LOGITECH_WMRPAD 0xc20a /* WingMan RumblePad */ #define USB_PRODUCT_LOGITECH_WMFFGP 0xc293 /* WingMan Formula Force GP (GT-Force) */ -#define USB_PRODUCT_LOGITECH_BB13 0xc401 /* USB-PS/2 Trackball */ -#define USB_PRODUCT_LOGITECH_BB18 0xc404 /* TrackMan Wheel */ #define USB_PRODUCT_LOGITECH_WMPAD 0xc208 /* WingMan GamePad Extreme */ #define USB_PRODUCT_LOGITECH_WMRPAD 0xc20a /* WingMan RumblePad */ #define USB_PRODUCT_LOGITECH_WMJOY 0xc281 /* WingMan Force joystick */ +#define USB_PRODUCT_LOGITECH_BB13 0xc401 /* USB-PS/2 Trackball */ +#define USB_PRODUCT_LOGITECH_BB18 0xc404 /* TrackMan Wheel */ #define USB_PRODUCT_LOGITECH_RK53 0xc501 /* Cordless mouse */ #define USB_PRODUCT_LOGITECH_RB6 0xc503 /* Cordless keyboard */ #define USB_PRODUCT_LOGITECH_CDO 0xc504 /* Cordless Desktop Optical */ @@ -1117,6 +1193,7 @@ #define USB_PRODUCT_MELCO_DUBPXXG 0x001c /* USB-IDE Bridge: DUB-PxxG */ #define USB_PRODUCT_MELCO_KS11G 0x0027 /* WLI-USB-KS11G USB-wlan */ #define USB_PRODUCT_MELCO_LUAU2KTX 0x003d /* LUA-U2-KTX Ethernet */ +#define USB_PRODUCT_MELCO_KB11 0x0044 /* WLI-USB-KB11 WLAN */ /* Metricom products */ #define USB_PRODUCT_METRICOM_RICOCHET_GS 0x0001 /* Ricochet GS */ @@ -1124,6 +1201,9 @@ /* Micro Star International products */ #define USB_PRODUCT_MSI_BLUETOOTH 0x1967 /* Bluetooth USB Adapter */ +/* Micronet Communications products */ +#define USB_PRODUCT_MICRONET_SP128AR 0x0003 /* SP128AR EtherFast */ + /* Microsoft products */ #define USB_PRODUCT_MICROSOFT_SIDEPREC 0x0008 /* SideWinder Precision Pro */ #define USB_PRODUCT_MICROSOFT_INTELLIMOUSE 0x0009 /* IntelliMouse */ @@ -1162,7 +1242,9 @@ #define USB_PRODUCT_MINOLTA_2300 0x4001 /* Dimage 2300 */ #define USB_PRODUCT_MINOLTA_S304 0x4007 /* Dimage S304 */ #define USB_PRODUCT_MINOLTA_X 0x4009 /* Dimage X */ +#define USB_PRODUCT_MINOLTA_DIMAGE7I 0x400b /* Dimage 7i */ #define USB_PRODUCT_MINOLTA_5400 0x400e /* Dimage 5400 */ +#define USB_PRODUCT_MINOLTA_DIMAGEA1 0x401a /* Dimage A1 */ #define USB_PRODUCT_MINOLTA_XT 0x4015 /* Dimage Xt */ /* Mitsumi products */ @@ -1264,6 +1346,8 @@ #define USB_PRODUCT_ONSPEC_UCF100 0xa400 /* FlashLink UCF-100 CompactFlash Reader */ #define USB_PRODUCT_ONSPEC_MD1II 0xb006 /* Datafab MD1-II PC-Card Reader */ +#define USB_PRODUCT_ONSPEC2_8IN2 0xb012 /* 8In2 */ + /* Ours Technology Inc. */ #define USB_PRODUCT_OTI_SOLID 0x6803 /* Solid state disk */ #define USB_PRODUCT_OTI_FLASHDISK 0x6828 /* Flash Disk 128M */ @@ -1327,6 +1411,9 @@ /* Pilotech Systems Co., Ltd products */ #define USB_PRODUCT_PILOTECH_CRW600 0x0001 /* CRW-600 6-in-1 Reader */ +/* Planex Communications products */ +#define USB_PRODUCT_PLANEX_GW_US11H 0x14ea /* GW-US11H WLAN */ + /* Plantronics products */ #define USB_PRODUCT_PLANTRONICS_HEADSET 0x0ca1 /* Platronics DSP-400 Headset */ @@ -1374,6 +1461,7 @@ #define USB_PRODUCT_PROLIFIC_PL2303 0x2303 /* PL2303 Serial adapter (ATEN/IOGEAR UC232A) */ #define USB_PRODUCT_PROLIFIC_PL2305 0x2305 /* Parallel printer adapter */ #define USB_PRODUCT_PROLIFIC_ATAPI4 0x2307 /* ATAPI-4 Bridge Controller */ +#define USB_PRODUCT_PROLIFIC_PL2501 0x2501 /* PL2501 Host-Host interface */ /* Putercom products */ #define USB_PRODUCT_PUTERCOM_UPA100 0x047e /* USB-1284 BRIDGE */ @@ -1390,6 +1478,9 @@ /* Rainbow Technologies products */ #define USB_PRODUCT_RAINBOW_IKEY2000 0x1200 /* i-Key 2000 */ +/* RATOC Systems products */ +#define USB_PRODUCT_RATOC_REXUSB60 0xb000 /* USB serial REX-USB60 */ + /* Realtek products */ #define USB_PRODUCT_REALTEK_RTL8150L 0x8150 /* Realtek RTL8150L USB-Ethernet Bridge */ @@ -1454,6 +1545,13 @@ /* Shark products */ #define USB_PRODUCT_SHARK_PA 0x0400 /* Pocket Adapter */ +/* Sharp products */ +#define USB_PRODUCT_SHARP_SL5500 0x8004 /* SL5500 */ +#define USB_PRODUCT_SHARP_A300 0x8005 /* A300 */ +#define USB_PRODUCT_SHARP_SL5600 0x8006 /* SL5600 */ +#define USB_PRODUCT_SHARP_C700 0x8007 /* C700 */ +#define USB_PRODUCT_SHARP_C750 0x9031 /* C750 */ + /* Shuttle Technology products */ #define USB_PRODUCT_SHUTTLE_EUSB 0x0001 /* E-USB Bridge */ #define USB_PRODUCT_SHUTTLE_EUSCSI 0x0002 /* eUSCSI Bridge */ @@ -1483,6 +1581,11 @@ #define USB_PRODUCT_SIIG_UISDMC2S 0x0200 /* MULTICARDREADER */ #define USB_PRODUCT_SIIG_MULTICARDREADER 0x0201 /* MULTICARDREADER */ +#define USB_PRODUCT_SIIG2_US2308 0x0421 /* Serial */ + +/* Silicom products */ +#define USB_PRODUCT_SILICOM_U2E 0x0001 /* U2E */ + /* Silicon Portals Inc. */ #define USB_PRODUCT_SILICONPORTALS_YAPPH_NF 0x0200 /* YAP Phone (no firmware) */ #define USB_PRODUCT_SILICONPORTALS_YAPPHONE 0x0201 /* YAP Phone */ @@ -1491,7 +1594,8 @@ #define USB_PRODUCT_SIRIUS_ROADSTER 0x0001 /* NetComm Roadster II 56 USB */ /* Sitecom products */ -#define USB_PRODUCT_SITECOM_SERIAL 0x2068 /* USB to serial cable */ +#define USB_PRODUCT_SITECOM_LN029 0x182d /* LN029 */ +#define USB_PRODUCT_SITECOM_CN104 0x2068 /* CN104 serial */ /* SmartBridges products */ #define USB_PRODUCT_SMARTBRIDGES_SMARTLINK 0x0001 /* SmartLink USB ethernet adapter */ @@ -1528,10 +1632,8 @@ #define USB_PRODUCT_SONY_CLIE_41_MS 0x0099 /* Sony Clie v4.1 Memory Stick slot */ #define USB_PRODUCT_SONY_CLIE_41 0x009a /* Sony Clie v4.1 */ #define USB_PRODUCT_SONY_CLIE_NX60 0x00da /* Sony Clie nx60 */ +#define USB_PRODUCT_SONY_CLIE_TJ25 0x0169 /* Sony Clie tj25 */ -/* Sony Ericsson products */ -#define USB_PRODUCT_SONYERICSSON_DCU10 0x0528 /* USB Cable */ - /* SOURCENEXT products */ #define USB_PRODUCT_SOURCENEXT_KEIKAI8 0x039f /* KeikaiDenwa 8 */ #define USB_PRODUCT_SOURCENEXT_KEIKAI8_CHG 0x012e /* KeikaiDenwa 8 with charger */ @@ -1551,12 +1653,19 @@ #define USB_PRODUCT_SUNTAC_VS10U 0x0009 /* SUNTAC Slipper U */ #define USB_PRODUCT_SUNTAC_IS96U 0x000a /* SUNTAC Ir-Trinity */ #define USB_PRODUCT_SUNTAC_AS64LX 0x000b /* SUNTAC U-Cable type A3 */ +#define USB_PRODUCT_SUNTAC_AS144L4 0x0011 /* U-Cable type A4 */ /* Sun Microsystems products */ #define USB_PRODUCT_SUN_KEYBOARD 0x0005 /* Type 6 USB keyboard */ /* XXX The above is a North American PC style keyboard possibly */ #define USB_PRODUCT_SUN_MOUSE 0x0100 /* Type 6 USB mouse */ +/* Susteen products */ +#define USB_PRODUCT_SUSTEEN_DCU10 0x0528 /* USB Cable */ + +/* System TALKS, Inc. */ +#define USB_PRODUCT_SYSTEMTALKS_SGCX2UL 0x1920 /* SGC-X2UL */ + /* Supra products */ #define USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K 0x07da /* Supra Express 56K modem */ #define USB_PRODUCT_DIAMOND2_SUPRA2890 0x0b4a /* SupraMax 2890 56K Modem */ @@ -1580,6 +1689,10 @@ /* TEAC products */ #define USB_PRODUCT_TEAC_FD05PUB 0x0000 /* FD-05PUB floppy */ +/* Tekram Technology products */ +#define USB_PRODUCT_TEKRAM_0193 0x1601 /* ALLNET 0193 WLAN */ +#define USB_PRODUCT_TEKRAM_ZYAIR_B200 0x1602 /* ZyXEL ZyAIR B200 WLAN */ + /* Telex Communications products */ #define USB_PRODUCT_TELEX_MIC1 0x0001 /* Enhanced USB Microphone */ @@ -1608,6 +1721,9 @@ #define USB_PRODUCT_TRUMPION_T33521 0x1003 /* USB/MP3 decoder */ #define USB_PRODUCT_TRUMPION_XXX1100 0x1100 /* XXX 1100 */ +/* Tsunami products */ +#define USB_PRODUCT_TSUNAMI_SM2000 0x1111 /* SM-2000 */ + /* Ultima products */ #define USB_PRODUCT_ULTIMA_1200UBPLUS 0x4002 /* 1200 UB Plus scanner */ @@ -1622,9 +1738,17 @@ /* Universal Access products */ #define USB_PRODUCT_UNIACCESS_PANACHE 0x0101 /* Panache Surf USB ISDN Adapter */ +/* U.S. Robotics products */ +#define USB_PRODUCT_USR_USR1120 0x00eb /* USR1120 WLAN */ + /* VidzMedia products */ #define USB_PRODUCT_VIDZMEDIA_MONSTERTV 0x4fb1 /* MonsterTV P2H */ +/* ViewSonic products */ +#define USB_PRODUCT_VIEWSONIC_G773HUB 0x00fe /* G773 Monitor Hub */ +#define USB_PRODUCT_VIEWSONIC_P815HUB 0x00ff /* P815 Monitor Hub */ +#define USB_PRODUCT_VIEWSONIC_G773CTRL 0x4153 /* G773 Monitor Control */ + /* Vision products */ #define USB_PRODUCT_VISION_VC6452V002 0x0002 /* CPiA Camera */ @@ -1680,6 +1804,9 @@ /* Zeevo, Inc. products */ #define USB_PRODUCT_ZEEVO_BLUETOOTH 0x07d0 /* BT-500 Bluetooth USB Adapter */ +/* Z-Com products */ +#define USB_PRODUCT_ZCOM_725 0x0002 /* 725/726 Prism2.5 WLAN */ + /* 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 35804061a783..4d62188037d1 100644 --- a/sys/dev/usb/usbdevs_data.h +++ b/sys/dev/usb/usbdevs_data.h @@ -1,4 +1,4 @@ -/* $FreeBSD$ */ +/* $NetBSD: usbdevs_data.h,v 1.385 2004/10/22 09:34:55 augustss Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -177,6 +177,12 @@ const struct usb_knowndev usb_knowndevs[] = { "AboCom Systems", "XX7", }, + { + USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_LCS8138TX, + 0, + "AboCom Systems", + "LCS-8138TX", + }, { USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX8, 0, @@ -207,6 +213,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Accton Technology", "USB320-EC Ethernet Adapter", }, + { + USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_111, + 0, + "Accton Technology", + "T-Sinus 111 WLAN", + }, { USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_SS1001, 0, @@ -261,6 +273,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Actiontec Electronics", "Prism2.5 WLAN A", }, + { + USB_VENDOR_ACTIONTEC, USB_PRODUCT_ACTIONTEC_FREELAN, + 0, + "Actiontec Electronics", + "ROPEX FreeLan 802.11b", + }, { USB_VENDOR_ACTIONTEC, USB_PRODUCT_ACTIONTEC_UAT1, 0, @@ -286,10 +304,10 @@ const struct usb_knowndev usb_knowndevs[] = { "I/O Board, rev. 1 firmware", }, { - USB_VENDOR_AEI, USB_PRODUCT_AEI_USBTOLAN, + USB_VENDOR_ADAPTEC, USB_PRODUCT_ADAPTEC_AWN8020, 0, - "AEI", - "AEI USB to Lan adapter", + "Adaptec", + "AWN-8020 WLAN", }, { USB_VENDOR_ADDONICS2, USB_PRODUCT_ADDONICS2_205, @@ -301,25 +319,37 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS, 0, "ADMtek", - "AN986 USB Ethernet adapter", + "AN986 USB Ethernet", }, { USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII, 0, "ADMtek", - "AN8511 USB Ethernet adapter", + "AN8511 USB Ethernet", + }, + { + USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_2, + 0, + "ADMtek", + "AN8513 Ethernet", }, { USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BT, 0, "ADS Technologies", - "UBS-10BT Ethernet adapter", + "UBS-10BT Ethernet", }, { USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BTX, 0, "ADS Technologies", - "UBS-10BT Ethernet adapter", + "UBS-10BT Ethernet", + }, + { + USB_VENDOR_AEI, USB_PRODUCT_AEI_USBTOLAN, + 0, + "AEI", + "AEI USB to Lan adapter", }, { USB_VENDOR_AGATE, USB_PRODUCT_AGATE_QDRIVE, @@ -432,13 +462,13 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ADA70, 0, - "Altec Lansing Technologies", + "Altec Lansing", "ADA70 Speakers", }, { USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ASC495, 0, - "Altec Lansing Technologies", + "Altec Lansing", "ASC495 Speakers", }, { @@ -567,6 +597,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Avance Logic", "USB Audio Speaker", }, + { + USB_VENDOR_AVERATEC, USB_PRODUCT_AVERATEC_USBWLAN, + 0, + "Averatec", + "WLAN", + }, { USB_VENDOR_AVISION, USB_PRODUCT_AVISION_1200U, 0, @@ -591,6 +627,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Belkin Components", "F5U109 Serial adapter", }, + { + USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U409, + 0, + "Belkin Components", + "F5U409 Serial", + }, { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_SCSI, 0, @@ -609,6 +651,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Belkin Components", "F5U208 VideoBus II", }, + { + USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U237, + 0, + "Belkin Components", + "F5U237 USB 2.0 7-Port Hub", + }, { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U120, 0, @@ -825,40 +873,70 @@ const struct usb_knowndev usb_knowndevs[] = { "Chicony Electronics", "TwinkleCam USB camera", }, + { + USB_VENDOR_CHPRODUCTS, USB_PRODUCT_CHPRODUCTS_PROTHROTTLE, + 0, + "CH Products", + "Pro Throttle", + }, + { + USB_VENDOR_CHPRODUCTS, USB_PRODUCT_CHPRODUCTS_PROPEDALS, + 0, + "CH Products", + "Pro Pedals", + }, + { + USB_VENDOR_CHPRODUCTS, USB_PRODUCT_CHPRODUCTS_FIGHTERSTICK, + 0, + "CH Products", + "Fighterstick", + }, + { + USB_VENDOR_CHPRODUCTS, USB_PRODUCT_CHPRODUCTS_FLIGHTYOKE, + 0, + "CH Products", + "Flight Sim Yoke", + }, { USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQPOCKETPC, 0, - "Compaq Computers", + "Compaq", "iPAQ PocketPC", }, { USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_A1500, 0, - "Compaq Computers", + "Compaq", "A1500", }, { USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_W100, 0, - "Compaq Computers", + "Compaq", "W100", }, + { + USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_W200, + 0, + "Compaq", + "WLAN MultiPort W200", + }, { USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_PJB100, 0, - "Compaq Computers", + "Compaq", "Personal Jukebox PJB100", }, { USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQLINUX, 0, - "Compaq Computers", + "Compaq", "iPAQ Linux", }, { USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_HNE200, 0, - "Compaq Computers", + "Compaq", "HNE-200 USB Ethernet adapter", }, { @@ -903,6 +981,18 @@ const struct usb_knowndev usb_knowndevs[] = { "Corega", "Wireless LAN USB Stick-11", }, + { + USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB2_TX, + 0, + "Corega", + "FEther USB2-TX", + }, + { + USB_VENDOR_COREGA, USB_PRODUCT_COREGA_WLUSB_11_KEY, + 0, + "Corega", + "ULUSB-11 Key", + }, { USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TXC, 0, @@ -912,9 +1002,27 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_CREATIVE, USB_PRODUCT_CREATIVE_NOMAD_II, 0, - "Creative", + "Creative Labs", "Nomad II MP3 player", }, + { + USB_VENDOR_CREATIVE, USB_PRODUCT_CREATIVE_NOMAD_IIMG, + 0, + "Creative Labs", + "Nomad II MG", + }, + { + USB_VENDOR_CREATIVE, USB_PRODUCT_CREATIVE_NOMAD, + 0, + "Creative Labs", + "Nomad", + }, + { + USB_VENDOR_CREATIVE2, USB_PRODUCT_CREATIVE2_VOIP_BLASTER, + 0, + "Creative Labs", + "Voip Blaster", + }, { USB_VENDOR_CSR, USB_PRODUCT_CSR_BLUETOOTH, 0, @@ -981,12 +1089,6 @@ const struct usb_knowndev usb_knowndevs[] = { "Dallas Semiconductor", "USB-FOB/iBUTTON", }, - { - USB_VENDOR_DELL, USB_PRODUCT_DELL_BC02, - 0, - "Dell", - "Dell BC02 Bluetooth USB Adapter", - }, { USB_VENDOR_DELL, USB_PRODUCT_DELL_X3, 0, @@ -999,6 +1101,18 @@ const struct usb_knowndev usb_knowndevs[] = { "Dell", "Dell Axim X30 PDA", }, + { + USB_VENDOR_DELL, USB_PRODUCT_DELL_BC02, + 0, + "Dell", + "Dell BC02 Bluetooth USB Adapter", + }, + { + USB_VENDOR_DELL, USB_PRODUCT_DELL_TM1180, + 0, + "Dell", + "TrueMobile 1180 WLAN", + }, { USB_VENDOR_DIAMOND, USB_PRODUCT_DIAMOND_RIO500USB, 0, @@ -1041,6 +1155,12 @@ const struct usb_knowndev usb_knowndevs[] = { "D-Link", "10/100 ethernet adapter", }, + { + USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWL122, + 0, + "D-Link", + "Wireless DWL122", + }, { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650C, 0, @@ -1086,13 +1206,13 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_EGALAX, USB_PRODUCT_EGALAX_TPANEL, 0, - "eGalax, Inc.", + "eGalax", "Touch Panel", }, { USB_VENDOR_EGALAX, USB_PRODUCT_EGALAX_TPANEL2, 0, - "eGalax, Inc.", + "eGalax", "Touch Panel", }, { @@ -1161,6 +1281,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Elecom", "UC-SGT serial adapter", }, + { + USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_UCSGT0, + 0, + "Elecom", + "UC-SGT0 Serial", + }, { USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX3, 0, @@ -1377,18 +1503,24 @@ const struct usb_knowndev usb_knowndevs[] = { "Freecom", "Connector for DVD drive", }, - { - USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U100AX, - 0, - "Future Technology Devices", - "8U100AX Serial converter", - }, { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U232AM, 0, "Future Technology Devices", "8U232AM Serial converter", }, + { + USB_VENDOR_FTDI, USB_PRODUCT_FTDI_PS2KBDMS, + 0, + "Future Technology Devices", + "PS/2 Keyboard/Mouse", + }, + { + USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U100AX, + 0, + "Future Technology Devices", + "8U100AX Serial converter", + }, { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_MX200_USB, 0, @@ -1399,13 +1531,37 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_LK202_24_USB, 0, "Future Technology Devices", - "Matrix Orbital LK202-24 USB LCD", + "Matrix Orbital LK202-24 LCD", + }, + { + USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_LK204_24, + 0, + "Future Technology Devices", + "Matrix Orbital LK204-24 LCD", + }, + { + USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_632, + 0, + "Future Technology Devices", + "Crystalfontz CFA-632 LCD", + }, + { + USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_634, + 0, + "Future Technology Devices", + "Crystalfontz CFA-634 LCD", + }, + { + USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_633, + 0, + "Future Technology Devices", + "Crystalfontz CFA-633 LCD", }, { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CFA_631, 0, "Future Technology Devices", - "Crystalfontz CFA-631 USB LCD", + "Crystalfontz CFA-631 LCD", }, { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SEMC_DSS20, @@ -1431,6 +1587,12 @@ const struct usb_knowndev usb_knowndevs[] = { "General Instruments (Motorola)", "SURFboard SB5100 Cable modem", }, + { + USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GENELINK, + 0, + "Genesys Logic", + "GeneLink Host-Host Bridge", + }, { USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL650, 0, @@ -1464,7 +1626,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_GRAVIS, USB_PRODUCT_GRAVIS_GAMEPADPRO, 0, - "Advanced Gravis Computer Tech.", + "Advanced Gravis Computer", "GamePad Pro", }, { @@ -1485,6 +1647,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Griffin Technology", "PowerMate Assignable Controller", }, + { + USB_VENDOR_GUILLEMOT, USB_PRODUCT_GUILLEMOT_DALEADER, + 0, + "Guillemot", + "DA Leader", + }, { USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FGSM, 0, @@ -1536,7 +1704,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_UF100, 0, - "Hawking Technologies", + "Hawking", "10/100 USB Ethernet", }, { @@ -1791,10 +1959,16 @@ const struct usb_knowndev usb_knowndevs[] = { "Hewlett Packard", "PhotoSmart C500", }, + { + USB_VENDOR_IBM, USB_PRODUCT_IBM_OPTTRAVELMOUSE, + 0, + "IBM", + "Optical", + }, { USB_VENDOR_IBM, USB_PRODUCT_IBM_USBCDROMDRIVE, 0, - "IBM Corporation", + "IBM", "USB CD-ROM Drive", }, { @@ -1803,6 +1977,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Iiyama", "Hub", }, + { + USB_VENDOR_IMATION, USB_PRODUCT_IMATION_FLASHGO, + 0, + "Imation", + "Flash Go!", + }, { USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4, 0, @@ -2007,6 +2187,18 @@ const struct usb_knowndev usb_knowndevs[] = { "Intersil", "Prism2.x WLAN", }, + { + USB_VENDOR_INTREPIDCS, USB_PRODUCT_INTREPIDCS_VALUECAN, + 0, + "Intrepid", + "ValueCAN", + }, + { + USB_VENDOR_INTREPIDCS, USB_PRODUCT_INTREPIDCS_NEOVI, + 0, + "Intrepid", + "NeoVI Blue", + }, { USB_VENDOR_IODATA, USB_PRODUCT_IODATA_IU_CD2, 0, @@ -2091,6 +2283,24 @@ const struct usb_knowndev usb_knowndevs[] = { "Iomega", "CDRW 9602", }, + { + USB_VENDOR_IRIVER, USB_PRODUCT_IRIVER_IFP_1XX, + 0, + "iRiver", + "iFP-1xx", + }, + { + USB_VENDOR_IRIVER, USB_PRODUCT_IRIVER_IFP_3XX, + 0, + "iRiver", + "iFP-3xx", + }, + { + USB_VENDOR_IRIVER, USB_PRODUCT_IRIVER_IFP_5XX, + 0, + "iRiver", + "iFP-5xx", + }, { USB_VENDOR_JATON, USB_PRODUCT_JATON_EDA, 0, @@ -2115,6 +2325,12 @@ const struct usb_knowndev usb_knowndevs[] = { "JVC", "GR-DX95", }, + { + USB_VENDOR_JVC, USB_PRODUCT_JVC_MP_XP7250_WL, + 0, + "JVC", + "MP-XP7250 Builtin WLAN", + }, { USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BT, 0, @@ -2421,6 +2637,12 @@ const struct usb_knowndev usb_knowndevs[] = { "KYE Systems", "ColorPage Vivid-Pro scanner", }, + { + USB_VENDOR_KYOCERA, USB_PRODUCT_KYOCERA_AHK3001V, + 0, + "Kyocera", + "AH-K3001V", + }, { USB_VENDOR_LACIE, USB_PRODUCT_LACIE_HD, 0, @@ -2655,18 +2877,6 @@ const struct usb_knowndev usb_knowndevs[] = { "Logitech", "WingMan Formula Force GP (GT-Force)", }, - { - USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_BB13, - 0, - "Logitech", - "USB-PS/2 Trackball", - }, - { - USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_BB18, - 0, - "Logitech", - "TrackMan Wheel", - }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMPAD, 0, @@ -2685,6 +2895,18 @@ const struct usb_knowndev usb_knowndevs[] = { "Logitech", "WingMan Force joystick", }, + { + USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_BB13, + 0, + "Logitech", + "USB-PS/2 Trackball", + }, + { + USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_BB18, + 0, + "Logitech", + "TrackMan Wheel", + }, { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_RK53, 0, @@ -2817,6 +3039,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Melco", "LUA-U2-KTX Ethernet", }, + { + USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KB11, + 0, + "Melco", + "WLI-USB-KB11 WLAN", + }, { USB_VENDOR_METRICOM, USB_PRODUCT_METRICOM_RICOCHET_GS, 0, @@ -2826,9 +3054,15 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_MSI, USB_PRODUCT_MSI_BLUETOOTH, 0, - "Micro Star International", + "Micro Star", "Bluetooth USB Adapter", }, + { + USB_VENDOR_MICRONET, USB_PRODUCT_MICRONET_SP128AR, + 0, + "Micronet Communications", + "SP128AR EtherFast", + }, { USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_SIDEPREC, 0, @@ -2991,12 +3225,24 @@ const struct usb_knowndev usb_knowndevs[] = { "Minolta", "Dimage X", }, + { + USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_DIMAGE7I, + 0, + "Minolta", + "Dimage 7i", + }, { USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_5400, 0, "Minolta", "Dimage 5400", }, + { + USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_DIMAGEA1, + 0, + "Minolta", + "Dimage A1", + }, { USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_XT, 0, @@ -3060,7 +3306,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_MSI, USB_PRODUCT_MSI_BT_DONGLE, 0, - "Micro Star International", + "Micro Star", "Bluetooth USB dongle", }, { @@ -3312,73 +3558,79 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_MD2, 0, - "OnSpec Electronic, Inc.", + "OnSpec", "disk", }, { USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_MDCFEB, 0, - "OnSpec Electronic, Inc.", + "OnSpec", "MDCFE-B USB CF Reader", }, { USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_SIIGMS, 0, - "OnSpec Electronic, Inc.", + "OnSpec", "Memory Stick+CF Reader/Writer", }, { USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_DATAFAB3, 0, - "OnSpec Electronic, Inc.", + "OnSpec", "Datafab-based Reader", }, { USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_DATAFAB4, 0, - "OnSpec Electronic, Inc.", + "OnSpec", "Datafab-based Reader", }, { USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_PNYCFSM, 0, - "OnSpec Electronic, Inc.", + "OnSpec", "PNY/Datafab CF+SM Reader", }, { USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_STECHCFSM, 0, - "OnSpec Electronic, Inc.", + "OnSpec", "Simple Tech/Datafab CF+SM Reader", }, { USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_LC1, 0, - "OnSpec Electronic, Inc.", + "OnSpec", "CF + SM Combo (LC1)", }, { USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_UCF100, 0, - "OnSpec Electronic, Inc.", + "OnSpec", "FlashLink UCF-100 CompactFlash Reader", }, { USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_MD1II, 0, - "OnSpec Electronic, Inc.", + "OnSpec", "Datafab MD1-II PC-Card Reader", }, + { + USB_VENDOR_ONSPEC2, USB_PRODUCT_ONSPEC2_8IN2, + 0, + "OnSpec Electronic Inc.", + "8In2", + }, { USB_VENDOR_OTI, USB_PRODUCT_OTI_SOLID, 0, - "Ours Technology Inc.", + "Ours Technology", "Solid state disk", }, { USB_VENDOR_OTI, USB_PRODUCT_OTI_FLASHDISK, 0, - "Ours Technology Inc.", + "Ours Technology", "Flash Disk 128M", }, { @@ -3639,6 +3891,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Pilotech", "CRW-600 6-in-1 Reader", }, + { + USB_VENDOR_PLANEX, USB_PRODUCT_PLANEX_GW_US11H, + 0, + "Planex Communications", + "GW-US11H WLAN", + }, { USB_VENDOR_PLANTRONICS, USB_PRODUCT_PLANTRONICS_HEADSET, 0, @@ -3819,6 +4077,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Prolific Technology", "ATAPI-4 Bridge Controller", }, + { + USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2501, + 0, + "Prolific Technology", + "PL2501 Host-Host interface", + }, { USB_VENDOR_PUTERCOM, USB_PRODUCT_PUTERCOM_UPA100, 0, @@ -3849,6 +4113,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Rainbow Technologies", "i-Key 2000", }, + { + USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60, + 0, + "RATOC Systems", + "USB serial REX-USB60", + }, { USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8150L, 0, @@ -3996,7 +4266,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60, 0, - "RATOC Systems, Inc.", + "RATOC Systems", "USB serial adapter REX-USB60", }, { @@ -4014,43 +4284,43 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR05A, 0, - "SanDisk Corp", + "SanDisk", "ImageMate SDDR-05a", }, { USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR31, 0, - "SanDisk Corp", + "SanDisk", "ImageMate SDDR-31", }, { USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR05, 0, - "SanDisk Corp", + "SanDisk", "ImageMate SDDR-05", }, { USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR12, 0, - "SanDisk Corp", + "SanDisk", "ImageMate SDDR-12", }, { USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR09, 0, - "SanDisk Corp", + "SanDisk", "ImageMate SDDR-09", }, { USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR75, 0, - "SanDisk Corp", + "SanDisk", "ImageMate SDDR-75", }, { USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR86, 0, - "SanDisk Corp", + "SanDisk", "ImageMate SDDR-86", }, { @@ -4089,6 +4359,36 @@ const struct usb_knowndev usb_knowndevs[] = { "Shark", "Pocket Adapter", }, + { + USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SL5500, + 0, + "Sharp", + "SL5500", + }, + { + USB_VENDOR_SHARP, USB_PRODUCT_SHARP_A300, + 0, + "Sharp", + "A300", + }, + { + USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SL5600, + 0, + "Sharp", + "SL5600", + }, + { + USB_VENDOR_SHARP, USB_PRODUCT_SHARP_C700, + 0, + "Sharp", + "C700", + }, + { + USB_VENDOR_SHARP, USB_PRODUCT_SHARP_C750, + 0, + "Sharp", + "C750", + }, { USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSB, 0, @@ -4215,6 +4515,18 @@ const struct usb_knowndev usb_knowndevs[] = { "SIIG", "MULTICARDREADER", }, + { + USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_US2308, + 0, + "SIIG", + "Serial", + }, + { + USB_VENDOR_SILICOM, USB_PRODUCT_SILICOM_U2E, + 0, + "Silicom", + "U2E", + }, { USB_VENDOR_SILICONPORTALS, USB_PRODUCT_SILICONPORTALS_YAPPH_NF, 0, @@ -4234,10 +4546,16 @@ const struct usb_knowndev usb_knowndevs[] = { "NetComm Roadster II 56 USB", }, { - USB_VENDOR_SITECOM, USB_PRODUCT_SITECOM_SERIAL, + USB_VENDOR_SITECOM, USB_PRODUCT_SITECOM_LN029, 0, "Sitecom", - "USB to serial cable", + "LN029", + }, + { + USB_VENDOR_SITECOM, USB_PRODUCT_SITECOM_CN104, + 0, + "Sitecom", + "CN104 serial", }, { USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTLINK, @@ -4396,10 +4714,10 @@ const struct usb_knowndev usb_knowndevs[] = { "Sony Clie nx60", }, { - USB_VENDOR_SONYERICSSON, USB_PRODUCT_SONYERICSSON_DCU10, + USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_TJ25, 0, - "Sony Ericsson", - "USB Cable", + "Sony", + "Sony Clie tj25", }, { USB_VENDOR_SOURCENEXT, USB_PRODUCT_SOURCENEXT_KEIKAI8, @@ -4461,6 +4779,12 @@ const struct usb_knowndev usb_knowndevs[] = { "SUN Corporation", "SUNTAC U-Cable type A3", }, + { + USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_AS144L4, + 0, + "SUN Corporation", + "U-Cable type A4", + }, { USB_VENDOR_SUN, USB_PRODUCT_SUN_KEYBOARD, 0, @@ -4473,6 +4797,18 @@ const struct usb_knowndev usb_knowndevs[] = { "Sun Microsystems", "Type 6 USB mouse", }, + { + USB_VENDOR_SUSTEEN, USB_PRODUCT_SUSTEEN_DCU10, + 0, + "Susteen", + "USB Cable", + }, + { + USB_VENDOR_SYSTEMTALKS, USB_PRODUCT_SYSTEMTALKS_SGCX2UL, + 0, + "System Talks", + "SGC-X2UL", + }, { USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K, 0, @@ -4551,6 +4887,18 @@ const struct usb_knowndev usb_knowndevs[] = { "TEAC", "FD-05PUB floppy", }, + { + USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_0193, + 0, + "Tekram Technology", + "ALLNET 0193 WLAN", + }, + { + USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_ZYAIR_B200, + 0, + "Tekram Technology", + "ZyXEL ZyAIR B200 WLAN", + }, { USB_VENDOR_TELEX, USB_PRODUCT_TELEX_MIC1, 0, @@ -4590,7 +4938,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_TOSHIBA, USB_PRODUCT_TOSHIBA_POCKETPC_E740, 0, - "Toshiba Corporation", + "Toshiba", "PocketPC e740", }, { @@ -4623,6 +4971,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Trumpion Microelectronics", "XXX 1100", }, + { + USB_VENDOR_TSUNAMI, USB_PRODUCT_TSUNAMI_SM2000, + 0, + "Tsunami", + "SM-2000", + }, { USB_VENDOR_ULTIMA, USB_PRODUCT_ULTIMA_1200UBPLUS, 0, @@ -4671,12 +5025,36 @@ const struct usb_knowndev usb_knowndevs[] = { "Universal Access", "Panache Surf USB ISDN Adapter", }, + { + USB_VENDOR_USR, USB_PRODUCT_USR_USR1120, + 0, + "U.S. Robotics", + "USR1120 WLAN", + }, { USB_VENDOR_VIDZMEDIA, USB_PRODUCT_VIDZMEDIA_MONSTERTV, 0, "VidzMedia Pte Ltd", "MonsterTV P2H", }, + { + USB_VENDOR_VIEWSONIC, USB_PRODUCT_VIEWSONIC_G773HUB, + 0, + "ViewSonic", + "G773 Monitor Hub", + }, + { + USB_VENDOR_VIEWSONIC, USB_PRODUCT_VIEWSONIC_P815HUB, + 0, + "ViewSonic", + "P815 Monitor Hub", + }, + { + USB_VENDOR_VIEWSONIC, USB_PRODUCT_VIEWSONIC_G773CTRL, + 0, + "ViewSonic", + "G773 Monitor Control", + }, { USB_VENDOR_VISION, USB_PRODUCT_VISION_VC6452V002, 0, @@ -4899,6 +5277,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Zeevo, Inc.", "BT-500 Bluetooth USB Adapter", }, + { + USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_725, + 0, + "Z-Com", + "725/726 Prism2.5 WLAN", + }, { USB_VENDOR_ZOOM, USB_PRODUCT_ZOOM_2986L, 0, @@ -4992,7 +5376,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_CREATIVE, 0, USB_KNOWNDEV_NOPROD, - "Creative", + "Creative Labs", NULL, }, { @@ -5016,7 +5400,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_GRAVIS, 0, USB_KNOWNDEV_NOPROD, - "Advanced Gravis Computer Tech.", + "Advanced Gravis Computer", NULL, }, { @@ -5163,6 +5547,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Plantronics", NULL, }, + { + USB_VENDOR_KYOCERA, 0, + USB_KNOWNDEV_NOPROD, + "Kyocera", + NULL, + }, { USB_VENDOR_STMICRO, 0, USB_KNOWNDEV_NOPROD, @@ -5178,7 +5568,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_COMPAQ, 0, USB_KNOWNDEV_NOPROD, - "Compaq Computers", + "Compaq", NULL, }, { @@ -5214,7 +5604,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_IBM, 0, USB_KNOWNDEV_NOPROD, - "IBM Corporation", + "IBM", NULL, }, { @@ -5280,7 +5670,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_TOSHIBAAM, 0, USB_KNOWNDEV_NOPROD, - "Toshiba America Electronic Components", + "Toshiba America", NULL, }, { @@ -5334,7 +5724,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_DIGI2, 0, USB_KNOWNDEV_NOPROD, - "Digi International", + "Digi", NULL, }, { @@ -5346,7 +5736,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ALTEC, 0, USB_KNOWNDEV_NOPROD, - "Altec Lansing Technologies", + "Altec Lansing", NULL, }, { @@ -5355,6 +5745,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Panasonic (Matsushita)", NULL, }, + { + USB_VENDOR_SHARP, 0, + USB_KNOWNDEV_NOPROD, + "Sharp", + NULL, + }, { USB_VENDOR_IIYAMA, 0, USB_KNOWNDEV_NOPROD, @@ -5481,6 +5877,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Universal Access", NULL, }, + { + USB_VENDOR_VIEWSONIC, 0, + USB_KNOWNDEV_NOPROD, + "ViewSonic", + NULL, + }, { USB_VENDOR_XIRLINK, 0, USB_KNOWNDEV_NOPROD, @@ -5586,7 +5988,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_AVM, 0, USB_KNOWNDEV_NOPROD, - "AVM GmbH", + "AVM", NULL, }, { @@ -5610,7 +6012,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_RATOC, 0, USB_KNOWNDEV_NOPROD, - "RATOC Systems, Inc.", + "RATOC Systems", NULL, }, { @@ -5925,6 +6327,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Minolta", NULL, }, + { + USB_VENDOR_CHPRODUCTS, 0, + USB_KNOWNDEV_NOPROD, + "CH Products", + NULL, + }, { USB_VENDOR_CTX, 0, USB_KNOWNDEV_NOPROD, @@ -6003,6 +6411,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Sirius Technologies", NULL, }, + { + USB_VENDOR_GUILLEMOT, 0, + USB_KNOWNDEV_NOPROD, + "Guillemot", + NULL, + }, { USB_VENDOR_BOSTON, 0, USB_KNOWNDEV_NOPROD, @@ -6028,9 +6442,15 @@ const struct usb_knowndev usb_knowndevs[] = { NULL, }, { - USB_VENDOR_SONYERICSSON, 0, + USB_VENDOR_IMATION, 0, USB_KNOWNDEV_NOPROD, - "Sony Ericsson", + "Imation", + NULL, + }, + { + USB_VENDOR_SUSTEEN, 0, + USB_KNOWNDEV_NOPROD, + "Susteen", NULL, }, { @@ -6072,7 +6492,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_SANDISK, 0, USB_KNOWNDEV_NOPROD, - "SanDisk Corp", + "SanDisk", NULL, }, { @@ -6186,7 +6606,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_ONSPEC, 0, USB_KNOWNDEV_NOPROD, - "OnSpec Electronic, Inc.", + "OnSpec", NULL, }, { @@ -6315,6 +6735,12 @@ const struct usb_knowndev usb_knowndevs[] = { "PortGear", NULL, }, + { + USB_VENDOR_SYSTEMTALKS, 0, + USB_KNOWNDEV_NOPROD, + "System Talks", + NULL, + }, { USB_VENDOR_METRICOM, 0, USB_KNOWNDEV_NOPROD, @@ -6438,7 +6864,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_TOSHIBA, 0, USB_KNOWNDEV_NOPROD, - "Toshiba Corporation", + "Toshiba", NULL, }, { @@ -6447,6 +6873,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Plextor", NULL, }, + { + USB_VENDOR_INTREPIDCS, 0, + USB_KNOWNDEV_NOPROD, + "Intrepid", + NULL, + }, { USB_VENDOR_YANO, 0, USB_KNOWNDEV_NOPROD, @@ -6633,6 +7065,18 @@ const struct usb_knowndev usb_knowndevs[] = { "Todos Data System", NULL, }, + { + USB_VENDOR_SIIG2, 0, + USB_KNOWNDEV_NOPROD, + "SIIG", + NULL, + }, + { + USB_VENDOR_TEKRAM, 0, + USB_KNOWNDEV_NOPROD, + "Tekram Technology", + NULL, + }, { USB_VENDOR_HAL, 0, USB_KNOWNDEV_NOPROD, @@ -6675,6 +7119,12 @@ const struct usb_knowndev usb_knowndevs[] = { "ASIX Electronics", NULL, }, + { + USB_VENDOR_USR, 0, + USB_KNOWNDEV_NOPROD, + "U.S. Robotics", + NULL, + }, { USB_VENDOR_REALTEK, 0, USB_KNOWNDEV_NOPROD, @@ -6711,6 +7161,12 @@ const struct usb_knowndev usb_knowndevs[] = { "EasyDisk", NULL, }, + { + USB_VENDOR_ZCOM, 0, + USB_KNOWNDEV_NOPROD, + "Z-Com", + NULL, + }, { USB_VENDOR_TANGTOP, 0, USB_KNOWNDEV_NOPROD, @@ -6735,22 +7191,28 @@ const struct usb_knowndev usb_knowndevs[] = { "American Computer & Digital Components", NULL, }, + { + USB_VENDOR_ABC, 0, + USB_KNOWNDEV_NOPROD, + "ABC", + NULL, + }, { USB_VENDOR_MSI, 0, USB_KNOWNDEV_NOPROD, - "Micro Star International", + "Micro Star", NULL, }, { USB_VENDOR_HAWKING, 0, USB_KNOWNDEV_NOPROD, - "Hawking Technologies", + "Hawking", NULL, }, { USB_VENDOR_OTI, 0, USB_KNOWNDEV_NOPROD, - "Ours Technology Inc.", + "Ours Technology", NULL, }, { @@ -6762,7 +7224,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_EGALAX, 0, USB_KNOWNDEV_NOPROD, - "eGalax, Inc.", + "eGalax", NULL, }, { @@ -6813,6 +7275,18 @@ const struct usb_knowndev usb_knowndevs[] = { "Acer Communications & Multimedia", NULL, }, + { + USB_VENDOR_TSUNAMI, 0, + USB_KNOWNDEV_NOPROD, + "Tsunami", + NULL, + }, + { + USB_VENDOR_CREATIVE2, 0, + USB_KNOWNDEV_NOPROD, + "Creative Labs", + NULL, + }, { USB_VENDOR_BELKIN2, 0, USB_KNOWNDEV_NOPROD, @@ -6831,6 +7305,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Shark", NULL, }, + { + USB_VENDOR_SILICOM, 0, + USB_KNOWNDEV_NOPROD, + "Silicom", + NULL, + }, { USB_VENDOR_SILICONPORTALS, 0, USB_KNOWNDEV_NOPROD, @@ -6903,6 +7383,12 @@ const struct usb_knowndev usb_knowndevs[] = { "NHJ", NULL, }, + { + USB_VENDOR_PLANEX, 0, + USB_KNOWNDEV_NOPROD, + "Planex Communications", + NULL, + }, { USB_VENDOR_VIDZMEDIA, 0, USB_KNOWNDEV_NOPROD, @@ -6933,18 +7419,36 @@ const struct usb_knowndev usb_knowndevs[] = { "National Instruments", NULL, }, + { + USB_VENDOR_MICRONET, 0, + USB_KNOWNDEV_NOPROD, + "Micronet Communications", + NULL, + }, { USB_VENDOR_IODATA2, 0, USB_KNOWNDEV_NOPROD, "I-O Data", NULL, }, + { + USB_VENDOR_IRIVER, 0, + USB_KNOWNDEV_NOPROD, + "iRiver", + NULL, + }, { USB_VENDOR_DELL, 0, USB_KNOWNDEV_NOPROD, "Dell", NULL, }, + { + USB_VENDOR_AVERATEC, 0, + USB_KNOWNDEV_NOPROD, + "Averatec", + NULL, + }, { USB_VENDOR_ONSPEC2, 0, USB_KNOWNDEV_NOPROD,