diff options
author | Nathan Binkert <nate@cvs.openbsd.org> | 2003-05-16 17:54:25 +0000 |
---|---|---|
committer | Nathan Binkert <nate@cvs.openbsd.org> | 2003-05-16 17:54:25 +0000 |
commit | e0a64c4130f1d2431ed4831e6423e395a8db4e2c (patch) | |
tree | 7ea1e989f7a8feb78a5767a18777f5a5daeb40eb /sys | |
parent | ce51377f695fac7cc4bdec160a20127431acd2eb (diff) |
sync
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/usb/usbdevs.h | 97 | ||||
-rw-r--r-- | sys/dev/usb/usbdevs_data.h | 374 |
2 files changed, 454 insertions, 17 deletions
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index a2a96b78823..a70f8ee10ca 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -1,12 +1,12 @@ -/* $OpenBSD: usbdevs.h,v 1.63 2003/03/14 18:04:41 todd Exp $ */ +/* $OpenBSD: usbdevs.h,v 1.64 2003/05/16 17:54:24 nate Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.60 2003/03/14 18:04:23 todd Exp + * OpenBSD: usbdevs,v 1.61 2003/05/16 17:54:07 nate Exp */ -/* $NetBSD: usbdevs,v 1.280 2002/11/05 12:13:40 cjs Exp $ */ +/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -99,9 +99,11 @@ #define USB_VENDOR_LOGITECH 0x046d /* Logitech */ #define USB_VENDOR_BTC 0x046e /* Behavior Tech. Computer */ #define USB_VENDOR_PHILIPS 0x0471 /* Philips */ +#define USB_VENDOR_SANYO 0x0474 /* Sanyo Electric */ #define USB_VENDOR_CONNECTIX 0x0478 /* Connectix */ #define USB_VENDOR_KENSINGTON 0x047d /* Kensington */ #define USB_VENDOR_LUCENT 0x047e /* Lucent */ +#define USB_VENDOR_PLANTRONICS 0x047f /* Plantronics */ #define USB_VENDOR_STMICRO 0x0483 /* STMicroelectronics */ #define USB_VENDOR_YAMAHA 0x0499 /* YAMAHA */ #define USB_VENDOR_COMPAQ 0x049f /* Compaq */ @@ -223,7 +225,7 @@ #define USB_VENDOR_ACARD 0x0678 /* ACARD Technology */ #define USB_VENDOR_PROLIFIC 0x067b /* Prolific Technology */ #define USB_VENDOR_SIEMENS 0x067c /* Siemens */ -#define USB_VENDOR_ADVANCELOGIC 0x0680 /* Avance Logic */ +#define USB_VENDOR_AVANCELOGIC 0x0680 /* Avance Logic */ #define USB_VENDOR_MINOLTA 0x0686 /* Minolta */ #define USB_VENDOR_CHPRODUCTS 0x068e /* CH Products */ #define USB_VENDOR_HAGIWARA 0x0693 /* Hagiwara Sys-Com */ @@ -248,12 +250,14 @@ #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 */ #define USB_VENDOR_JENOPTIK 0x0784 /* Jenoptik */ #define USB_VENDOR_BRIMAX 0x078e /* Brimax */ #define USB_VENDOR_AXIS 0x0792 /* Axis Communications */ #define USB_VENDOR_ABL 0x0794 /* ABL Electronics */ +#define USB_VENDOR_SUNCOMM 0x079c /* Sun Communications, Inc. */ #define USB_VENDOR_ALFADATA 0x079d /* Alfadata Computer */ #define USB_VENDOR_NATIONALTECH 0x07a2 /* National Technical Systems */ #define USB_VENDOR_ONNTO 0x07a3 /* Onnto */ @@ -326,6 +330,7 @@ #define USB_VENDOR_ARESCOM 0x09f5 /* ARESCOM */ #define USB_VENDOR_BAY 0x09f9 /* Bay Associates */ #define USB_VENDOR_ALTERA 0x09fb /* Altera */ +#define USB_VENDOR_CSR 0x0a12 /* Cambridge Silicon Radio */ #define USB_VENDOR_TREK 0x0a16 /* Trek Technology */ #define USB_VENDOR_ASAHIOPTICAL 0x0a17 /* Asahi Optical */ #define USB_VENDOR_BOCASYSTEMS 0x0a43 /* Boca Systems */ @@ -337,6 +342,7 @@ #define USB_VENDOR_NEC2 0x0b62 /* NEC */ #define USB_VENDOR_ATI2 0x0b6f /* ATI */ #define USB_VENDOR_KURUSUGAWA 0x0b7e /* Kurusugawa Electronics, Inc. */ +#define USB_VENDOR_ASIX 0x0b95 /* ASIX Electronics */ #define USB_VENDOR_GREENHOUSE2 0x0bda /* GREENHOUSE */ #define USB_VENDOR_ADDONICS2 0x0bf6 /* Addonics Technology */ #define USB_VENDOR_AGATE 0x0c08 /* Agate Technologies */ @@ -344,10 +350,14 @@ #define USB_VENDOR_EASYDISK 0x0c76 /* EasyDisk */ #define USB_VENDOR_TANGTOP 0x0d3d /* Tangtop */ #define USB_VENDOR_PEN 0x0d7d /* Pen Drive */ +#define USB_VENDOR_OTI 0x0ea0 /* Ours Technology Inc. */ +#define USB_VENDOR_PILOTECH 0x0eaf /* Pilotech */ #define USB_VENDOR_MOTOROLA 0x1063 /* Motorola */ #define USB_VENDOR_CCYU 0x1065 /* CCYU Technology */ #define USB_VENDOR_PLX 0x10b5 /* PLX */ #define USB_VENDOR_ASANTE 0x10bd /* Asante */ +#define USB_VENDOR_JRC 0x1145 /* Japan Radio Company */ +#define USB_VENDOR_ACERCM 0x1189 /* Acer Communications & Multimedia */ #define USB_VENDOR_BELKIN2 0x1293 /* Belkin Components */ #define USB_VENDOR_MOBILITY 0x1342 /* Mobility */ #define USB_VENDOR_SHARK 0x13d2 /* Shark */ @@ -358,8 +368,11 @@ #define USB_VENDOR_ENTREGA 0x1645 /* Entrega */ #define USB_VENDOR_ACTIONTEC 0x1668 /* Actiontec Electronics */ #define USB_VENDOR_DLINK 0x2001 /* D-Link */ +#define USB_VENDOR_NHJ 0x2770 /* NHJ */ #define USB_VENDOR_PQI 0x3538 /* PQI */ #define USB_VENDOR_DAISY 0x3579 /* Daisy Technology */ +#define USB_VENDOR_NI 0x3923 /* National Instruments */ +#define USB_VENDOR_IODATA2 0x40bb /* I-O Data */ #define USB_VENDOR_INTEL 0x8086 /* Intel */ #define USB_VENDOR_HP2 0xf003 /* Hewlett Packard */ @@ -403,6 +416,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 */ /* Actiontec products */ #define USB_PRODUCT_ACTIONTEC_PRISM_25 0x0408 /* Prism2.5 WLAN */ @@ -475,6 +489,9 @@ /* Asante products */ #define USB_PRODUCT_ASANTE_EA 0x1427 /* Ethernet */ +/* ASIX Electronics products */ +#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_UC10T 0x2002 /* 10Mbps Ethernet */ @@ -492,6 +509,9 @@ /* Audio-Technica products */ #define USB_PRODUCT_AUDIOTECHNICA_ATCHA4USB 0x0009 /* ATC-HA4USB USB headphone */ +/* Avance Logic products */ +#define USB_PRODUCT_AVANCELOGIC_USBAUDIO 0x0100 /* USB Audio Speaker */ + /* Avision products */ #define USB_PRODUCT_AVISION_1200U 0x0268 /* 1200U scanner */ @@ -499,6 +519,7 @@ /*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_BELKIN_USB2LAN 0x0121 /* USB to LAN Converter */ #define USB_PRODUCT_BELKIN_F5U120 0x1203 /* F5U120-PC Hub */ @@ -521,6 +542,7 @@ /* Canon, Inc. products */ #define USB_PRODUCT_CANON_N656U 0x2206 /* CANOSCAN N656U */ +#define USB_PRODUCT_CANON_N670U 0x220d /* CANOSCAN N670U */ #define USB_PRODUCT_CANON_S10 0x3041 /* PowerShot S10 */ #define USB_PRODUCT_CANON_S20 0x3043 /* PowerShot S20 */ #define USB_PRODUCT_CANON_S100_US 0x3045 /* PowerShot S100 */ @@ -580,6 +602,9 @@ #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 */ + /* CTX products */ #define USB_PRODUCT_CTX_EX1300 0x9999 /* Ex1300 hub */ @@ -609,6 +634,7 @@ /* D-Link products */ /*product DLINK DSBS25 0x0100 DSB-S25 serial adapter*/ +#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 */ #define USB_PRODUCT_DLINK_DSB650TX1 0x4001 /* 10/100 ethernet */ @@ -670,6 +696,9 @@ #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 */ /* e-TEK Labs products */ #define USB_PRODUCT_ETEK_1COM 0x8007 /* Serial port */ @@ -688,6 +717,9 @@ /* Fuji photo products */ #define USB_PRODUCT_FUJIPHOTO_MASS0100 0x0100 /* Mass Storage */ +/* Fujitsu protducts */ +#define USB_PRODUCT_FUJITSU_AH_F401U 0x105b /* AH-F401U Air H device */ + /* Genesys Logic products */ #define USB_PRODUCT_GENESYS_GENELINK 0x05e3 /* GeneLink Host-Host Bridge */ #define USB_PRODUCT_GENESYS_GL650 0x0604 /* GL650 Hub */ @@ -716,6 +748,7 @@ /* Handspring, Inc. */ #define USB_PRODUCT_HANDSPRING_VISOR 0x0100 /* Handspring Visor */ +#define USB_PRODUCT_HANDSPRING_TREO 0x0200 /* Handspring Treo */ /* Hauppauge Computer Works */ #define USB_PRODUCT_HAUPPAUGE_WINTV_USB_FM 0x4d12 /* WinTV USB FM */ @@ -736,6 +769,7 @@ #define USB_PRODUCT_HP_815C 0x0204 /* DeskJet 815C */ #define USB_PRODUCT_HP_3300C 0x0205 /* ScanJet 3300C */ #define USB_PRODUCT_HP_CDW8200 0x0207 /* CD-Writer Plus 8200e */ +#define USB_PRODUCT_HP_1220C 0x0212 /* DeskJet 1220C */ #define USB_PRODUCT_HP_810C 0x0304 /* DeskJet 810C/812C */ #define USB_PRODUCT_HP_4300C 0x0305 /* Scanjet 4300C */ #define USB_PRODUCT_HP_CD4E 0x0307 /* CD-Writer+ CD-4e */ @@ -812,6 +846,7 @@ #define USB_PRODUCT_IODATA_USBETTX 0x0904 /* USB ETTX */ #define USB_PRODUCT_IODATA_USBETTXS 0x0913 /* USB ETTX */ #define USB_PRODUCT_IODATA_USBRSAQ 0x0a03 /* RSAQ1 Serial Adapter */ +#define USB_PRODUCT_IODATA2_USB2SC 0x0a09 /* USB2.0-SCSI Bridge USB2-SC */ /* Iomega products */ #define USB_PRODUCT_IOMEGA_ZIP100 0x0001 /* Zip 100 */ @@ -823,6 +858,9 @@ /* Jenoptik products */ #define USB_PRODUCT_JENOPTIK_JD350 0x5300 /* JD 350 Camera/mp3 player */ +/* JRC products */ +#define USB_PRODUCT_JRC_AH_J3001V_J3002V 0x0001 /* AirH\"PHONE AH-J3001V/J3002V */ + /* Kawasaki LSI products */ #define USB_PRODUCT_KLSI_DUH3E10BT 0x0008 /* 10BT Ethernet */ #define USB_PRODUCT_KLSI_DUH3E10BTN 0x0009 /* 10BT Ethernet */ @@ -909,6 +947,7 @@ #define USB_PRODUCT_LINKSYS_USB10TA 0x2206 /* USB10TA Ethernet */ #define USB_PRODUCT_LINKSYS_WUSB11 0x2211 /* WUSB11 802.11b */ #define USB_PRODUCT_LINKSYS_WUSB11_25 0x2212 /* WUSB11 802.11b v2.5 */ +#define USB_PRODUCT_LINKSYS2_USB200M 0x2226 /* USB 2.0 10/100 ethernet controller */ #define USB_PRODUCT_LINKSYS_USB10TX2 0x400b /* USB10TX */ /* Logitech products */ @@ -955,6 +994,8 @@ #define USB_PRODUCT_MELCO_LUATX5 0x0005 /* LUA-TX Ethernet */ #define USB_PRODUCT_MELCO_LUA2TX5 0x0009 /* LUA2-TX Ethernet */ #define USB_PRODUCT_MELCO_LUAKTX 0x0012 /* LUA-KTX Ethernet */ +#define USB_PRODUCT_MELCO_MCRSM2 0x001b /* MCR-SM2 SmartMedia Card Reader/Writer */ +#define USB_PRODUCT_MELCO_DUBPXXG 0x001c /* USB-IDE Bridge: DUB-PxxG */ #define USB_PRODUCT_MELCO_KS11G 0x0027 /* WLI-USB-KS11G USB-wlan */ /* Metricom products */ @@ -1005,6 +1046,7 @@ /* Motorola products */ #define USB_PRODUCT_MOTOROLA_MC141555 0x1555 /* MC141555 hub controller */ +#define USB_PRODUCT_MOTOROLA_SB4100 0x4100 /* SB4100 USB Cable Modem */ /* MultiTech products */ #define USB_PRODUCT_MULTITECH_ATLAS 0xf101 /* MT5634ZBA modem */ @@ -1022,6 +1064,10 @@ /* M-Systems products */ #define USB_PRODUCT_MSYSTEMS_DISKONKEY 0x0010 /* DiskOnKey */ +#define USB_PRODUCT_MSYSTEMS_DISKONKEY2 0x0011 /* DiskOnKey */ + +/* National Instruments */ +#define USB_PRODUCT_NI_GPIB_USB_A 0xc920 /* GPIB-USB-A */ /* National Semiconductor */ #define USB_PRODUCT_NATIONAL_BEARPAW1200 0x1000 /* BearPaw 1200 */ @@ -1035,6 +1081,7 @@ #define USB_PRODUCT_NEC2_HUB2_0 0x0058 /* USB2.0 Hub */ /* NEODIO products */ +#define USB_PRODUCT_NEODIO_ND3050 0x3050 /* 6-in-1 Flash Device Controller */ #define USB_PRODUCT_NEODIO_ND5010 0x5010 /* Multi-format Flash Controller */ /* NetChip Technology Products */ @@ -1045,10 +1092,15 @@ #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 */ /* 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 */ + +/* NHJ product */ +#define USB_PRODUCT_NHJ_CAM2 0x9120 /* Camera */ /* Olympus products */ #define USB_PRODUCT_OLYMPUS_C1 0x0102 /* C-1 Digital Camera */ @@ -1069,18 +1121,28 @@ #define USB_PRODUCT_ONSPEC_LC1 0xa109 /* CF + SM Combo (LC1) */ #define USB_PRODUCT_ONSPEC_MD1II 0xb006 /* Datafab MD1-II PC-Card Reader */ +/* Ours Technology Inc. */ +#define USB_PRODUCT_OTI_SOLID 0x6803 /* Solid state disk */ + /* Palm Computing, Inc. product */ #define USB_PRODUCT_PALM_SERIAL 0x0080 /* USB Serial Adaptor */ #define USB_PRODUCT_PALM_M500 0x0001 /* Palm m500 */ #define USB_PRODUCT_PALM_M505 0x0002 /* Palm m505 */ #define USB_PRODUCT_PALM_M515 0x0003 /* Palm m515 */ +#define USB_PRODUCT_PALM_I705 0x0020 /* Palm i705 */ +#define USB_PRODUCT_PALM_TUNGSTEN_Z 0x0031 /* Palm Tungsten Z */ #define USB_PRODUCT_PALM_M125 0x0040 /* Palm m125 */ +#define USB_PRODUCT_PALM_M130 0x0050 /* Palm m130 */ +#define USB_PRODUCT_PALM_TUNGSTEN_T 0x0060 /* Palm Tungsten T */ +#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 */ /* 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 */ /* Peracom products */ @@ -1111,6 +1173,12 @@ #define USB_PRODUCT_PIENGINEERING_PS2USB 0x020b /* PS2 to Mac Adapter */ #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 */ + +/* Plantronics products */ +#define USB_PRODUCT_PLANTRONICS_HEADSET 0x0ca1 /* Platronics DSP-400 Headset */ + /* PLX products */ #define USB_PRODUCT_PLX_TESTBOARD 0x9060 /* test board */ @@ -1182,12 +1250,17 @@ /* SanDisk products */ #define USB_PRODUCT_SANDISK_SDDR05A 0x0001 /* ImageMate SDDR-05a */ #define USB_PRODUCT_SANDISK_SDDR31 0x0002 /* ImageMate SDDR-31 */ +#define USB_PRODUCT_SANDISK_SDDR05 0x0005 /* ImageMate SDDR-05 */ #define USB_PRODUCT_SANDISK_SDDR12 0x0100 /* ImageMate SDDR-12 */ #define USB_PRODUCT_SANDISK_SDDR09 0x0200 /* ImageMate SDDR-09 */ +#define USB_PRODUCT_SANDISK_SDDR75 0x0810 /* ImageMate SDDR-75 */ /* Sanwa Supply products */ #define USB_PRODUCT_SANWASUPPLY_JYDV9USB 0x9806 /* JY-DV9USB gamepad */ +/* Sanyo Electric products */ +#define USB_PRODUCT_SANYO_SCP4900 0x0701 /* Sanyo SCP-4900 USB Phone */ + /* ScanLogic products */ #define USB_PRODUCT_SCANLOGIC_SL11R 0x0002 /* SL11R-IDE */ #define USB_PRODUCT_SCANLOGIC_336CX 0x0300 /* Phantom 336CX - C3 scanner */ @@ -1219,6 +1292,7 @@ /* SIIG products */ #define USB_PRODUCT_SIIG_DIGIFILMREADER 0x0004 /* DigiFilm-Combo Reader */ +#define USB_PRODUCT_SIIG_MULTICARDREADER 0x0201 /* MULTICARDREADER */ /* Silicon Portals Inc. */ #define USB_PRODUCT_SILICONPORTALS_YAPPH_NF 0x0200 /* YAP Phone (no firmware) */ @@ -1256,8 +1330,10 @@ #define USB_PRODUCT_SONY_PS2MOUSE 0x0061 /* PlayStatoin2 mouse */ #define USB_PRODUCT_SONY_CLIE_40 0x0066 /* Clie v4.0 */ #define USB_PRODUCT_SONY_CLIE_40_MS 0x006d /* Clie v4.0 Memory Stick slot */ +#define USB_PRODUCT_SONY_CLIE_S360 0x0095 /* Sony Clie s360 */ #define USB_PRODUCT_SONY_CLIE_41_MS 0x0099 /* Clie v4.1 Memory Stick slot */ #define USB_PRODUCT_SONY_CLIE_41 0x009a /* Clie v4.1 */ +#define USB_PRODUCT_SONY_CLIE_NX60 0x00da /* Sony Clie nx60 */ /* STMicroelectronics products */ #define USB_PRODUCT_STMICRO_COMMUNICATOR 0x7554 /* Communicator */ @@ -1265,9 +1341,14 @@ /* STSN products */ #define USB_PRODUCT_STSN_STSN0001 0x0001 /* Internet Access Device */ +/* Sun Communications products */ +#define USB_PRODUCT_SUNCOMM_MB_ADAPTOR 0x0003 /* Mobile Adaptor */ + /* SUN Corporation products */ +#define USB_PRODUCT_SUNTAC_DS96L 0x0003 /* SUNTAC U-Cable type D2 */ #define USB_PRODUCT_SUNTAC_PS64P1 0x0005 /* SUNTAC U-Cable type P1 */ #define USB_PRODUCT_SUNTAC_VS10U 0x0009 /* SUNTAC Slipper U */ +#define USB_PRODUCT_SUNTAC_IS96U 0x000a /* SUNTAC Ir-Trinity */ /* Sun Microsystems products */ #define USB_PRODUCT_SUN_KEYBOARD 0x0005 /* Type 6 USB */ @@ -1312,8 +1393,10 @@ /* Trek Technology products */ #define USB_PRODUCT_TREK_THUMBDRIVE 0x1111 /* ThumbDrive */ +#define USB_PRODUCT_TREK_THUMBDRIVE_8MB 0x9988 /* ThumbDrive 8MB */ /* Trumpion products */ +#define USB_PRODUCT_TRUMPION_T33521 0x1003 /* USB/MP3 decoder */ #define USB_PRODUCT_TRUMPION_XXX1100 0x1100 /* XXX 1100 */ /* Ultima products */ @@ -1333,9 +1416,6 @@ /* Vision products */ #define USB_PRODUCT_VISION_VC6452V002 0x0002 /* CPiA Camera */ -/* Vivitar products */ -#define USB_PRODUCT_VIVITAR_DSC350 0x0003 /* DSC350 Camera */ - /* Visioneer products */ #define USB_PRODUCT_VISIONEER_7600 0x0211 /* OneTouch 7600 */ #define USB_PRODUCT_VISIONEER_5300 0x0221 /* OneTouch 5300 */ @@ -1345,6 +1425,9 @@ #define USB_PRODUCT_VISIONEER_8100 0x0321 /* OneTouch 8100 */ #define USB_PRODUCT_VISIONEER_8600 0x0331 /* OneTouch 8600 */ +/* Vivitar products */ +#define USB_PRODUCT_VIVITAR_DSC350 0x0003 /* DSC350 Camera */ + /* Wacom products */ #define USB_PRODUCT_WACOM_CT0405U 0x0000 /* CT-0405-U Tablet */ #define USB_PRODUCT_WACOM_GRAPHIRE 0x0010 /* Graphire */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index 02e92b55bc4..b130618cac1 100644 --- a/sys/dev/usb/usbdevs_data.h +++ b/sys/dev/usb/usbdevs_data.h @@ -1,12 +1,12 @@ -/* $OpenBSD: usbdevs_data.h,v 1.63 2003/03/14 18:04:41 todd Exp $ */ +/* $OpenBSD: usbdevs_data.h,v 1.64 2003/05/16 17:54:24 nate Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.60 2003/03/14 18:04:23 todd Exp + * OpenBSD: usbdevs,v 1.61 2003/05/16 17:54:07 nate Exp */ -/* $NetBSD: usbdevs,v 1.280 2002/11/05 12:13:40 cjs Exp $ */ +/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -215,6 +215,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Acerscan 620U", }, { + USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ATAPI, + 0, + "Acer Peripherals", + "ATA/ATAPI adapter", + }, + { USB_VENDOR_ACTIONTEC, USB_PRODUCT_ACTIONTEC_PRISM_25, 0, "Actiontec Electronics", @@ -431,6 +437,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Ethernet", }, { + USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88172, + 0, + "ASIX Electronics", + "USB 2.0 10/100 ethernet controller", + }, + { USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC1284, 0, "ATEN International", @@ -485,6 +497,12 @@ const struct usb_knowndev usb_knowndevs[] = { "ATC-HA4USB USB headphone", }, { + USB_VENDOR_AVANCELOGIC, USB_PRODUCT_AVANCELOGIC_USBAUDIO, + 0, + "Avance Logic", + "USB Audio Speaker", + }, + { USB_VENDOR_AVISION, USB_PRODUCT_AVISION_1200U, 0, "Avision", @@ -503,6 +521,12 @@ const struct usb_knowndev usb_knowndevs[] = { "F5U103 Serial adapter", }, { + USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U109, + 0, + "Belkin Components", + "F5U109 Serial adapter", + }, + { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_SCSI, 0, "Belkin Components", @@ -575,6 +599,12 @@ const struct usb_knowndev usb_knowndevs[] = { "CANOSCAN N656U", }, { + USB_VENDOR_CANON, USB_PRODUCT_CANON_N670U, + 0, + "Canon", + "CANOSCAN N670U", + }, + { USB_VENDOR_CANON, USB_PRODUCT_CANON_S10, 0, "Canon", @@ -779,6 +809,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Nomad II MG", }, { + USB_VENDOR_CSR, USB_PRODUCT_CSR_BLUETOOTH, + 0, + "Cambridge Silicon Radio", + "Bluetooth USB Adapter", + }, + { USB_VENDOR_CTX, USB_PRODUCT_CTX_EX1300, 0, "Chuntex", @@ -857,6 +893,12 @@ const struct usb_knowndev usb_knowndevs[] = { "PS/2 Active Adapter", }, { + USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUBE100, + 0, + "D-Link", + "10/100 ethernet", + }, + { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX4, 0, "D-Link", @@ -1127,6 +1169,24 @@ const struct usb_knowndev usb_knowndevs[] = { "GT-9700F scanner", }, { + USB_VENDOR_EPSON, USB_PRODUCT_EPSON_2400, + 0, + "Seiko Epson", + "Perfection 2400 scanner", + }, + { + USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1260, + 0, + "Seiko Epson", + "Perfection 1260 scanner", + }, + { + USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1660, + 0, + "Seiko Epson", + "Perfection 1660 scanner", + }, + { USB_VENDOR_ETEK, USB_PRODUCT_ETEK_1COM, 0, "e-TEK Labs", @@ -1169,6 +1229,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Mass Storage", }, { + USB_VENDOR_FUJITSU, USB_PRODUCT_FUJITSU_AH_F401U, + 0, + "Fujitsu", + "AH-F401U Air H device", + }, + { USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GENELINK, 0, "Genesys Logic", @@ -1247,6 +1313,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Handspring Visor", }, { + USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_TREO, + 0, + "Handspring", + "Handspring Treo", + }, + { USB_VENDOR_HAUPPAUGE, USB_PRODUCT_HAUPPAUGE_WINTV_USB_FM, 0, "Hauppauge Computer Works", @@ -1331,6 +1403,12 @@ const struct usb_knowndev usb_knowndevs[] = { "CD-Writer Plus 8200e", }, { + USB_VENDOR_HP, USB_PRODUCT_HP_1220C, + 0, + "Hewlett Packard", + "DeskJet 1220C", + }, + { USB_VENDOR_HP, USB_PRODUCT_HP_810C, 0, "Hewlett Packard", @@ -1691,6 +1769,12 @@ const struct usb_knowndev usb_knowndevs[] = { "RSAQ1 Serial Adapter", }, { + USB_VENDOR_IODATA2, USB_PRODUCT_IODATA2_USB2SC, + 0, + "I-O Data", + "USB2.0-SCSI Bridge USB2-SC", + }, + { USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP100, 0, "Iomega", @@ -1715,6 +1799,12 @@ const struct usb_knowndev usb_knowndevs[] = { "JD 350 Camera/mp3 player", }, { + USB_VENDOR_JRC, USB_PRODUCT_JRC_AH_J3001V_J3002V, + 0, + "Japan Radio Company", + "AirH\"PHONE AH-J3001V/J3002V", + }, + { USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BT, 0, "Kawasaki LSI", @@ -2081,6 +2171,12 @@ const struct usb_knowndev usb_knowndevs[] = { "WUSB11 802.11b v2.5", }, { + USB_VENDOR_LINKSYS2, USB_PRODUCT_LINKSYS2_USB200M, + 0, + "Linksys", + "USB 2.0 10/100 ethernet controller", + }, + { USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX2, 0, "Linksys", @@ -2297,6 +2393,18 @@ const struct usb_knowndev usb_knowndevs[] = { "LUA-KTX Ethernet", }, { + USB_VENDOR_MELCO, USB_PRODUCT_MELCO_MCRSM2, + 0, + "Melco", + "MCR-SM2 SmartMedia Card Reader/Writer", + }, + { + USB_VENDOR_MELCO, USB_PRODUCT_MELCO_DUBPXXG, + 0, + "Melco", + "USB-IDE Bridge: DUB-PxxG", + }, + { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KS11G, 0, "Melco", @@ -2477,6 +2585,12 @@ const struct usb_knowndev usb_knowndevs[] = { "MC141555 hub controller", }, { + USB_VENDOR_MOTOROLA, USB_PRODUCT_MOTOROLA_SB4100, + 0, + "Motorola", + "SB4100 USB Cable Modem", + }, + { USB_VENDOR_MULTITECH, USB_PRODUCT_MULTITECH_ATLAS, 0, "MultiTech", @@ -2543,6 +2657,18 @@ const struct usb_knowndev usb_knowndevs[] = { "DiskOnKey", }, { + USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY2, + 0, + "M-Systems", + "DiskOnKey", + }, + { + USB_VENDOR_NI, USB_PRODUCT_NI_GPIB_USB_A, + 0, + "National Instruments", + "GPIB-USB-A", + }, + { USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW1200, 0, "National Semiconductor", @@ -2573,6 +2699,12 @@ const struct usb_knowndev usb_knowndevs[] = { "USB2.0 Hub", }, { + USB_VENDOR_NEODIO, USB_PRODUCT_NEODIO_ND3050, + 0, + "Neodio", + "6-in-1 Flash Device Controller", + }, + { USB_VENDOR_NEODIO, USB_PRODUCT_NEODIO_ND5010, 0, "Neodio", @@ -2609,6 +2741,12 @@ const struct usb_knowndev usb_knowndevs[] = { "10/100 Ethernet", }, { + USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_FA120, + 0, + "BayNETGEAR", + "USB 2.0 Fast Ethernet Adapter", + }, + { USB_VENDOR_NIKON, USB_PRODUCT_NIKON_E990, 0, "Nikon", @@ -2621,6 +2759,18 @@ const struct usb_knowndev usb_knowndevs[] = { "Digital Camera E880", }, { + USB_VENDOR_NIKON, USB_PRODUCT_NIKON_E885, + 0, + "Nikon", + "Digital Camera E885", + }, + { + USB_VENDOR_NHJ, USB_PRODUCT_NHJ_CAM2, + 0, + "NHJ", + "Camera", + }, + { USB_VENDOR_OLYMPUS, USB_PRODUCT_OLYMPUS_C1, 0, "Olympus", @@ -2699,6 +2849,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Datafab MD1-II PC-Card Reader", }, { + USB_VENDOR_OTI, USB_PRODUCT_OTI_SOLID, + 0, + "Ours Technology Inc.", + "Solid state disk", + }, + { USB_VENDOR_PALM, USB_PRODUCT_PALM_SERIAL, 0, "Palm Computing", @@ -2723,12 +2879,42 @@ const struct usb_knowndev usb_knowndevs[] = { "Palm m515", }, { + USB_VENDOR_PALM, USB_PRODUCT_PALM_I705, + 0, + "Palm Computing", + "Palm i705", + }, + { + USB_VENDOR_PALM, USB_PRODUCT_PALM_TUNGSTEN_Z, + 0, + "Palm Computing", + "Palm Tungsten Z", + }, + { USB_VENDOR_PALM, USB_PRODUCT_PALM_M125, 0, "Palm Computing", "Palm m125", }, { + USB_VENDOR_PALM, USB_PRODUCT_PALM_M130, + 0, + "Palm Computing", + "Palm m130", + }, + { + USB_VENDOR_PALM, USB_PRODUCT_PALM_TUNGSTEN_T, + 0, + "Palm Computing", + "Palm Tungsten T", + }, + { + USB_VENDOR_PALM, USB_PRODUCT_PALM_ZIRE, + 0, + "Palm Computing", + "Palm Zire", + }, + { USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_LS120, 0, "Panasonic (Matsushita)", @@ -2741,6 +2927,18 @@ const struct usb_knowndev usb_knowndevs[] = { "MultiMediaCard Adapter", }, { + USB_VENDOR_PEN, USB_PRODUCT_PEN_USBREADER, + 0, + "Pen Drive", + "USB 6 in 1 reader", + }, + { + USB_VENDOR_PEN, USB_PRODUCT_PEN_MOBILEDRIVE, + 0, + "Pen Drive", + "USB 3 in 1 reader", + }, + { USB_VENDOR_PEN, USB_PRODUCT_PEN_USBDISK, 0, "Pen Drive", @@ -2867,6 +3065,18 @@ const struct usb_knowndev usb_knowndevs[] = { "Xkeys Programmable Keyboard", }, { + USB_VENDOR_PILOTECH, USB_PRODUCT_PILOTECH_CRW600, + 0, + "Pilotech", + "CRW-600 6-in-1 Reader", + }, + { + USB_VENDOR_PLANTRONICS, USB_PRODUCT_PLANTRONICS_HEADSET, + 0, + "Plantronics", + "Platronics DSP-400 Headset", + }, + { USB_VENDOR_PLX, USB_PRODUCT_PLX_TESTBOARD, 0, "PLX", @@ -3119,6 +3329,12 @@ const struct usb_knowndev usb_knowndevs[] = { "ImageMate SDDR-31", }, { + USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR05, + 0, + "SanDisk", + "ImageMate SDDR-05", + }, + { USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR12, 0, "SanDisk", @@ -3131,12 +3347,24 @@ const struct usb_knowndev usb_knowndevs[] = { "ImageMate SDDR-09", }, { + USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR75, + 0, + "SanDisk", + "ImageMate SDDR-75", + }, + { USB_VENDOR_SANWASUPPLY, USB_PRODUCT_SANWASUPPLY_JYDV9USB, 0, "Sanwa Supply", "JY-DV9USB gamepad", }, { + USB_VENDOR_SANYO, USB_PRODUCT_SANYO_SCP4900, + 0, + "Sanyo Electric", + "Sanyo SCP-4900 USB Phone", + }, + { USB_VENDOR_SCANLOGIC, USB_PRODUCT_SCANLOGIC_SL11R, 0, "ScanLogic", @@ -3245,6 +3473,12 @@ const struct usb_knowndev usb_knowndevs[] = { "DigiFilm-Combo Reader", }, { + USB_VENDOR_SIIG, USB_PRODUCT_SIIG_MULTICARDREADER, + 0, + "SIIG", + "MULTICARDREADER", + }, + { USB_VENDOR_SILICONPORTALS, USB_PRODUCT_SILICONPORTALS_YAPPH_NF, 0, "Silicon Portals", @@ -3383,6 +3617,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Clie v4.0 Memory Stick slot", }, { + USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_S360, + 0, + "Sony", + "Sony Clie s360", + }, + { USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_41_MS, 0, "Sony", @@ -3395,6 +3635,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Clie v4.1", }, { + USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_NX60, + 0, + "Sony", + "Sony Clie nx60", + }, + { USB_VENDOR_STMICRO, USB_PRODUCT_STMICRO_COMMUNICATOR, 0, "STMicroelectronics", @@ -3407,6 +3653,18 @@ const struct usb_knowndev usb_knowndevs[] = { "Internet Access Device", }, { + USB_VENDOR_SUNCOMM, USB_PRODUCT_SUNCOMM_MB_ADAPTOR, + 0, + "Sun Communications, Inc.", + "Mobile Adaptor", + }, + { + USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_DS96L, + 0, + "SUN Corporation", + "SUNTAC U-Cable type D2", + }, + { USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_PS64P1, 0, "SUN Corporation", @@ -3419,6 +3677,12 @@ const struct usb_knowndev usb_knowndevs[] = { "SUNTAC Slipper U", }, { + USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_IS96U, + 0, + "SUN Corporation", + "SUNTAC Ir-Trinity", + }, + { USB_VENDOR_SUN, USB_PRODUCT_SUN_KEYBOARD, 0, "Sun Microsystems", @@ -3545,6 +3809,18 @@ const struct usb_knowndev usb_knowndevs[] = { "ThumbDrive", }, { + USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE_8MB, + 0, + "Trek Technology", + "ThumbDrive 8MB", + }, + { + USB_VENDOR_TRUMPION, USB_PRODUCT_TRUMPION_T33521, + 0, + "Trumpion Microelectronics", + "USB/MP3 decoder", + }, + { USB_VENDOR_TRUMPION, USB_PRODUCT_TRUMPION_XXX1100, 0, "Trumpion Microelectronics", @@ -3605,12 +3881,6 @@ const struct usb_knowndev usb_knowndevs[] = { "CPiA Camera", }, { - USB_VENDOR_VIVITAR, USB_PRODUCT_VIVITAR_DSC350, - 0, - "Vivitar", - "DSC350 Camera", - }, - { USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_7600, 0, "Visioneer", @@ -3653,6 +3923,12 @@ const struct usb_knowndev usb_knowndevs[] = { "OneTouch 8600", }, { + USB_VENDOR_VIVITAR, USB_PRODUCT_VIVITAR_DSC350, + 0, + "Vivitar", + "DSC350 Camera", + }, + { USB_VENDOR_WACOM, USB_PRODUCT_WACOM_CT0405U, 0, "WACOM", @@ -3941,6 +4217,12 @@ const struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_SANYO, 0, + USB_KNOWNDEV_NOPROD, + "Sanyo Electric", + NULL, + }, + { USB_VENDOR_CONNECTIX, 0, USB_KNOWNDEV_NOPROD, "Connectix", @@ -3959,6 +4241,12 @@ const struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_PLANTRONICS, 0, + USB_KNOWNDEV_NOPROD, + "Plantronics", + NULL, + }, + { USB_VENDOR_STMICRO, 0, USB_KNOWNDEV_NOPROD, "STMicroelectronics", @@ -4685,7 +4973,7 @@ const struct usb_knowndev usb_knowndevs[] = { NULL, }, { - USB_VENDOR_ADVANCELOGIC, 0, + USB_VENDOR_AVANCELOGIC, 0, USB_KNOWNDEV_NOPROD, "Avance Logic", NULL, @@ -4835,6 +5123,12 @@ const struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_LINKSYS2, 0, + USB_KNOWNDEV_NOPROD, + "Linksys", + NULL, + }, + { USB_VENDOR_GRIFFIN, 0, USB_KNOWNDEV_NOPROD, "Griffin Technology", @@ -4871,6 +5165,12 @@ const struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_SUNCOMM, 0, + USB_KNOWNDEV_NOPROD, + "Sun Communications, Inc.", + NULL, + }, + { USB_VENDOR_ALFADATA, 0, USB_KNOWNDEV_NOPROD, "Alfadata Computer", @@ -5303,6 +5603,12 @@ const struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_CSR, 0, + USB_KNOWNDEV_NOPROD, + "Cambridge Silicon Radio", + NULL, + }, + { USB_VENDOR_TREK, 0, USB_KNOWNDEV_NOPROD, "Trek Technology", @@ -5369,6 +5675,12 @@ const struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_ASIX, 0, + USB_KNOWNDEV_NOPROD, + "ASIX Electronics", + NULL, + }, + { USB_VENDOR_GREENHOUSE2, 0, USB_KNOWNDEV_NOPROD, "GREENHOUSE", @@ -5411,6 +5723,18 @@ const struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_OTI, 0, + USB_KNOWNDEV_NOPROD, + "Ours Technology Inc.", + NULL, + }, + { + USB_VENDOR_PILOTECH, 0, + USB_KNOWNDEV_NOPROD, + "Pilotech", + NULL, + }, + { USB_VENDOR_MOTOROLA, 0, USB_KNOWNDEV_NOPROD, "Motorola", @@ -5435,6 +5759,18 @@ const struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_JRC, 0, + USB_KNOWNDEV_NOPROD, + "Japan Radio Company", + NULL, + }, + { + USB_VENDOR_ACERCM, 0, + USB_KNOWNDEV_NOPROD, + "Acer Communications & Multimedia", + NULL, + }, + { USB_VENDOR_BELKIN2, 0, USB_KNOWNDEV_NOPROD, "Belkin Components", @@ -5495,6 +5831,12 @@ const struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_NHJ, 0, + USB_KNOWNDEV_NOPROD, + "NHJ", + NULL, + }, + { USB_VENDOR_PQI, 0, USB_KNOWNDEV_NOPROD, "PQI", @@ -5507,6 +5849,18 @@ const struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_NI, 0, + USB_KNOWNDEV_NOPROD, + "National Instruments", + NULL, + }, + { + USB_VENDOR_IODATA2, 0, + USB_KNOWNDEV_NOPROD, + "I-O Data", + NULL, + }, + { USB_VENDOR_INTEL, 0, USB_KNOWNDEV_NOPROD, "Intel", |