diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-07-04 23:12:25 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2004-07-04 23:12:25 +0000 |
| commit | bc68cbda44470cd3e19cae463b3104209b9177dd (patch) | |
| tree | bd5fc799ce48f075dcb56bcca0f1b7466be13220 /sys | |
| parent | 1c9eb4af1d0a78ab65f9968c52f7cd3327e33bcd (diff) | |
sync
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/usb/usbdevs.h | 390 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs_data.h | 396 |
2 files changed, 401 insertions, 385 deletions
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index 0dd7318148e..4e7772466fd 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -1,10 +1,10 @@ -/* $OpenBSD: usbdevs.h,v 1.91 2004/06/27 19:44:29 deraadt Exp $ */ +/* $OpenBSD: usbdevs.h,v 1.92 2004/07/04 23:12:24 deraadt Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.88 2004/06/27 19:44:19 deraadt Exp + * OpenBSD: usbdevs,v 1.89 2004/07/04 23:12:18 deraadt Exp */ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ @@ -123,7 +123,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 */ @@ -364,6 +364,7 @@ #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_BELKIN2 0x1293 /* Belkin Components */ #define USB_VENDOR_MOBILITY 0x1342 /* Mobility */ #define USB_VENDOR_SHARK 0x13d2 /* Shark */ @@ -390,8 +391,8 @@ */ /* 3Com products */ -#define USB_PRODUCT_3COM_HOMECONN 0x009d /* HomeConnect Camera */ -#define USB_PRODUCT_3COM_3CREB96 0x00a0 /* Bluetooth USB Adapter */ +#define USB_PRODUCT_3COM_HOMECONN 0x009d /* HomeConnect */ +#define USB_PRODUCT_3COM_3CREB96 0x00a0 /* Bluetooth */ #define USB_PRODUCT_3COM_3C19250 0x03E8 /* 3C19250 Ethernet */ #define USB_PRODUCT_3COM_3C460 0x11f8 /* HomeConnect 3C460 */ #define USB_PRODUCT_3COM_USR56K 0x3021 /* U.S.Robotics 56000 */ @@ -399,7 +400,7 @@ #define USB_PRODUCT_3COMUSR_OFFICECONN 0x0082 /* 3Com OfficeConnect Analog Modem */ #define USB_PRODUCT_3COMUSR_USRISDN 0x008f /* 3Com U.S. Robotics Pro ISDN TA */ -#define USB_PRODUCT_3COMUSR_HOMECONN 0x009d /* 3Com HomeConnect camera */ +#define USB_PRODUCT_3COMUSR_HOMECONN 0x009d /* 3Com HomeConnect */ #define USB_PRODUCT_3COMUSR_USR56K 0x3021 /* U.S.Robotics 56000 */ /* AboCom products */ @@ -428,7 +429,7 @@ #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 */ -#define USB_PRODUCT_ACERP_ATAPI 0x6003 /* ATA/ATAPI adapter */ +#define USB_PRODUCT_ACERP_ATAPI 0x6003 /* ATA/ATAPI */ /* Actiontec products */ #define USB_PRODUCT_ACTIONTEC_PRISM_25 0x0408 /* Prism2.5 WLAN */ @@ -490,7 +491,7 @@ #define USB_PRODUCT_ANCHOR_EZLINK 0x2720 /* EZLINK */ /* AOX, Inc. products */ -#define USB_PRODUCT_AOX_USB101 0x0008 /* Ethernet controller engine */ +#define USB_PRODUCT_AOX_USB101 0x0008 /* Ethernet */ /* Apple Computer products */ #define USB_PRODUCT_APPLE_OPTMOUSE 0x0302 /* Optical mouse */ @@ -506,9 +507,9 @@ #define USB_PRODUCT_ASIX_AX88172 0x1720 /* USB 2.0 10/100 ethernet controller */ /* ATen products */ -#define USB_PRODUCT_ATEN_UC1284 0x2001 /* Parallel adapter */ +#define USB_PRODUCT_ATEN_UC1284 0x2001 /* Parallel */ #define USB_PRODUCT_ATEN_UC10T 0x2002 /* 10Mbps Ethernet */ -#define USB_PRODUCT_ATEN_UC232A 0x2008 /* Serial adapter */ +#define USB_PRODUCT_ATEN_UC232A 0x2008 /* Serial */ #define USB_PRODUCT_ATEN_DSB650C 0x4000 /* DSB-650C */ /* ATI products */ @@ -517,7 +518,7 @@ /* Atmel Comp. products */ #define USB_PRODUCT_ATMEL_UHB124 0x3301 /* UHB124 hub */ #define USB_PRODUCT_ATMEL_DWL900AP 0x5601 /* DWL-900AP Wireless access point */ -#define USB_PRODUCT_ATMEL_DWL120 0x7602 /* DWL-120 Wireless adapter */ +#define USB_PRODUCT_ATMEL_DWL120 0x7602 /* DWL-120 Wireless */ /* Audio-Technica products */ #define USB_PRODUCT_AUDIOTECHNICA_ATCHA4USB 0x0009 /* ATC-HA4USB USB headphone */ @@ -526,14 +527,14 @@ #define USB_PRODUCT_AVANCELOGIC_USBAUDIO 0x0100 /* USB Audio Speaker */ /* Avision products */ -#define USB_PRODUCT_AVISION_1200U 0x0268 /* 1200U scanner */ +#define USB_PRODUCT_AVISION_1200U 0x0268 /* 1200U */ /* Belkin products */ /*product BELKIN F5U111 0x???? F5U111 Ethernet */ -#define USB_PRODUCT_BELKIN2_F5U002 0x0002 /* F5U002 Parallel adapter */ -#define USB_PRODUCT_BELKIN_F5U103 0x0103 /* F5U103 Serial adapter */ -#define USB_PRODUCT_BELKIN_F5U109 0x0109 /* F5U109 Serial adapter */ -#define USB_PRODUCT_BELKIN_SCSI 0x0115 /* SCSI Adaptor */ +#define USB_PRODUCT_BELKIN2_F5U002 0x0002 /* F5U002 Parallel */ +#define USB_PRODUCT_BELKIN_F5U103 0x0103 /* F5U103 Serial */ +#define USB_PRODUCT_BELKIN_F5U109 0x0109 /* F5U109 Serial */ +#define USB_PRODUCT_BELKIN_SCSI 0x0115 /* SCSI */ #define USB_PRODUCT_BELKIN_USB2LAN 0x0121 /* USB to LAN Converter */ #define USB_PRODUCT_BELKIN_F5U120 0x1203 /* F5U120-PC Hub */ @@ -570,7 +571,7 @@ #define USB_PRODUCT_CATC_ANDROMEDA 0x1237 /* Andromeda hub */ /* CASIO products */ -#define USB_PRODUCT_CASIO_QV 0x1001 /* QV DigitalCamera */ +#define USB_PRODUCT_CASIO_QV 0x1001 /* QV */ #define USB_PRODUCT_CASIO_BE300 0x2002 /* BE-300 PDA */ #define USB_PRODUCT_CASIO_NAMELAND 0x4001 /* CASIO Nameland EZ-USB */ @@ -583,7 +584,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 */ /* Chicony products */ #define USB_PRODUCT_CHICONY_KB8933 0x0001 /* KB-8933 keyboard */ @@ -611,14 +612,14 @@ #define USB_PRODUCT_COREGA_FETHER_USB_TX 0x0004 /* FEther USB-TX */ #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_WLANUSB 0x0012 /* Wireless LAN Stick-11 */ /* Creative Labs products */ #define USB_PRODUCT_CREATIVE_NOMAD_II 0x1002 /* Nomad II */ #define USB_PRODUCT_CREATIVE_NOMAD_IIMG 0x4004 /* Nomad II MG */ /* Cambridge Silicon Radio products */ -#define USB_PRODUCT_CSR_BLUETOOTH 0x0001 /* Bluetooth USB Adapter */ +#define USB_PRODUCT_CSR_BLUETOOTH 0x0001 /* Bluetooth */ /* CTX products */ #define USB_PRODUCT_CTX_EX1300 0x9999 /* Ex1300 hub */ @@ -630,14 +631,14 @@ #define USB_PRODUCT_CYPRESS_FMRADIO 0x1002 /* FM Radio */ /* Daisy Technology products */ -#define USB_PRODUCT_DAISY_DMC 0x6901 /* PhotoClip Camera */ +#define USB_PRODUCT_DAISY_DMC 0x6901 /* PhotoClip */ /* Dallas Semiconductor products */ #define USB_PRODUCT_DALLAS_J6502 0x4201 /* J-6502 speakers */ #define USB_PRODUCT_DALLAS_USB_FOB_IBUTTON 0x2490 /* USB-FOB/iBUTTON */ /* Diamond products */ -#define USB_PRODUCT_DIAMOND_RIO500USB 0x0001 /* Rio 500 USB */ +#define USB_PRODUCT_DIAMOND_RIO500USB 0x0001 /* Rio 500 */ /* Digi International products */ #define USB_PRODUCT_DIGI_ACCELEPORT2 0x0002 /* AccelePort 2 */ @@ -645,10 +646,10 @@ #define USB_PRODUCT_DIGI_ACCELEPORT8 0x0008 /* AccelePort 8 */ /* Digital Stream Corp. products */ -#define USB_PRODUCT_DIGITALSTREAM_PS2 0x0001 /* PS/2 Active Adapter */ +#define USB_PRODUCT_DIGITALSTREAM_PS2 0x0001 /* PS/2 Active */ /* D-Link products */ -/*product DLINK DSBS25 0x0100 DSB-S25 serial adapter*/ +/*product DLINK DSBS25 0x0100 DSB-S25 serial */ #define USB_PRODUCT_DLINK_DUBE100 0x1a00 /* 10/100 ethernet */ #define USB_PRODUCT_DLINK_DSB650TX4 0x200c /* 10/100 ethernet */ #define USB_PRODUCT_DLINK_DSB650C 0x4000 /* 10Mbps ethernet */ @@ -670,12 +671,12 @@ #define USB_PRODUCT_EIZO_MONITOR 0x0001 /* monitor */ /* Elecom products */ -#define USB_PRODUCT_ELECOM_MOUSE29UO 0x0002 /* mouse 29UO */ +#define USB_PRODUCT_ELECOM_MOUSE29UO 0x0002 /* 29UO */ #define USB_PRODUCT_ELECOM_LDUSBTX0 0x200c /* LD-USB/TX */ #define USB_PRODUCT_ELECOM_LDUSBTX1 0x4002 /* LD-USB/TX */ #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_UCSGT 0x5003 /* UC-SGT Serial */ #define USB_PRODUCT_ELECOM_LDUSBTX3 0xabc1 /* LD-USB/TX */ /* Elsa products */ @@ -683,17 +684,17 @@ #define USB_PRODUCT_ELSA_USB2ETHERNET 0x3000 /* Microlink USB2Ethernet */ /* Entrega products */ -#define USB_PRODUCT_ENTREGA_1S 0x0001 /* 1S serial connector */ -#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_1S 0x0001 /* 1S serial */ +#define USB_PRODUCT_ENTREGA_2S 0x0002 /* 2S serial */ +#define USB_PRODUCT_ENTREGA_1S25 0x0003 /* 1S25 serial */ +#define USB_PRODUCT_ENTREGA_4S 0x0004 /* 4S serial */ #define USB_PRODUCT_ENTREGA_E45 0x0005 /* E45 Ethernet */ -#define USB_PRODUCT_ENTREGA_CENTRONICS 0x0006 /* Centronics connector */ +#define USB_PRODUCT_ENTREGA_CENTRONICS 0x0006 /* Centronics */ #define USB_PRODUCT_ENTREGA_XX1 0x0008 /* Ethernet */ -#define USB_PRODUCT_ENTREGA_1S9 0x0093 /* 1S9 serial connector */ +#define USB_PRODUCT_ENTREGA_1S9 0x0093 /* 1S9 serial */ #define USB_PRODUCT_ENTREGA_EZUSB 0x8000 /* EZ-USB */ /*product ENTREGA SERIAL 0x8001 DB25 Serial connector*/ -#define USB_PRODUCT_ENTREGA_2U4S 0x8004 /* 2U4S serial connector/usb hub */ +#define USB_PRODUCT_ENTREGA_2U4S 0x8004 /* 2U4S serial */ #define USB_PRODUCT_ENTREGA_XX2 0x8005 /* Ethernet */ /*product ENTREGA SERIAL_DB9 0x8093 DB9 Serial connector*/ @@ -702,21 +703,21 @@ #define USB_PRODUCT_EPSON_PRINTER2 0x0002 /* ISD Smart Cable for Mac */ #define USB_PRODUCT_EPSON_PRINTER3 0x0003 /* ISD Smart Cable */ #define USB_PRODUCT_EPSON_PRINTER5 0x0005 /* USB Printer */ -#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 */ -#define USB_PRODUCT_EPSON_1600 0x0107 /* Expression 1600 scanner */ -#define USB_PRODUCT_EPSON_1640 0x010a /* Perfection 1640SU scanner */ -#define USB_PRODUCT_EPSON_1240 0x010b /* Perfection 1240U / 1240Photo scanner */ -#define USB_PRODUCT_EPSON_640U 0x010c /* Perfection 640U scanner */ -#define USB_PRODUCT_EPSON_1650 0x0110 /* Perfection 1650 scanner */ -#define USB_PRODUCT_EPSON_GT9700F 0x0112 /* GT-9700F scanner */ -#define USB_PRODUCT_EPSON_2400 0x011b /* Perfection 2400 scanner */ -#define USB_PRODUCT_EPSON_1260 0x011d /* Perfection 1260 scanner */ -#define USB_PRODUCT_EPSON_1660 0x011e /* Perfection 1660 scanner */ +#define USB_PRODUCT_EPSON_636 0x0101 /* Perfection 636U / 636Photo */ +#define USB_PRODUCT_EPSON_610 0x0103 /* Perfection 610 */ +#define USB_PRODUCT_EPSON_1200 0x0104 /* Perfection 1200U / 1200Photo */ +#define USB_PRODUCT_EPSON_1600 0x0107 /* Expression 1600 */ +#define USB_PRODUCT_EPSON_1640 0x010a /* Perfection 1640SU */ +#define USB_PRODUCT_EPSON_1240 0x010b /* Perfection 1240U / 1240Photo */ +#define USB_PRODUCT_EPSON_640U 0x010c /* Perfection 640U */ +#define USB_PRODUCT_EPSON_1650 0x0110 /* Perfection 1650 */ +#define USB_PRODUCT_EPSON_GT9700F 0x0112 /* GT-9700F */ +#define USB_PRODUCT_EPSON_2400 0x011b /* Perfection 2400 */ +#define USB_PRODUCT_EPSON_1260 0x011d /* Perfection 1260 */ +#define USB_PRODUCT_EPSON_1660 0x011e /* Perfection 1660 */ /* e-TEK Labs products */ -#define USB_PRODUCT_ETEK_1COM 0x8007 /* Serial port */ +#define USB_PRODUCT_ETEK_1COM 0x8007 /* Serial */ /* Extended Systems products */ #define USB_PRODUCT_EXTENDED_XTNDACCESS 0x0100 /* XTNDAccess IrDA */ @@ -729,11 +730,11 @@ #define USB_PRODUCT_FTDI_PS2KBDMS 0x8371 /* PS/2 Keyboard/Mouse */ #define USB_PRODUCT_FTDI_SERIAL_8U100AX 0x8372 /* 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_LCD_CFA631_USB 0xfc0c /* Crystalfontz CFA-631 USB LCD */ -#define USB_PRODUCT_FTDI_LCD_CFA632_USB 0xfc08 /* Crystalfontz CFA-632 USB LCD */ -#define USB_PRODUCT_FTDI_LCD_CFA633_USB 0xfc0b /* Crystalfontz CFA-633 USB LCD */ -#define USB_PRODUCT_FTDI_LCD_CFA634_USB 0xfc09 /* Crystalfontz CFA-634 USB LCD */ +#define USB_PRODUCT_FTDI_LCD_LK202_24_USB 0xfa03 /* Matrix Orbital LK202-24 LCD */ +#define USB_PRODUCT_FTDI_LCD_CFA631_USB 0xfc0c /* Crystalfontz CFA-631 LCD */ +#define USB_PRODUCT_FTDI_LCD_CFA632_USB 0xfc08 /* Crystalfontz CFA-632 LCD */ +#define USB_PRODUCT_FTDI_LCD_CFA633_USB 0xfc0b /* Crystalfontz CFA-633 LCD */ +#define USB_PRODUCT_FTDI_LCD_CFA634_USB 0xfc09 /* Crystalfontz CFA-634 LCD */ /* Fuji photo products */ #define USB_PRODUCT_FUJIPHOTO_MASS0100 0x0100 /* Mass Storage */ @@ -763,8 +764,8 @@ #define USB_PRODUCT_GUILLEMOT_DALEADER 0xa300 /* DA Leader */ /* Hagiwara products */ -#define USB_PRODUCT_HAGIWARA_FGSM 0x0002 /* FlashGate SmartMedia Reader */ -#define USB_PRODUCT_HAGIWARA_FGCF 0x0003 /* FlashGate CompactFlash Reader */ +#define USB_PRODUCT_HAGIWARA_FGSM 0x0002 /* FlashGate SmartMedia */ +#define USB_PRODUCT_HAGIWARA_FGCF 0x0003 /* FlashGate CompactFlash */ #define USB_PRODUCT_HAGIWARA_FG 0x0005 /* FlashGate */ /* Handspring, Inc. */ @@ -773,7 +774,7 @@ #define USB_PRODUCT_HANDSPRING_TREO600 0x0300 /* Handspring Treo 600 */ /* Hauppauge Computer Works */ -#define USB_PRODUCT_HAUPPAUGE_WINTV_USB_FM 0x4d12 /* WinTV USB FM */ +#define USB_PRODUCT_HAUPPAUGE_WINTV_USB_FM 0x4d12 /* WinTV FM */ /* Hitachi, Ltd. products */ #define USB_PRODUCT_HITACHI_DZMV100A 0x0004 /* DVD-CAM DZ-MV100A Camcorder */ @@ -815,8 +816,8 @@ #define USB_PRODUCT_HP2_C500 0x6002 /* PhotoSmart C500 */ /* IBM Corporation */ -#define USB_PRODUCT_IBM_OPTTRAVELMOUSE 0x3107 /* Optical Travel Mouse */ -#define USB_PRODUCT_IBM_USBCDROMDRIVE 0x4427 /* USB CD-ROM Drive */ +#define USB_PRODUCT_IBM_OPTTRAVELMOUSE 0x3107 /* Optical */ +#define USB_PRODUCT_IBM_USBCDROMDRIVE 0x4427 /* CD-ROM */ /* Iiyama products */ #define USB_PRODUCT_IIYAMA_HUB 0x0201 /* Hub */ @@ -835,7 +836,7 @@ #define USB_PRODUCT_INSIDEOUT_HUBPORT4 0x0008 /* Hubport/4 */ #define USB_PRODUCT_INSIDEOUT_EDGEPORT8HAND 0x0009 /* Hand-built Edgeport/8 */ #define USB_PRODUCT_INSIDEOUT_MULTIMODEM 0x000A /* MultiTech version of RP/4 */ -#define USB_PRODUCT_INSIDEOUT_EDGEPORTPPORT 0x000B /* Edgeport/(4)21 Parallel port */ +#define USB_PRODUCT_INSIDEOUT_EDGEPORTPPORT 0x000B /* Edgeport/(4)21 Parallel */ #define USB_PRODUCT_INSIDEOUT_EDGEPORT421 0x000C /* Edgeport/421 Hub+RS232+Parallel */ #define USB_PRODUCT_INSIDEOUT_EDGEPORT21 0x000D /* Edgeport/21 RS232+Parallel */ #define USB_PRODUCT_INSIDEOUT_EDGEPORT8DC 0x000E /* 1/2 Edgeport/8 */ @@ -848,18 +849,18 @@ #define USB_PRODUCT_INSIDEOUT_MT4X56USB 0x1403 /* OEM device */ /* In-System products */ -#define USB_PRODUCT_INSYSTEM_F5U002 0x0002 /* Parallel adapter */ -#define USB_PRODUCT_INSYSTEM_ATAPI 0x0031 /* ATAPI adapter */ -#define USB_PRODUCT_INSYSTEM_IDEUSB2 0x0060 /* USB2 Storage Adapter */ -#define USB_PRODUCT_INSYSTEM_ISD110 0x0200 /* IDE adapter ISD110 */ -#define USB_PRODUCT_INSYSTEM_ISD105 0x0202 /* IDE adapter ISD105 */ +#define USB_PRODUCT_INSYSTEM_F5U002 0x0002 /* Parallel */ +#define USB_PRODUCT_INSYSTEM_ATAPI 0x0031 /* ATAPI */ +#define USB_PRODUCT_INSYSTEM_IDEUSB2 0x0060 /* USB2 Storage */ +#define USB_PRODUCT_INSYSTEM_ISD110 0x0200 /* IDE ISD110 */ +#define USB_PRODUCT_INSYSTEM_ISD105 0x0202 /* IDE ISD105 */ #define USB_PRODUCT_INSYSTEM_DRIVEV2 0x0301 /* Portable USB Harddrive V2 */ #define USB_PRODUCT_INSYSTEM_DRIVEV2_5 0x0351 /* Portable USB Harddrive V2 */ #define USB_PRODUCT_INSYSTEM_USBCABLE 0x081a /* USB cable */ #define USB_PRODUCT_INSYSTEM_ADAPTERV2 0x5701 /* USB Storage Adapter V2 */ /* Intel products */ -#define USB_PRODUCT_INTEL_EASYPC_CAMERA 0x0110 /* Easy PC Camera */ +#define USB_PRODUCT_INTEL_EASYPC_CAMERA 0x0110 /* EasyPC */ #define USB_PRODUCT_INTEL_I2011B 0x1111 /* Wireless 2011B */ #define USB_PRODUCT_INTEL_TESTBOARD 0x9890 /* 82930 test board */ @@ -867,13 +868,13 @@ #define USB_PRODUCT_INTERSIL_PRISM_2X 0x3642 /* Prism2.x WLAN */ /* I/O DATA products */ -#define USB_PRODUCT_IODATA_USBSSMRW 0x0314 /* USB-SSMRW SD-card adapter */ -#define USB_PRODUCT_IODATA_USBSDRW 0x031e /* USB-SDRW SD-card adapter */ +#define USB_PRODUCT_IODATA_USBSSMRW 0x0314 /* USB-SSMRW SD-card */ +#define USB_PRODUCT_IODATA_USBSDRW 0x031e /* USB-SDRW SD-card */ #define USB_PRODUCT_IODATA_USBETT 0x0901 /* USB ETT */ #define USB_PRODUCT_IODATA_USBETTX 0x0904 /* USB ETTX */ #define USB_PRODUCT_IODATA_USBETTXS 0x0913 /* USB ETTX */ #define USB_PRODUCT_IODATA_USBWNB11 0x0922 /* USB Airport WN-B11 */ -#define USB_PRODUCT_IODATA_USBRSAQ 0x0a03 /* RSAQ1 Serial Adapter */ +#define USB_PRODUCT_IODATA_USBRSAQ 0x0a03 /* RSAQ1 Serial */ #define USB_PRODUCT_IODATA2_USB2SC 0x0a09 /* USB2.0-SCSI Bridge USB2-SC */ /* Iomega products */ @@ -888,16 +889,16 @@ #define USB_PRODUCT_IRIVER_IFP_5XX 0x1105 /* iFP-5xx */ /* Jaton products */ -#define USB_PRODUCT_JATON_EDA 0x5704 /* Ethernet Device Adapter */ +#define USB_PRODUCT_JATON_EDA 0x5704 /* Ethernet */ /* Jenoptik products */ -#define USB_PRODUCT_JENOPTIK_JD350 0x5300 /* JD 350 Camera/mp3 player */ +#define USB_PRODUCT_JENOPTIK_JD350 0x5300 /* JD 350 */ /* JRC products */ #define USB_PRODUCT_JRC_AH_J3001V_J3002V 0x0001 /* AirH\"PHONE AH-J3001V/J3002V */ /* JVC products */ -#define USB_PRODUCT_JVC_MP_XP7250_WL 0x3009 /* MP-XP7250 Builtin USB WLAN */ +#define USB_PRODUCT_JVC_MP_XP7250_WL 0x3009 /* MP-XP7250 Builtin WLAN */ /* Kawasaki LSI products */ #define USB_PRODUCT_KLSI_DUH3E10BT 0x0008 /* 10BT Ethernet */ @@ -911,37 +912,37 @@ #define USB_PRODUCT_KEISOKUGIKEN_USBDAQ 0x0068 /* HKS-0200 USBDAQ */ /* Kensington products */ -#define USB_PRODUCT_KENSINGTON_ORBIT 0x1003 /* Orbit USB/PS2 trackball */ +#define USB_PRODUCT_KENSINGTON_ORBIT 0x1003 /* Orbit trackball */ #define USB_PRODUCT_KENSINGTON_TURBOBALL 0x1005 /* TurboBall */ -#define USB_PRODUCT_KENSINGTON_ORBIT_MAC 0x1009 /* Orbit USB trackball for Mac */ +#define USB_PRODUCT_KENSINGTON_ORBIT_MAC 0x1009 /* Orbit trackball for Mac */ #define USB_PRODUCT_KENSINGTON_VIDEOCAM_VGA 0x5002 /* VideoCAM VGA */ /* Keyspan products */ -#define USB_PRODUCT_KEYSPAN_USA28_NF 0x0101 /* USA-28 serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA28X_NF 0x0102 /* USA-28X serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA19_NF 0x0103 /* USA-19 serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA18_NF 0x0104 /* USA-18 serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA18X_NF 0x0105 /* USA-18X serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA19W_NF 0x0106 /* USA-19W serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA19 0x0107 /* USA-19 serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA19W 0x0108 /* USA-19W serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA49W_NF 0x0109 /* USA-49W serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA49W 0x010a /* USA-49W serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA19QI_NF 0x010b /* USA-19QI serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA19QI 0x010c /* USA-19QI serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA19Q_NF 0x010d /* USA-19Q serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA19Q 0x010e /* USA-19Q serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA28 0x010f /* USA-28 serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA28XXB 0x0110 /* USA-28X/XB serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA18 0x0111 /* USA-18 serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA18X 0x0112 /* USA-18X serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA28XB_NF 0x0113 /* USA-28XB serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA28XA_NF 0x0114 /* USA-28XB serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA28XA 0x0115 /* USA-28XA serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA18XA_NF 0x0116 /* USA-18XA serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA18XA 0x0117 /* USA-18XA serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA19QW_NF 0x0118 /* USA-19WQ serial adapter */ -#define USB_PRODUCT_KEYSPAN_USA19QW 0x0119 /* USA-19WQ serial adapter */ +#define USB_PRODUCT_KEYSPAN_USA28_NF 0x0101 /* USA-28 serial */ +#define USB_PRODUCT_KEYSPAN_USA28X_NF 0x0102 /* USA-28X serial */ +#define USB_PRODUCT_KEYSPAN_USA19_NF 0x0103 /* USA-19 serial */ +#define USB_PRODUCT_KEYSPAN_USA18_NF 0x0104 /* USA-18 serial */ +#define USB_PRODUCT_KEYSPAN_USA18X_NF 0x0105 /* USA-18X serial */ +#define USB_PRODUCT_KEYSPAN_USA19W_NF 0x0106 /* USA-19W serial */ +#define USB_PRODUCT_KEYSPAN_USA19 0x0107 /* USA-19 serial */ +#define USB_PRODUCT_KEYSPAN_USA19W 0x0108 /* USA-19W serial */ +#define USB_PRODUCT_KEYSPAN_USA49W_NF 0x0109 /* USA-49W serial */ +#define USB_PRODUCT_KEYSPAN_USA49W 0x010a /* USA-49W serial */ +#define USB_PRODUCT_KEYSPAN_USA19QI_NF 0x010b /* USA-19QI serial */ +#define USB_PRODUCT_KEYSPAN_USA19QI 0x010c /* USA-19QI serial */ +#define USB_PRODUCT_KEYSPAN_USA19Q_NF 0x010d /* USA-19Q serial */ +#define USB_PRODUCT_KEYSPAN_USA19Q 0x010e /* USA-19Q serial */ +#define USB_PRODUCT_KEYSPAN_USA28 0x010f /* USA-28 serial */ +#define USB_PRODUCT_KEYSPAN_USA28XXB 0x0110 /* USA-28X/XB serial */ +#define USB_PRODUCT_KEYSPAN_USA18 0x0111 /* USA-18 serial */ +#define USB_PRODUCT_KEYSPAN_USA18X 0x0112 /* USA-18X serial */ +#define USB_PRODUCT_KEYSPAN_USA28XB_NF 0x0113 /* USA-28XB serial */ +#define USB_PRODUCT_KEYSPAN_USA28XA_NF 0x0114 /* USA-28XB serial */ +#define USB_PRODUCT_KEYSPAN_USA28XA 0x0115 /* USA-28XA serial */ +#define USB_PRODUCT_KEYSPAN_USA18XA_NF 0x0116 /* USA-18XA serial */ +#define USB_PRODUCT_KEYSPAN_USA18XA 0x0117 /* USA-18XA serial */ +#define USB_PRODUCT_KEYSPAN_USA19QW_NF 0x0118 /* USA-19WQ serial */ +#define USB_PRODUCT_KEYSPAN_USA19QW 0x0119 /* USA-19WQ serial */ #define USB_PRODUCT_KEYSPAN_UIA10 0x0201 /* UIA-10 remote control */ #define USB_PRODUCT_KEYSPAN_UIA11 0x0202 /* UIA-11 remote control */ @@ -959,20 +960,20 @@ #define USB_PRODUCT_KODAK_DX4900 0x0550 /* EasyShare DX4900 */ /* Konica Corp. Products */ -#define USB_PRODUCT_KONICA_CAMERA 0x0720 /* Digital Color Camera */ +#define USB_PRODUCT_KONICA_CAMERA 0x0720 /* Camera */ /* KYE products */ #define USB_PRODUCT_KYE_NICHE 0x0001 /* Niche mouse */ #define USB_PRODUCT_KYE_NETSCROLL 0x0003 /* Genius NetScroll mouse */ #define USB_PRODUCT_KYE_FLIGHT2000 0x1004 /* Flight 2000 joystick */ -#define USB_PRODUCT_KYE_VIVIDPRO 0x2001 /* ColorPage Vivid-Pro scanner */ +#define USB_PRODUCT_KYE_VIVIDPRO 0x2001 /* ColorPage Vivid-Pro */ /* LaCie products */ #define USB_PRODUCT_LACIE_HD 0xa601 /* Hard Disk */ #define USB_PRODUCT_LACIE_CDRW 0xa602 /* CD R/W */ /* Lexar products */ -#define USB_PRODUCT_LEXAR_JUMPSHOT 0x0001 /* jumpSHOT CompactFlash Reader */ +#define USB_PRODUCT_LEXAR_JUMPSHOT 0x0001 /* jumpSHOT CompactFlash */ /* Lexmark products */ #define USB_PRODUCT_LEXMARK_S2450 0x0009 /* Optra S 2450 */ @@ -1025,9 +1026,9 @@ /* MCT Corp. */ #define USB_PRODUCT_MCT_HUB0100 0x0100 /* Hub */ -#define USB_PRODUCT_MCT_DU_H3SP_USB232 0x0200 /* D-Link DU-H3SP USB BAY Hub */ -#define USB_PRODUCT_MCT_USB232 0x0210 /* USB-232 Interface */ -#define USB_PRODUCT_MCT_SITECOM_USB232 0x0230 /* Sitecom USB-232 Products */ +#define USB_PRODUCT_MCT_DU_H3SP_USB232 0x0200 /* D-Link DU-H3SP BAY Hub */ +#define USB_PRODUCT_MCT_USB232 0x0210 /* RS232 Interface */ +#define USB_PRODUCT_MCT_SITECOM_USB232 0x0230 /* Sitecom RS232 */ #define USB_PRODUCT_MCT_ML_4500 0x0302 /* ML-4500 */ /* Melco, Inc products */ @@ -1036,16 +1037,16 @@ #define USB_PRODUCT_MELCO_LUA2TX5 0x0009 /* LUA2-TX Ethernet */ #define USB_PRODUCT_MELCO_LUAKTX 0x0012 /* LUA-KTX Ethernet */ #define USB_PRODUCT_MELCO_S11 0x0016 /* WLI-USB-S11 */ -#define USB_PRODUCT_MELCO_MCRSM2 0x001b /* MCR-SM2 SmartMedia Card Reader/Writer */ +#define USB_PRODUCT_MELCO_MCRSM2 0x001b /* MCR-SM2 SmartMedia */ #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_KS11G 0x0027 /* WLI-USB-KS11G wlan */ #define USB_PRODUCT_MELCO_LUAU2KTX 0x003d /* LUA-U2-KTX Ethernet */ /* Metricom products */ #define USB_PRODUCT_METRICOM_RICOCHET_GS 0x0001 /* Ricochet GS */ /* Micro Star International products */ -#define USB_PRODUCT_MSI_BLUETOOTH 0x1967 /* Bluetooth USB Adapter */ +#define USB_PRODUCT_MSI_BLUETOOTH 0x1967 /* Bluetooth */ /* Microsoft products */ #define USB_PRODUCT_MICROSOFT_SIDEPREC 0x0008 /* SideWinder Precision Pro */ @@ -1059,16 +1060,16 @@ #define USB_PRODUCT_MICROSOFT_MN510 0x006e /* MN510 Wireless */ /* Microtech products */ -#define USB_PRODUCT_MICROTECH_SCSIDB25 0x0004 /* USB-SCSI-DB25 */ -#define USB_PRODUCT_MICROTECH_SCSIHD50 0x0005 /* USB-SCSI-HD50 */ -#define USB_PRODUCT_MICROTECH_DPCM 0x0006 /* USB CameraMate */ -#define USB_PRODUCT_MICROTECH_FREECOM 0xfc01 /* Freecom USB-IDE */ +#define USB_PRODUCT_MICROTECH_SCSIDB25 0x0004 /* SCSI-DB25 */ +#define USB_PRODUCT_MICROTECH_SCSIHD50 0x0005 /* SCSI-HD50 */ +#define USB_PRODUCT_MICROTECH_DPCM 0x0006 /* CameraMate */ +#define USB_PRODUCT_MICROTECH_FREECOM 0xfc01 /* Freecom IDE */ /* Microtek products */ -#define USB_PRODUCT_MICROTEK_336CX 0x0094 /* Phantom 336CX - C3 scanner */ +#define USB_PRODUCT_MICROTEK_336CX 0x0094 /* Phantom 336CX - C3 */ #define USB_PRODUCT_MICROTEK_X6U 0x0099 /* ScanMaker X6 - X6U */ -#define USB_PRODUCT_MICROTEK_C6 0x009a /* Phantom C6 scanner */ -#define USB_PRODUCT_MICROTEK_336CX2 0x00a0 /* Phantom 336CX - C3 scanner */ +#define USB_PRODUCT_MICROTEK_C6 0x009a /* Phantom C6 */ +#define USB_PRODUCT_MICROTEK_336CX2 0x00a0 /* Phantom 336CX - C3 */ #define USB_PRODUCT_MICROTEK_V6USL 0x00a3 /* ScanMaker V6USL */ #define USB_PRODUCT_MICROTEK_V6USL2 0x80a3 /* ScanMaker V6USL */ #define USB_PRODUCT_MICROTEK_V6UL 0x80ac /* ScanMaker V6UL */ @@ -1095,22 +1096,22 @@ /* Motorola products */ #define USB_PRODUCT_MOTOROLA_MC141555 0x1555 /* MC141555 hub controller */ -#define USB_PRODUCT_MOTOROLA_SB4100 0x4100 /* SB4100 USB Cable Modem */ +#define USB_PRODUCT_MOTOROLA_SB4100 0x4100 /* SB4100 Cable Modem */ /* MultiTech products */ #define USB_PRODUCT_MULTITECH_ATLAS 0xf101 /* MT5634ZBA modem */ /* 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 scanner */ -#define USB_PRODUCT_MUSTEK_1200UB 0x0006 /* 1200 UB scanner */ -#define USB_PRODUCT_MUSTEK_1200USBPLUS 0x0007 /* 1200 Plus scanner */ -#define USB_PRODUCT_MUSTEK_1200CUPLUS 0x0008 /* 1200 CU Plus scanner */ -#define USB_PRODUCT_MUSTEK_BEARPAW1200F 0x0010 /* BearPaw 1200F scanner */ -#define USB_PRODUCT_MUSTEK_600USB 0x0873 /* 600 scanner */ -#define USB_PRODUCT_MUSTEK_MDC800 0xa800 /* MDC-800 digital camera */ -#define USB_PRODUCT_MUSTEK_DV2000 0xc441 /* DV2000 digital camera */ +#define USB_PRODUCT_MUSTEK_1200CU 0x0001 /* 1200 CU */ +#define USB_PRODUCT_MUSTEK_600CU 0x0002 /* 600 CU */ +#define USB_PRODUCT_MUSTEK_1200USB 0x0003 /* 1200 */ +#define USB_PRODUCT_MUSTEK_1200UB 0x0006 /* 1200 UB */ +#define USB_PRODUCT_MUSTEK_1200USBPLUS 0x0007 /* 1200 Plus */ +#define USB_PRODUCT_MUSTEK_1200CUPLUS 0x0008 /* 1200 CU Plus */ +#define USB_PRODUCT_MUSTEK_BEARPAW1200F 0x0010 /* BearPaw 1200F */ +#define USB_PRODUCT_MUSTEK_600USB 0x0873 /* 600 */ +#define USB_PRODUCT_MUSTEK_MDC800 0xa800 /* MDC-800 */ +#define USB_PRODUCT_MUSTEK_DV2000 0xc441 /* DV2000 */ /* M-Systems products */ #define USB_PRODUCT_MSYSTEMS_DISKONKEY 0x0010 /* DiskOnKey */ @@ -1142,37 +1143,37 @@ #define USB_PRODUCT_NETGEAR_EA101 0x1001 /* Ethernet */ #define USB_PRODUCT_NETGEAR_EA101X 0x1002 /* Ethernet */ #define USB_PRODUCT_NETGEAR_FA101 0x1020 /* 10/100 Ethernet */ -#define USB_PRODUCT_NETGEAR_FA120 0x1040 /* USB 2.0 Fast Ethernet Adapter */ -#define USB_PRODUCT_NETGEAR_MA111NA 0x4110 /* 802.11b Adapter */ +#define USB_PRODUCT_NETGEAR_FA120 0x1040 /* USB 2.0 Fast Ethernet */ +#define USB_PRODUCT_NETGEAR_MA111NA 0x4110 /* 802.11b */ /* Nikon products */ -#define USB_PRODUCT_NIKON_E990 0x0102 /* Digital Camera E990 */ -#define USB_PRODUCT_NIKON_E880 0x0103 /* Digital Camera E880 */ -#define USB_PRODUCT_NIKON_E885 0x0105 /* Digital Camera E885 */ +#define USB_PRODUCT_NIKON_E990 0x0102 /* E990 */ +#define USB_PRODUCT_NIKON_E880 0x0103 /* E880 */ +#define USB_PRODUCT_NIKON_E885 0x0105 /* E885 */ /* NHJ product */ #define USB_PRODUCT_NHJ_CAM2 0x9120 /* Camera */ /* Olympus products */ -#define USB_PRODUCT_OLYMPUS_C1 0x0102 /* C-1 Digital Camera */ +#define USB_PRODUCT_OLYMPUS_C1 0x0102 /* C-1 */ #define USB_PRODUCT_OLYMPUS_C700 0x0105 /* C-700 Ultra Zoom */ /* OmniVision Technologies, Inc. products */ -#define USB_PRODUCT_OMNIVISION_OV511 0x0511 /* OV511 Camera */ -#define USB_PRODUCT_OMNIVISION_OV511PLUS 0xa511 /* OV511+ Camera */ +#define USB_PRODUCT_OMNIVISION_OV511 0x0511 /* OV511 */ +#define USB_PRODUCT_OMNIVISION_OV511PLUS 0xa511 /* OV511+ */ /* OnSpec Electronic, Inc. */ #define USB_PRODUCT_ONSPEC_MD2 0x0103 /* disk */ -#define USB_PRODUCT_ONSPEC_MDCFEB 0xa000 /* MDCFE-B USB CF Reader */ -#define USB_PRODUCT_ONSPEC_SIIGMS 0xa001 /* Memory Stick+CF Reader/Writer */ -#define USB_PRODUCT_ONSPEC_DATAFAB3 0xa003 /* Datafab-based Reader */ -#define USB_PRODUCT_ONSPEC_DATAFAB4 0xa004 /* Datafab-based Reader */ -#define USB_PRODUCT_ONSPEC_PNYCFSM 0xa005 /* PNY/Datafab CF+SM Reader */ -#define USB_PRODUCT_ONSPEC_STECHCFSM 0xa006 /* Simple Tech/Datafab CF+SM Reader */ +#define USB_PRODUCT_ONSPEC_MDCFEB 0xa000 /* MDCFE-B CF */ +#define USB_PRODUCT_ONSPEC_SIIGMS 0xa001 /* Memory Stick+CF */ +#define USB_PRODUCT_ONSPEC_DATAFAB3 0xa003 /* Datafab-based */ +#define USB_PRODUCT_ONSPEC_DATAFAB4 0xa004 /* Datafab-based */ +#define USB_PRODUCT_ONSPEC_PNYCFSM 0xa005 /* PNY/Datafab CF+SM */ +#define USB_PRODUCT_ONSPEC_STECHCFSM 0xa006 /* Simple Tech/Datafab CF+SM */ #define USB_PRODUCT_ONSPEC_LC1 0xa109 /* CF + SM Combo (LC1) */ -#define USB_PRODUCT_ONSPEC_MD1II 0xb006 /* Datafab MD1-II PC-Card Reader */ +#define USB_PRODUCT_ONSPEC_MD1II 0xb006 /* Datafab MD1-II PC-Card */ -#define USB_PRODUCT_ONSPEC2_8IN2 0xb012 /* 8In2 Reader */ +#define USB_PRODUCT_ONSPEC2_8IN2 0xb012 /* 8In2 */ /* Ours Technology Inc. */ #define USB_PRODUCT_OTI_SOLID 0x6803 /* Solid state disk */ @@ -1190,13 +1191,13 @@ #define USB_PRODUCT_PALM_ZIRE 0x0070 /* Palm Zire */ /* Panasonic products */ -#define USB_PRODUCT_PANASONIC_LS120 0x0901 /* LS-120 Camera */ -#define USB_PRODUCT_PANASONIC_SDCAAE 0x1b00 /* MultiMediaCard Adapter */ +#define USB_PRODUCT_PANASONIC_LS120 0x0901 /* LS-120 */ +#define USB_PRODUCT_PANASONIC_SDCAAE 0x1b00 /* MultiMediaCard */ /* Pen Driver */ -#define USB_PRODUCT_PEN_USBREADER 0x0240 /* USB 6 in 1 reader */ -#define USB_PRODUCT_PEN_MOBILEDRIVE 0x0280 /* USB 3 in 1 reader */ -#define USB_PRODUCT_PEN_USBDISK 0x0d7d /* USB Disk */ +#define USB_PRODUCT_PEN_USBREADER 0x0240 /* 6 in 1 */ +#define USB_PRODUCT_PEN_MOBILEDRIVE 0x0280 /* 3 in 1 */ +#define USB_PRODUCT_PEN_USBDISK 0x0d7d /* Disk */ /* Peracom products */ #define USB_PRODUCT_PERACOM_SERIAL1 0x0001 /* Serial Converter */ @@ -1208,26 +1209,26 @@ #define USB_PRODUCT_PHILIPS_DSS350 0x0101 /* DSS 350 Digital Speaker System */ #define USB_PRODUCT_PHILIPS_DSS 0x0104 /* DSS XXX Digital Speaker System */ #define USB_PRODUCT_PHILIPS_HUB 0x0201 /* hub */ -#define USB_PRODUCT_PHILIPS_PCA645VC 0x0302 /* PCA645VC PC Camera */ -#define USB_PRODUCT_PHILIPS_PCA646VC 0x0303 /* PCA646VC PC Camera */ -#define USB_PRODUCT_PHILIPS_PCVC675K 0x0307 /* PCVC675K Vesta PC Camera */ -#define USB_PRODUCT_PHILIPS_PCVC680K 0x0308 /* PCVC680K Vesta Pro PC Camera */ +#define USB_PRODUCT_PHILIPS_PCA645VC 0x0302 /* PCA645VC */ +#define USB_PRODUCT_PHILIPS_PCA646VC 0x0303 /* PCA646VC */ +#define USB_PRODUCT_PHILIPS_PCVC675K 0x0307 /* PCVC675K Vesta */ +#define USB_PRODUCT_PHILIPS_PCVC680K 0x0308 /* PCVC680K Vesta Pro */ #define USB_PRODUCT_PHILIPS_PCVC690K 0x030c /* PCVC690K Vesta Pro Scan Camera */ -#define USB_PRODUCT_PHILIPS_PCVC730K 0x0310 /* PCVC730K ToUCam Fun PC Camera */ -#define USB_PRODUCT_PHILIPS_PCVC740K 0x0311 /* PCVC740K ToUCam Pro PC Camera */ -#define USB_PRODUCT_PHILIPS_PCVC750K 0x0312 /* PCVC750K ToUCam Pro Scan Camera */ +#define USB_PRODUCT_PHILIPS_PCVC730K 0x0310 /* PCVC730K ToUCam Fun */ +#define USB_PRODUCT_PHILIPS_PCVC740K 0x0311 /* PCVC740K ToUCam Pro PC */ +#define USB_PRODUCT_PHILIPS_PCVC750K 0x0312 /* PCVC750K ToUCam Pro Scan */ #define USB_PRODUCT_PHILIPS_DSS150 0x0471 /* DSS 150 Digital Speaker System */ -#define USB_PRODUCT_PHILIPS_DIVAUSB 0x1801 /* DIVA USB mp3 player */ +#define USB_PRODUCT_PHILIPS_DIVAUSB 0x1801 /* DIVA mp3 player */ /* Philips Semiconductor products */ #define USB_PRODUCT_PHILIPSSEMI_HUB1122 0x1122 /* hub */ /* P.I. Engineering products */ -#define USB_PRODUCT_PIENGINEERING_PS2USB 0x020b /* PS2 to Mac Adapter */ +#define USB_PRODUCT_PIENGINEERING_PS2USB 0x020b /* PS2 to Mac */ #define USB_PRODUCT_PIENGINEERING_XKEYS 0x0233 /* Xkeys Programmable Keyboard */ /* Pilotech Systems Co., Ltd products */ -#define USB_PRODUCT_PILOTECH_CRW600 0x0001 /* CRW-600 6-in-1 Reader */ +#define USB_PRODUCT_PILOTECH_CRW600 0x0001 /* CRW-600 6-in-1 */ /* Plantronics products */ #define USB_PRODUCT_PLANTRONICS_HEADSET 0x0ca1 /* Platronics DSP-400 Headset */ @@ -1246,19 +1247,19 @@ #define USB_PRODUCT_PQI_TRAVELFLASH 0x0001 /* Travel Flash Drive */ /* Primax products */ -#define USB_PRODUCT_PRIMAX_G2X300 0x0300 /* G2-200 scanner */ -#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 9600 scanner */ -#define USB_PRODUCT_PRIMAX_600U 0x0341 /* Colorado 600u scanner */ -#define USB_PRODUCT_PRIMAX_6200 0x0345 /* Visioneer 6200 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_G2X300 0x0300 /* G2-200 */ +#define USB_PRODUCT_PRIMAX_G2E300 0x0301 /* G2E-300 */ +#define USB_PRODUCT_PRIMAX_G2300 0x0302 /* G2-300 */ +#define USB_PRODUCT_PRIMAX_G2E3002 0x0303 /* G2E-300 */ +#define USB_PRODUCT_PRIMAX_9600 0x0340 /* Colorado 9600 */ +#define USB_PRODUCT_PRIMAX_600U 0x0341 /* Colorado 600u */ +#define USB_PRODUCT_PRIMAX_6200 0x0345 /* Visioneer 6200 */ +#define USB_PRODUCT_PRIMAX_19200 0x0360 /* Colorado 19200 */ +#define USB_PRODUCT_PRIMAX_1200U 0x0361 /* Colorado 1200u */ +#define USB_PRODUCT_PRIMAX_G600 0x0380 /* G2-600 */ #define USB_PRODUCT_PRIMAX_636I 0x0381 /* ReadyScan 636i */ -#define USB_PRODUCT_PRIMAX_G2600 0x0382 /* G2-600 scanner */ -#define USB_PRODUCT_PRIMAX_G2E600 0x0383 /* G2E-600 scanner */ +#define USB_PRODUCT_PRIMAX_G2600 0x0382 /* G2-600 */ +#define USB_PRODUCT_PRIMAX_G2E600 0x0383 /* G2E-600 */ #define USB_PRODUCT_PRIMAX_COMFORT 0x4d01 /* Comfort */ #define USB_PRODUCT_PRIMAX_MOUSEINABOX 0x4d02 /* Mouse-in-a-Box */ #define USB_PRODUCT_PRIMAX_PCGAUMS1 0x4d04 /* Sony PCGA-UMS1 */ @@ -1266,8 +1267,8 @@ /* Prolific products */ #define USB_PRODUCT_PROLIFIC_PL2301 0x0000 /* PL2301 Host-Host interface */ #define USB_PRODUCT_PROLIFIC_PL2302 0x0001 /* PL2302 Host-Host interface */ -#define USB_PRODUCT_PROLIFIC_RSAQ2 0x04bb /* PL2303 Serial adapter */ -#define USB_PRODUCT_PROLIFIC_PL2303 0x2303 /* PL2303 Serial adapter */ +#define USB_PRODUCT_PROLIFIC_RSAQ2 0x04bb /* PL2303 Serial */ +#define USB_PRODUCT_PROLIFIC_PL2303 0x2303 /* PL2303 Serial */ #define USB_PRODUCT_PROLIFIC_PL2305 0x2305 /* Parallel printer */ #define USB_PRODUCT_PROLIFIC_ATAPI4 0x2307 /* ATAPI-4 Bridge Controller */ @@ -1284,7 +1285,7 @@ #define USB_PRODUCT_RAINBOW_IKEY2000 0x1200 /* i-Key 2000 */ /* RATOC Systems products */ -#define USB_PRODUCT_RATOC_REXUSB60 0xb000 /* USB serial adapter REX-USB60 */ +#define USB_PRODUCT_RATOC_REXUSB60 0xb000 /* USB serial REX-USB60 */ /* Roland products */ #define USB_PRODUCT_ROLAND_UA100 0x0000 /* UA-100 Audio I/F */ @@ -1322,11 +1323,11 @@ #define USB_PRODUCT_SANWASUPPLY_JYDV9USB 0x9806 /* JY-DV9USB gamepad */ /* Sanyo Electric products */ -#define USB_PRODUCT_SANYO_SCP4900 0x0701 /* Sanyo SCP-4900 USB Phone */ +#define USB_PRODUCT_SANYO_SCP4900 0x0701 /* Sanyo SCP-4900 Phone */ /* ScanLogic products */ #define USB_PRODUCT_SCANLOGIC_SL11R 0x0002 /* SL11R-IDE */ -#define USB_PRODUCT_SCANLOGIC_336CX 0x0300 /* Phantom 336CX - C3 scanner */ +#define USB_PRODUCT_SCANLOGIC_336CX 0x0300 /* Phantom 336CX - C3 */ /* Serverworks */ #define USB_PRODUCT_SERVERWORKS_HUB 0x0000 /* Root Hub */ @@ -1341,26 +1342,26 @@ #define USB_PRODUCT_SHUTTLE_EUSB 0x0001 /* E-USB Bridge */ #define USB_PRODUCT_SHUTTLE_EUSCSI 0x0002 /* eUSCSI Bridge */ #define USB_PRODUCT_SHUTTLE_SDDR09 0x0003 /* ImageMate SDDR09 */ -#define USB_PRODUCT_SHUTTLE_EUSBSMCF 0x0005 /* eUSB SmartMedia / CompactFlash Adapter */ -#define USB_PRODUCT_SHUTTLE_ZIOMMC 0x0006 /* eUSB MultiMediaCard Adapter */ +#define USB_PRODUCT_SHUTTLE_EUSBSMCF 0x0005 /* eUSB SmartMedia / CompactFlash */ +#define USB_PRODUCT_SHUTTLE_ZIOMMC 0x0006 /* eUSB MultiMediaCard */ #define USB_PRODUCT_SHUTTLE_HIFD 0x0007 /* Sony Hifd */ -#define USB_PRODUCT_SHUTTLE_EUSBATAPI 0x0009 /* eUSB ATA/ATAPI Adapter */ -#define USB_PRODUCT_SHUTTLE_CF 0x000a /* eUSB CompactFlash Adapter */ +#define USB_PRODUCT_SHUTTLE_EUSBATAPI 0x0009 /* eUSB ATA/ATAPI */ +#define USB_PRODUCT_SHUTTLE_CF 0x000a /* eUSB CompactFlash */ #define USB_PRODUCT_SHUTTLE_EUSCSI_B 0x000b /* eUSCSI Bridge */ #define USB_PRODUCT_SHUTTLE_EUSCSI_C 0x000c /* eUSCSI Bridge */ #define USB_PRODUCT_SHUTTLE_CDRW 0x0101 /* CD-RW Device */ #define USB_PRODUCT_SHUTTLE_SCM 0x1010 /* SCM Micro */ /* Siemens products */ -#define USB_PRODUCT_SIEMENS_SPEEDSTREAM 0x1001 /* SpeedStream USB */ -#define USB_PRODUCT_SIEMENS_SPEEDSTREAM22 0x1022 /* SpeedStream USB 1022 */ +#define USB_PRODUCT_SIEMENS_SPEEDSTREAM 0x1001 /* SpeedStream */ +#define USB_PRODUCT_SIEMENS_SPEEDSTREAM22 0x1022 /* SpeedStream 1022 */ /* Sigmatel products */ #define USB_PRODUCT_SIGMATEL_IRDA 0x4200 /* IrDA */ #define USB_PRODUCT_SIGMATEL_DNSSF7X 0x8020 /* Datum Networks SSF-7X Multi Players */ /* SIIG products */ -#define USB_PRODUCT_SIIG_DIGIFILMREADER 0x0004 /* DigiFilm-Combo Reader */ +#define USB_PRODUCT_SIIG_DIGIFILMREADER 0x0004 /* DigiFilm-Combo */ #define USB_PRODUCT_SIIG_MULTICARDREADER 0x0201 /* MULTICARDREADER */ /* Silicon Portals Inc. */ @@ -1368,20 +1369,20 @@ #define USB_PRODUCT_SILICONPORTALS_YAPPHONE 0x0201 /* YAP Phone */ /* Sirius Technologies products */ -#define USB_PRODUCT_SIRIUS_ROADSTER 0x0001 /* NetComm Roadster II 56 USB */ +#define USB_PRODUCT_SIRIUS_ROADSTER 0x0001 /* NetComm Roadster II 56 */ /* Sitecom products */ #define USB_PRODUCT_SITECOM_CN104 0x2068 /* CN104 */ /* SmartBridges products */ #define USB_PRODUCT_SMARTBRIDGES_SMARTLINK 0x0001 /* SmartLink Ethernet */ -#define USB_PRODUCT_SMARTBRIDGES_SMARTNIC 0x0003 /* smartNIC 2 PnP Adapter */ +#define USB_PRODUCT_SMARTBRIDGES_SMARTNIC 0x0003 /* smartNIC 2 PnP */ /* SMC products */ #define USB_PRODUCT_SMC_2102USB 0x0100 /* 10Mbps Ethernet */ #define USB_PRODUCT_SMC_2202USB 0x0200 /* 10/100 Ethernet */ #define USB_PRODUCT_SMC_2206USB 0x0201 /* EZ Connect Ethernet */ -#define USB_PRODUCT_SMC2_2020HUB 0x2020 /* USB Hub */ +#define USB_PRODUCT_SMC2_2020HUB 0x2020 /* Hub */ /* SOHOware products */ #define USB_PRODUCT_SOHOWARE_NUB100 0x9100 /* 10/100 Ethernet */ @@ -1424,15 +1425,15 @@ #define USB_PRODUCT_SUNTAC_IS96U 0x000a /* SUNTAC Ir-Trinity */ /* Sun Microsystems products */ -#define USB_PRODUCT_SUN_KEYBOARD 0x0005 /* Type 6 USB */ +#define USB_PRODUCT_SUN_KEYBOARD 0x0005 /* Type 6 */ /* XXX The above is a North American PC style keyboard possibly */ -#define USB_PRODUCT_SUN_MOUSE 0x0100 /* Type 6 USB mouse */ +#define USB_PRODUCT_SUN_MOUSE 0x0100 /* Type 6 */ /* Supra products */ #define USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K 0x07da /* Supra Express 56K */ #define USB_PRODUCT_DIAMOND2_SUPRA2890 0x0b4a /* SupraMax 2890 56K */ #define USB_PRODUCT_DIAMOND2_RIO600USB 0x5001 /* Rio 600 */ -#define USB_PRODUCT_DIAMOND2_RIO800USB 0x5002 /* Rio 800 USB */ +#define USB_PRODUCT_DIAMOND2_RIO800USB 0x5002 /* Rio 800 */ #define USB_PRODUCT_DIAMOND2_PSAPLAY120 0x5003 /* Nike psa[play 120 */ /* Susteen, Inc. products */ @@ -1465,7 +1466,7 @@ #define USB_PRODUCT_THRUST_FUSION_PAD 0xa0a3 /* Fusion Digital Gamepad */ /* Todos Data System products */ -#define USB_PRODUCT_TODOS_ARGOS_MINI 0x0002 /* Argos Mini Smartcard Reader */ +#define USB_PRODUCT_TODOS_ARGOS_MINI 0x0002 /* Argos Mini Smartcard */ /* Trek Technology products */ #define USB_PRODUCT_TREK_THUMBDRIVE 0x1111 /* ThumbDrive */ @@ -1475,16 +1476,19 @@ #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 */ +#define USB_PRODUCT_ULTIMA_1200UBPLUS 0x4002 /* 1200 UB Plus */ /* UMAX products */ -#define USB_PRODUCT_UMAX_ASTRA1236U 0x0002 /* Astra 1236U Scanner */ -#define USB_PRODUCT_UMAX_ASTRA1220U 0x0010 /* Astra 1220U Scanner */ -#define USB_PRODUCT_UMAX_ASTRA2000U 0x0030 /* Astra 2000U Scanner */ -#define USB_PRODUCT_UMAX_ASTRA2100U 0x0130 /* Astra 2100U Scanner */ -#define USB_PRODUCT_UMAX_ASTRA2200U 0x0230 /* Astra 2200U Scanner */ -#define USB_PRODUCT_UMAX_ASTRA3400 0x0060 /* Astra 3400 Scanner */ +#define USB_PRODUCT_UMAX_ASTRA1236U 0x0002 /* Astra 1236U */ +#define USB_PRODUCT_UMAX_ASTRA1220U 0x0010 /* Astra 1220U */ +#define USB_PRODUCT_UMAX_ASTRA2000U 0x0030 /* Astra 2000U */ +#define USB_PRODUCT_UMAX_ASTRA2100U 0x0130 /* Astra 2100U */ +#define USB_PRODUCT_UMAX_ASTRA2200U 0x0230 /* Astra 2200U */ +#define USB_PRODUCT_UMAX_ASTRA3400 0x0060 /* Astra 3400 */ /* Universal Access products */ #define USB_PRODUCT_UNIACCESS_PANACHE 0x0101 /* Panache Surf ISDN */ @@ -1502,7 +1506,7 @@ #define USB_PRODUCT_VISIONEER_8600 0x0331 /* OneTouch 8600 */ /* Vivitar products */ -#define USB_PRODUCT_VIVITAR_DSC350 0x0003 /* DSC350 Camera */ +#define USB_PRODUCT_VIVITAR_DSC350 0x0003 /* DSC350 */ /* Wacom products */ #define USB_PRODUCT_WACOM_CT0405U 0x0000 /* CT-0405-U Tablet */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index 0295572e35e..bb214b113e0 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.91 2004/06/27 19:44:29 deraadt Exp $ */ +/* $OpenBSD: usbdevs_data.h,v 1.92 2004/07/04 23:12:24 deraadt Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.88 2004/06/27 19:44:19 deraadt Exp + * OpenBSD: usbdevs,v 1.89 2004/07/04 23:12:18 deraadt Exp */ /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ @@ -50,13 +50,13 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_3COM, USB_PRODUCT_3COM_HOMECONN, 0, "3Com", - "HomeConnect Camera", + "HomeConnect", }, { USB_VENDOR_3COM, USB_PRODUCT_3COM_3CREB96, 0, "3Com", - "Bluetooth USB Adapter", + "Bluetooth", }, { USB_VENDOR_3COM, USB_PRODUCT_3COM_3C19250, @@ -98,7 +98,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_HOMECONN, 0, "U.S. Robotics", - "3Com HomeConnect camera", + "3Com HomeConnect", }, { USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_USR56K, @@ -224,7 +224,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ATAPI, 0, "Acer Peripherals", - "ATA/ATAPI adapter", + "ATA/ATAPI", }, { USB_VENDOR_ACTIONTEC, USB_PRODUCT_ACTIONTEC_PRISM_25, @@ -422,7 +422,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_AOX, USB_PRODUCT_AOX_USB101, 0, "AOX", - "Ethernet controller engine", + "Ethernet", }, { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_OPTMOUSE, @@ -458,7 +458,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC1284, 0, "ATEN International", - "Parallel adapter", + "Parallel", }, { USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC10T, @@ -470,7 +470,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC232A, 0, "ATEN International", - "Serial adapter", + "Serial", }, { USB_VENDOR_ATEN, USB_PRODUCT_ATEN_DSB650C, @@ -500,7 +500,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_DWL120, 0, "Atmel", - "DWL-120 Wireless adapter", + "DWL-120 Wireless", }, { USB_VENDOR_AUDIOTECHNICA, USB_PRODUCT_AUDIOTECHNICA_ATCHA4USB, @@ -518,31 +518,31 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_AVISION, USB_PRODUCT_AVISION_1200U, 0, "Avision", - "1200U scanner", + "1200U", }, { USB_VENDOR_BELKIN2, USB_PRODUCT_BELKIN2_F5U002, 0, "Belkin Components", - "F5U002 Parallel adapter", + "F5U002 Parallel", }, { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U103, 0, "Belkin Components", - "F5U103 Serial adapter", + "F5U103 Serial", }, { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U109, 0, "Belkin Components", - "F5U109 Serial adapter", + "F5U109 Serial", }, { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_SCSI, 0, "Belkin Components", - "SCSI Adaptor", + "SCSI", }, { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_USB2LAN, @@ -680,7 +680,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_CASIO, USB_PRODUCT_CASIO_QV, 0, "CASIO", - "QV DigitalCamera", + "QV", }, { USB_VENDOR_CASIO, USB_PRODUCT_CASIO_BE300, @@ -722,7 +722,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_CHIC, USB_PRODUCT_CHIC_CYPRESS, 0, "Chic Technology", - "Cypress USB Mouse", + "Cypress", }, { USB_VENDOR_CHICONY, USB_PRODUCT_CHICONY_KB8933, @@ -818,7 +818,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_COREGA, USB_PRODUCT_COREGA_WLANUSB, 0, "Corega", - "Wireless LAN USB Stick-11", + "Wireless LAN Stick-11", }, { USB_VENDOR_CREATIVE, USB_PRODUCT_CREATIVE_NOMAD_II, @@ -836,7 +836,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_CSR, USB_PRODUCT_CSR_BLUETOOTH, 0, "Cambridge Silicon Radio", - "Bluetooth USB Adapter", + "Bluetooth", }, { USB_VENDOR_CTX, USB_PRODUCT_CTX_EX1300, @@ -872,7 +872,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_DAISY, USB_PRODUCT_DAISY_DMC, 0, "Daisy Technology", - "PhotoClip Camera", + "PhotoClip", }, { USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502, @@ -890,7 +890,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_DIAMOND, USB_PRODUCT_DIAMOND_RIO500USB, 0, "Diamond", - "Rio 500 USB", + "Rio 500", }, { USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT2, @@ -914,7 +914,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_DIGITALSTREAM, USB_PRODUCT_DIGITALSTREAM_PS2, 0, "Digital Stream", - "PS/2 Active Adapter", + "PS/2 Active", }, { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUBE100, @@ -998,7 +998,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_MOUSE29UO, 0, "Elecom", - "mouse 29UO", + "29UO", }, { USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX0, @@ -1028,7 +1028,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_UCSGT, 0, "Elecom", - "UC-SGT serial adapter", + "UC-SGT Serial", }, { USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX3, @@ -1052,25 +1052,25 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_1S, 0, "Entrega", - "1S serial connector", + "1S serial", }, { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_2S, 0, "Entrega", - "2S serial connector", + "2S serial", }, { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_1S25, 0, "Entrega", - "1S25 serial connector", + "1S25 serial", }, { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_4S, 0, "Entrega", - "4S serial connector", + "4S serial", }, { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_E45, @@ -1082,7 +1082,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_CENTRONICS, 0, "Entrega", - "Centronics connector", + "Centronics", }, { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_XX1, @@ -1094,7 +1094,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_1S9, 0, "Entrega", - "1S9 serial connector", + "1S9 serial", }, { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_EZUSB, @@ -1106,7 +1106,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_2U4S, 0, "Entrega", - "2U4S serial connector/usb hub", + "2U4S serial", }, { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_XX2, @@ -1142,79 +1142,79 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_636, 0, "Seiko Epson", - "Perfection 636U / 636Photo scanner", + "Perfection 636U / 636Photo", }, { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_610, 0, "Seiko Epson", - "Perfection 610 scanner", + "Perfection 610", }, { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1200, 0, "Seiko Epson", - "Perfection 1200U / 1200Photo scanner", + "Perfection 1200U / 1200Photo", }, { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1600, 0, "Seiko Epson", - "Expression 1600 scanner", + "Expression 1600", }, { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1640, 0, "Seiko Epson", - "Perfection 1640SU scanner", + "Perfection 1640SU", }, { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1240, 0, "Seiko Epson", - "Perfection 1240U / 1240Photo scanner", + "Perfection 1240U / 1240Photo", }, { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_640U, 0, "Seiko Epson", - "Perfection 640U scanner", + "Perfection 640U", }, { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1650, 0, "Seiko Epson", - "Perfection 1650 scanner", + "Perfection 1650", }, { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9700F, 0, "Seiko Epson", - "GT-9700F scanner", + "GT-9700F", }, { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_2400, 0, "Seiko Epson", - "Perfection 2400 scanner", + "Perfection 2400", }, { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1260, 0, "Seiko Epson", - "Perfection 1260 scanner", + "Perfection 1260", }, { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1660, 0, "Seiko Epson", - "Perfection 1660 scanner", + "Perfection 1660", }, { USB_VENDOR_ETEK, USB_PRODUCT_ETEK_1COM, 0, "e-TEK Labs", - "Serial port", + "Serial", }, { USB_VENDOR_EXTENDED, USB_PRODUCT_EXTENDED_XTNDACCESS, @@ -1256,31 +1256,31 @@ 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_CFA631_USB, 0, "Future Technology Devices", - "Crystalfontz CFA-631 USB LCD", + "Crystalfontz CFA-631 LCD", }, { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA632_USB, 0, "Future Technology Devices", - "Crystalfontz CFA-632 USB LCD", + "Crystalfontz CFA-632 LCD", }, { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA633_USB, 0, "Future Technology Devices", - "Crystalfontz CFA-633 USB LCD", + "Crystalfontz CFA-633 LCD", }, { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA634_USB, 0, "Future Technology Devices", - "Crystalfontz CFA-634 USB LCD", + "Crystalfontz CFA-634 LCD", }, { USB_VENDOR_FUJIPHOTO, USB_PRODUCT_FUJIPHOTO_MASS0100, @@ -1352,13 +1352,13 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FGSM, 0, "Hagiwara Sys-Com", - "FlashGate SmartMedia Reader", + "FlashGate SmartMedia", }, { USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FGCF, 0, "Hagiwara Sys-Com", - "FlashGate CompactFlash Reader", + "FlashGate CompactFlash", }, { USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FG, @@ -1388,7 +1388,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_HAUPPAUGE, USB_PRODUCT_HAUPPAUGE_WINTV_USB_FM, 0, "Hauppauge Computer Works", - "WinTV USB FM", + "WinTV FM", }, { USB_VENDOR_HITACHI, USB_PRODUCT_HITACHI_DZMV100A, @@ -1592,13 +1592,13 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_IBM, USB_PRODUCT_IBM_OPTTRAVELMOUSE, 0, "IBM", - "Optical Travel Mouse", + "Optical", }, { USB_VENDOR_IBM, USB_PRODUCT_IBM_USBCDROMDRIVE, 0, "IBM", - "USB CD-ROM Drive", + "CD-ROM", }, { USB_VENDOR_IIYAMA, USB_PRODUCT_IIYAMA_HUB, @@ -1676,7 +1676,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORTPPORT, 0, "Inside Out Networks", - "Edgeport/(4)21 Parallel port", + "Edgeport/(4)21 Parallel", }, { USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT421, @@ -1742,31 +1742,31 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_F5U002, 0, "In-System Design", - "Parallel adapter", + "Parallel", }, { USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ATAPI, 0, "In-System Design", - "ATAPI adapter", + "ATAPI", }, { USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_IDEUSB2, 0, "In-System Design", - "USB2 Storage Adapter", + "USB2 Storage", }, { USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ISD110, 0, "In-System Design", - "IDE adapter ISD110", + "IDE ISD110", }, { USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ISD105, 0, "In-System Design", - "IDE adapter ISD105", + "IDE ISD105", }, { USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_DRIVEV2, @@ -1796,7 +1796,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_INTEL, USB_PRODUCT_INTEL_EASYPC_CAMERA, 0, "Intel", - "Easy PC Camera", + "EasyPC", }, { USB_VENDOR_INTEL, USB_PRODUCT_INTEL_I2011B, @@ -1820,13 +1820,13 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBSSMRW, 0, "I/O Data", - "USB-SSMRW SD-card adapter", + "USB-SSMRW SD-card", }, { USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBSDRW, 0, "I/O Data", - "USB-SDRW SD-card adapter", + "USB-SDRW SD-card", }, { USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETT, @@ -1856,7 +1856,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBRSAQ, 0, "I/O Data", - "RSAQ1 Serial Adapter", + "RSAQ1 Serial", }, { USB_VENDOR_IODATA2, USB_PRODUCT_IODATA2_USB2SC, @@ -1910,13 +1910,13 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_JATON, USB_PRODUCT_JATON_EDA, 0, "Jaton", - "Ethernet Device Adapter", + "Ethernet", }, { USB_VENDOR_JENOPTIK, USB_PRODUCT_JENOPTIK_JD350, 0, "Jenoptik", - "JD 350 Camera/mp3 player", + "JD 350", }, { USB_VENDOR_JRC, USB_PRODUCT_JRC_AH_J3001V_J3002V, @@ -1928,7 +1928,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_JVC, USB_PRODUCT_JVC_MP_XP7250_WL, 0, "JVC", - "MP-XP7250 Builtin USB WLAN", + "MP-XP7250 Builtin WLAN", }, { USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BT, @@ -1964,7 +1964,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_ORBIT, 0, "Kensington", - "Orbit USB/PS2 trackball", + "Orbit trackball", }, { USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_TURBOBALL, @@ -1976,7 +1976,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_ORBIT_MAC, 0, "Kensington", - "Orbit USB trackball for Mac", + "Orbit trackball for Mac", }, { USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_VIDEOCAM_VGA, @@ -1988,151 +1988,151 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28_NF, 0, "Keyspan", - "USA-28 serial adapter", + "USA-28 serial", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28X_NF, 0, "Keyspan", - "USA-28X serial adapter", + "USA-28X serial", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19_NF, 0, "Keyspan", - "USA-19 serial adapter", + "USA-19 serial", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18_NF, 0, "Keyspan", - "USA-18 serial adapter", + "USA-18 serial", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18X_NF, 0, "Keyspan", - "USA-18X serial adapter", + "USA-18X serial", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19W_NF, 0, "Keyspan", - "USA-19W serial adapter", + "USA-19W serial", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19, 0, "Keyspan", - "USA-19 serial adapter", + "USA-19 serial", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19W, 0, "Keyspan", - "USA-19W serial adapter", + "USA-19W serial", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA49W_NF, 0, "Keyspan", - "USA-49W serial adapter", + "USA-49W serial", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA49W, 0, "Keyspan", - "USA-49W serial adapter", + "USA-49W serial", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19QI_NF, 0, "Keyspan", - "USA-19QI serial adapter", + "USA-19QI serial", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19QI, 0, "Keyspan", - "USA-19QI serial adapter", + "USA-19QI serial", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19Q_NF, 0, "Keyspan", - "USA-19Q serial adapter", + "USA-19Q serial", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19Q, 0, "Keyspan", - "USA-19Q serial adapter", + "USA-19Q serial", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28, 0, "Keyspan", - "USA-28 serial adapter", + "USA-28 serial", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28XXB, 0, "Keyspan", - "USA-28X/XB serial adapter", + "USA-28X/XB serial", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18, 0, "Keyspan", - "USA-18 serial adapter", + "USA-18 serial", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18X, 0, "Keyspan", - "USA-18X serial adapter", + "USA-18X serial", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28XB_NF, 0, "Keyspan", - "USA-28XB serial adapter", + "USA-28XB serial", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28XA_NF, 0, "Keyspan", - "USA-28XB serial adapter", + "USA-28XB serial", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28XA, 0, "Keyspan", - "USA-28XA serial adapter", + "USA-28XA serial", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18XA_NF, 0, "Keyspan", - "USA-18XA serial adapter", + "USA-18XA serial", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA18XA, 0, "Keyspan", - "USA-18XA serial adapter", + "USA-18XA serial", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19QW_NF, 0, "Keyspan", - "USA-19WQ serial adapter", + "USA-19WQ serial", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19QW, 0, "Keyspan", - "USA-19WQ serial adapter", + "USA-19WQ serial", }, { USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_UIA10, @@ -2204,7 +2204,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_KONICA, USB_PRODUCT_KONICA_CAMERA, 0, "Konica", - "Digital Color Camera", + "Camera", }, { USB_VENDOR_KYE, USB_PRODUCT_KYE_NICHE, @@ -2228,7 +2228,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_KYE, USB_PRODUCT_KYE_VIVIDPRO, 0, "KYE Systems", - "ColorPage Vivid-Pro scanner", + "ColorPage Vivid-Pro", }, { USB_VENDOR_LACIE, USB_PRODUCT_LACIE_HD, @@ -2246,7 +2246,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_LEXAR, USB_PRODUCT_LEXAR_JUMPSHOT, 0, "Lexar Media", - "jumpSHOT CompactFlash Reader", + "jumpSHOT CompactFlash", }, { USB_VENDOR_LEXMARK, USB_PRODUCT_LEXMARK_S2450, @@ -2492,19 +2492,19 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_MCT, USB_PRODUCT_MCT_DU_H3SP_USB232, 0, "MCT", - "D-Link DU-H3SP USB BAY Hub", + "D-Link DU-H3SP BAY Hub", }, { USB_VENDOR_MCT, USB_PRODUCT_MCT_USB232, 0, "MCT", - "USB-232 Interface", + "RS232 Interface", }, { USB_VENDOR_MCT, USB_PRODUCT_MCT_SITECOM_USB232, 0, "MCT", - "Sitecom USB-232 Products", + "Sitecom RS232", }, { USB_VENDOR_MCT, USB_PRODUCT_MCT_ML_4500, @@ -2546,7 +2546,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_MCRSM2, 0, "Melco", - "MCR-SM2 SmartMedia Card Reader/Writer", + "MCR-SM2 SmartMedia", }, { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_DUBPXXG, @@ -2558,7 +2558,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KS11G, 0, "Melco", - "WLI-USB-KS11G USB-wlan", + "WLI-USB-KS11G wlan", }, { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUAU2KTX, @@ -2576,7 +2576,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_MSI, USB_PRODUCT_MSI_BLUETOOTH, 0, "Micro Star International", - "Bluetooth USB Adapter", + "Bluetooth", }, { USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_SIDEPREC, @@ -2636,31 +2636,31 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_SCSIDB25, 0, "Microtech", - "USB-SCSI-DB25", + "SCSI-DB25", }, { USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_SCSIHD50, 0, "Microtech", - "USB-SCSI-HD50", + "SCSI-HD50", }, { USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_DPCM, 0, "Microtech", - "USB CameraMate", + "CameraMate", }, { USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_FREECOM, 0, "Microtech", - "Freecom USB-IDE", + "Freecom IDE", }, { USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_336CX, 0, "Microtek", - "Phantom 336CX - C3 scanner", + "Phantom 336CX - C3", }, { USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_X6U, @@ -2672,13 +2672,13 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_C6, 0, "Microtek", - "Phantom C6 scanner", + "Phantom C6", }, { USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_336CX2, 0, "Microtek", - "Phantom 336CX - C3 scanner", + "Phantom 336CX - C3", }, { USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6USL, @@ -2768,7 +2768,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_MOTOROLA, USB_PRODUCT_MOTOROLA_SB4100, 0, "Motorola", - "SB4100 USB Cable Modem", + "SB4100 Cable Modem", }, { USB_VENDOR_MULTITECH, USB_PRODUCT_MULTITECH_ATLAS, @@ -2780,61 +2780,61 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CU, 0, "Mustek Systems", - "1200 CU scanner", + "1200 CU", }, { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_600CU, 0, "Mustek Systems", - "600 CU scanner", + "600 CU", }, { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200USB, 0, "Mustek Systems", - "1200 scanner", + "1200", }, { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200UB, 0, "Mustek Systems", - "1200 UB scanner", + "1200 UB", }, { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200USBPLUS, 0, "Mustek Systems", - "1200 Plus scanner", + "1200 Plus", }, { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CUPLUS, 0, "Mustek Systems", - "1200 CU Plus scanner", + "1200 CU Plus", }, { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_BEARPAW1200F, 0, "Mustek Systems", - "BearPaw 1200F scanner", + "BearPaw 1200F", }, { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_600USB, 0, "Mustek Systems", - "600 scanner", + "600", }, { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_MDC800, 0, "Mustek Systems", - "MDC-800 digital camera", + "MDC-800", }, { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_DV2000, 0, "Mustek Systems", - "DV2000 digital camera", + "DV2000", }, { USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY, @@ -2930,31 +2930,31 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_FA120, 0, "BayNETGEAR", - "USB 2.0 Fast Ethernet Adapter", + "USB 2.0 Fast Ethernet", }, { USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_MA111NA, 0, "BayNETGEAR", - "802.11b Adapter", + "802.11b", }, { USB_VENDOR_NIKON, USB_PRODUCT_NIKON_E990, 0, "Nikon", - "Digital Camera E990", + "E990", }, { USB_VENDOR_NIKON, USB_PRODUCT_NIKON_E880, 0, "Nikon", - "Digital Camera E880", + "E880", }, { USB_VENDOR_NIKON, USB_PRODUCT_NIKON_E885, 0, "Nikon", - "Digital Camera E885", + "E885", }, { USB_VENDOR_NHJ, USB_PRODUCT_NHJ_CAM2, @@ -2966,7 +2966,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_OLYMPUS, USB_PRODUCT_OLYMPUS_C1, 0, "Olympus", - "C-1 Digital Camera", + "C-1", }, { USB_VENDOR_OLYMPUS, USB_PRODUCT_OLYMPUS_C700, @@ -2978,13 +2978,13 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_OMNIVISION, USB_PRODUCT_OMNIVISION_OV511, 0, "OmniVision", - "OV511 Camera", + "OV511", }, { USB_VENDOR_OMNIVISION, USB_PRODUCT_OMNIVISION_OV511PLUS, 0, "OmniVision", - "OV511+ Camera", + "OV511+", }, { USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_MD2, @@ -2996,37 +2996,37 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_MDCFEB, 0, "OnSpec Electronic", - "MDCFE-B USB CF Reader", + "MDCFE-B CF", }, { USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_SIIGMS, 0, "OnSpec Electronic", - "Memory Stick+CF Reader/Writer", + "Memory Stick+CF", }, { USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_DATAFAB3, 0, "OnSpec Electronic", - "Datafab-based Reader", + "Datafab-based", }, { USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_DATAFAB4, 0, "OnSpec Electronic", - "Datafab-based Reader", + "Datafab-based", }, { USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_PNYCFSM, 0, "OnSpec Electronic", - "PNY/Datafab CF+SM Reader", + "PNY/Datafab CF+SM", }, { USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_STECHCFSM, 0, "OnSpec Electronic", - "Simple Tech/Datafab CF+SM Reader", + "Simple Tech/Datafab CF+SM", }, { USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_LC1, @@ -3038,13 +3038,13 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_MD1II, 0, "OnSpec Electronic", - "Datafab MD1-II PC-Card Reader", + "Datafab MD1-II PC-Card", }, { USB_VENDOR_ONSPEC2, USB_PRODUCT_ONSPEC2_8IN2, 0, "OnSpec", - "8In2 Reader", + "8In2", }, { USB_VENDOR_OTI, USB_PRODUCT_OTI_SOLID, @@ -3116,31 +3116,31 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_LS120, 0, "Panasonic (Matsushita)", - "LS-120 Camera", + "LS-120", }, { USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_SDCAAE, 0, "Panasonic (Matsushita)", - "MultiMediaCard Adapter", + "MultiMediaCard", }, { USB_VENDOR_PEN, USB_PRODUCT_PEN_USBREADER, 0, "Pen Drive", - "USB 6 in 1 reader", + "6 in 1", }, { USB_VENDOR_PEN, USB_PRODUCT_PEN_MOBILEDRIVE, 0, "Pen Drive", - "USB 3 in 1 reader", + "3 in 1", }, { USB_VENDOR_PEN, USB_PRODUCT_PEN_USBDISK, 0, "Pen Drive", - "USB Disk", + "Disk", }, { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1, @@ -3188,25 +3188,25 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCA645VC, 0, "Philips", - "PCA645VC PC Camera", + "PCA645VC", }, { USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCA646VC, 0, "Philips", - "PCA646VC PC Camera", + "PCA646VC", }, { USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC675K, 0, "Philips", - "PCVC675K Vesta PC Camera", + "PCVC675K Vesta", }, { USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC680K, 0, "Philips", - "PCVC680K Vesta Pro PC Camera", + "PCVC680K Vesta Pro", }, { USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC690K, @@ -3218,19 +3218,19 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC730K, 0, "Philips", - "PCVC730K ToUCam Fun PC Camera", + "PCVC730K ToUCam Fun", }, { USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC740K, 0, "Philips", - "PCVC740K ToUCam Pro PC Camera", + "PCVC740K ToUCam Pro PC", }, { USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC750K, 0, "Philips", - "PCVC750K ToUCam Pro Scan Camera", + "PCVC750K ToUCam Pro Scan", }, { USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DSS150, @@ -3242,7 +3242,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DIVAUSB, 0, "Philips", - "DIVA USB mp3 player", + "DIVA mp3 player", }, { USB_VENDOR_PHILIPSSEMI, USB_PRODUCT_PHILIPSSEMI_HUB1122, @@ -3254,7 +3254,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_PIENGINEERING, USB_PRODUCT_PIENGINEERING_PS2USB, 0, "P.I. Engineering", - "PS2 to Mac Adapter", + "PS2 to Mac", }, { USB_VENDOR_PIENGINEERING, USB_PRODUCT_PIENGINEERING_XKEYS, @@ -3266,7 +3266,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_PILOTECH, USB_PRODUCT_PILOTECH_CRW600, 0, "Pilotech", - "CRW-600 6-in-1 Reader", + "CRW-600 6-in-1", }, { USB_VENDOR_PLANTRONICS, USB_PRODUCT_PLANTRONICS_HEADSET, @@ -3308,61 +3308,61 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2X300, 0, "Primax Electronics", - "G2-200 scanner", + "G2-200", }, { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E300, 0, "Primax Electronics", - "G2E-300 scanner", + "G2E-300", }, { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2300, 0, "Primax Electronics", - "G2-300 scanner", + "G2-300", }, { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E3002, 0, "Primax Electronics", - "G2E-300 scanner", + "G2E-300", }, { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_9600, 0, "Primax Electronics", - "Colorado 9600 scanner", + "Colorado 9600", }, { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_600U, 0, "Primax Electronics", - "Colorado 600u scanner", + "Colorado 600u", }, { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_6200, 0, "Primax Electronics", - "Visioneer 6200 scanner", + "Visioneer 6200", }, { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_19200, 0, "Primax Electronics", - "Colorado 19200 scanner", + "Colorado 19200", }, { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_1200U, 0, "Primax Electronics", - "Colorado 1200u scanner", + "Colorado 1200u", }, { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G600, 0, "Primax Electronics", - "G2-600 scanner", + "G2-600", }, { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_636I, @@ -3374,13 +3374,13 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2600, 0, "Primax Electronics", - "G2-600 scanner", + "G2-600", }, { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E600, 0, "Primax Electronics", - "G2E-600 scanner", + "G2E-600", }, { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_COMFORT, @@ -3416,13 +3416,13 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_RSAQ2, 0, "Prolific Technology", - "PL2303 Serial adapter", + "PL2303 Serial", }, { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303, 0, "Prolific Technology", - "PL2303 Serial adapter", + "PL2303 Serial", }, { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2305, @@ -3464,7 +3464,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60, 0, "RATOC Systems", - "USB serial adapter REX-USB60", + "USB serial REX-USB60", }, { USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UA100, @@ -3620,7 +3620,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_SANYO, USB_PRODUCT_SANYO_SCP4900, 0, "Sanyo Electric", - "Sanyo SCP-4900 USB Phone", + "Sanyo SCP-4900 Phone", }, { USB_VENDOR_SCANLOGIC, USB_PRODUCT_SCANLOGIC_SL11R, @@ -3632,7 +3632,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_SCANLOGIC, USB_PRODUCT_SCANLOGIC_336CX, 0, "ScanLogic", - "Phantom 336CX - C3 scanner", + "Phantom 336CX - C3", }, { USB_VENDOR_SERVERWORKS, USB_PRODUCT_SERVERWORKS_HUB, @@ -3674,13 +3674,13 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSBSMCF, 0, "Shuttle Technology", - "eUSB SmartMedia / CompactFlash Adapter", + "eUSB SmartMedia / CompactFlash", }, { USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_ZIOMMC, 0, "Shuttle Technology", - "eUSB MultiMediaCard Adapter", + "eUSB MultiMediaCard", }, { USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_HIFD, @@ -3692,13 +3692,13 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSBATAPI, 0, "Shuttle Technology", - "eUSB ATA/ATAPI Adapter", + "eUSB ATA/ATAPI", }, { USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_CF, 0, "Shuttle Technology", - "eUSB CompactFlash Adapter", + "eUSB CompactFlash", }, { USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSCSI_B, @@ -3728,13 +3728,13 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM, 0, "Siemens", - "SpeedStream USB", + "SpeedStream", }, { USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM22, 0, "Siemens", - "SpeedStream USB 1022", + "SpeedStream 1022", }, { USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_IRDA, @@ -3752,7 +3752,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_SIIG, USB_PRODUCT_SIIG_DIGIFILMREADER, 0, "SIIG", - "DigiFilm-Combo Reader", + "DigiFilm-Combo", }, { USB_VENDOR_SIIG, USB_PRODUCT_SIIG_MULTICARDREADER, @@ -3776,7 +3776,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_SIRIUS, USB_PRODUCT_SIRIUS_ROADSTER, 0, "Sirius Technologies", - "NetComm Roadster II 56 USB", + "NetComm Roadster II 56", }, { USB_VENDOR_SITECOM, USB_PRODUCT_SITECOM_CN104, @@ -3794,7 +3794,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTNIC, 0, "SmartBridges", - "smartNIC 2 PnP Adapter", + "smartNIC 2 PnP", }, { USB_VENDOR_SMC, USB_PRODUCT_SMC_2102USB, @@ -3818,7 +3818,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_2020HUB, 0, "Standard Microsystems", - "USB Hub", + "Hub", }, { USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB100, @@ -3980,13 +3980,13 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_SUN, USB_PRODUCT_SUN_KEYBOARD, 0, "Sun Microsystems", - "Type 6 USB", + "Type 6", }, { USB_VENDOR_SUN, USB_PRODUCT_SUN_MOUSE, 0, "Sun Microsystems", - "Type 6 USB mouse", + "Type 6", }, { USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K, @@ -4010,7 +4010,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_RIO800USB, 0, "Diamond (Supra)", - "Rio 800 USB", + "Rio 800", }, { USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_PSAPLAY120, @@ -4100,7 +4100,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_TODOS, USB_PRODUCT_TODOS_ARGOS_MINI, 0, "Todos Data System", - "Argos Mini Smartcard Reader", + "Argos Mini Smartcard", }, { USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE, @@ -4127,46 +4127,52 @@ const struct usb_knowndev usb_knowndevs[] = { "XXX 1100", }, { + USB_VENDOR_TSUNAMI, USB_PRODUCT_TSUNAMI_SM2000, + 0, + "Tsunami", + "SM-2000", + }, + { USB_VENDOR_ULTIMA, USB_PRODUCT_ULTIMA_1200UBPLUS, 0, "Ultima", - "1200 UB Plus scanner", + "1200 UB Plus", }, { USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1236U, 0, "UMAX Data Systems", - "Astra 1236U Scanner", + "Astra 1236U", }, { USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1220U, 0, "UMAX Data Systems", - "Astra 1220U Scanner", + "Astra 1220U", }, { USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2000U, 0, "UMAX Data Systems", - "Astra 2000U Scanner", + "Astra 2000U", }, { USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2100U, 0, "UMAX Data Systems", - "Astra 2100U Scanner", + "Astra 2100U", }, { USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2200U, 0, "UMAX Data Systems", - "Astra 2200U Scanner", + "Astra 2200U", }, { USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA3400, 0, "UMAX Data Systems", - "Astra 3400 Scanner", + "Astra 3400", }, { USB_VENDOR_UNIACCESS, USB_PRODUCT_UNIACCESS_PANACHE, @@ -4226,7 +4232,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_VIVITAR, USB_PRODUCT_VIVITAR_DSC350, 0, "Vivitar", - "DSC350 Camera", + "DSC350", }, { USB_VENDOR_WACOM, USB_PRODUCT_WACOM_CT0405U, @@ -4663,7 +4669,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_TOSHIBAAM, 0, USB_KNOWNDEV_NOPROD, - "Toshiba America Electronic Components", + "Toshiba America", NULL, }, { @@ -6107,6 +6113,12 @@ const struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_TSUNAMI, 0, + USB_KNOWNDEV_NOPROD, + "Tsunami", + NULL, + }, + { USB_VENDOR_BELKIN2, 0, USB_KNOWNDEV_NOPROD, "Belkin Components", |