diff options
| -rw-r--r-- | sys/dev/usb/usbdevs.h | 95 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs_data.h | 286 |
2 files changed, 319 insertions, 62 deletions
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index 6930d140dc6..d6367fe69fa 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -1,12 +1,12 @@ -/* $OpenBSD: usbdevs.h,v 1.40 2001/11/25 20:11:37 mickey Exp $ */ +/* $OpenBSD: usbdevs.h,v 1.41 2002/01/03 15:42:44 nate Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.40 2001/11/25 20:11:17 mickey Exp + * OpenBSD: usbdevs,v 1.41 2002/01/03 15:42:12 nate Exp */ -/* $NetBSD: usbdevs,v 1.194 2001/10/26 03:47:31 mycroft Exp $ */ +/* $NetBSD: usbdevs,v 1.211 2001/12/15 00:15:01 augustss Exp $ */ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -193,7 +193,7 @@ #define USB_VENDOR_KEITHLEY 0x05e6 /* Keithley Instruments */ #define USB_VENDOR_EIZONANAO 0x05e7 /* EIZO Nanao */ #define USB_VENDOR_KLSI 0x05e9 /* Kawasaki LSI */ -#define USB_VENDOR_FFC 0x05eb /* FFC Limited */ +#define USB_VENDOR_FFC 0x05eb /* FFC */ #define USB_VENDOR_ANKO 0x05ef /* Anko Electronic */ #define USB_VENDOR_PIENGINEERING 0x05f3 /* P.I. Engineering */ #define USB_VENDOR_AOC 0x05f6 /* AOC International */ @@ -210,25 +210,28 @@ #define USB_VENDOR_TEAC 0x0644 /* TEAC */ #define USB_VENDOR_LINKSYS 0x066b /* Linksys */ #define USB_VENDOR_ACERSA 0x066e /* Acer Semiconductor America */ +#define USB_VENDOR_SIGMATEL 0x066f /* Sigmatel */ #define USB_VENDOR_AIWA 0x0677 /* Aiwa */ #define USB_VENDOR_ACARD 0x0678 /* ACARD Technology */ #define USB_VENDOR_PROLIFIC 0x067b /* Prolific Technology */ #define USB_VENDOR_ADVANCELOGIC 0x0680 /* Avance Logic */ +#define USB_VENDOR_CHPRODUCTS 0x068e /* CH Products */ #define USB_VENDOR_HAGIWARA 0x0693 /* Hagiwara Sys-Com */ #define USB_VENDOR_CTX 0x0698 /* Chuntex */ #define USB_VENDOR_ASKEY 0x069a /* Askey Computer */ #define USB_VENDOR_SAITEK 0x06a3 /* Saitek */ #define USB_VENDOR_ALCATELT 0x06b9 /* Alcatel Telecom */ -#define USB_VENDOR_AGFA 0x06bd /* AGFA-Gevaert NV */ +#define USB_VENDOR_AGFA 0x06bd /* AGFA-Gevaert */ #define USB_VENDOR_ASIAMD 0x06be /* Asia Microelectronic Development */ #define USB_VENDOR_BIZLINK 0x06c4 /* Bizlink International */ #define USB_VENDOR_KEYSPAN 0x06cd /* Keyspan */ -#define USB_VENDOR_AASHIMA 0x06d6 /* Aashima Technology B.V. */ +#define USB_VENDOR_AASHIMA 0x06d6 /* Aashima Technology */ #define USB_VENDOR_MULTITECH 0x06e0 /* MultiTech */ #define USB_VENDOR_ADS 0x06e1 /* ADS Technologies */ #define USB_VENDOR_ALCATELM 0x06e4 /* Alcatel Microelectronics */ #define USB_VENDOR_SIRIUS 0x06ea /* Sirius Technologies */ #define USB_VENDOR_BOSTON 0x06fd /* Boston Acoustics */ +#define USB_VENDOR_GUILLEMOT 0x06f8 /* Guillemot */ #define USB_VENDOR_SMC 0x0707 /* Standard Microsystems */ #define USB_VENDOR_PUTERCOM 0x0708 /* Putercom */ #define USB_VENDOR_MCT 0x0711 /* MCT */ @@ -238,7 +241,7 @@ #define USB_VENDOR_GRIFFIN 0x077d /* Griffin Technology */ #define USB_VENDOR_SANDISK 0x0781 /* SanDisk */ #define USB_VENDOR_BRIMAX 0x078e /* Brimax */ -#define USB_VENDOR_AXIS 0x0792 /* Axis Communications AB */ +#define USB_VENDOR_AXIS 0x0792 /* Axis Communications */ #define USB_VENDOR_ABL 0x0794 /* ABL Electronics */ #define USB_VENDOR_ALFADATA 0x079d /* Alfadata Computer */ #define USB_VENDOR_NATIONALTECH 0x07a2 /* National Technical Systems */ @@ -278,7 +281,7 @@ #define USB_VENDOR_BOCARESEARCH 0x0885 /* Boca Research */ #define USB_VENDOR_ANDREA 0x08a8 /* Andrea Electronics */ #define USB_VENDOR_BURRBROWN 0x08bb /* Burr-Brown Japan */ -#define USB_VENDOR_2WIRE 0x08c8 /* 2Wire, Inc */ +#define USB_VENDOR_2WIRE 0x08c8 /* 2Wire */ #define USB_VENDOR_AIPTEK 0x08ca /* AIPTEK International */ #define USB_VENDOR_SMARTBRIDGES 0x08d1 /* SmartBridges */ #define USB_VENDOR_BILLIONTON 0x08dd /* Billionton Systems */ @@ -312,7 +315,10 @@ #define USB_VENDOR_GREENHOUSE 0x0a6b /* GREENHOUSE */ #define USB_VENDOR_GEOCAST 0x0a79 /* Geocast Network Systems */ #define USB_VENDOR_TODOS 0x0b0c /* Todos Data System */ +#define USB_VENDOR_NEC2 0x0b62 /* NEC */ +#define USB_VENDOR_ATI2 0x0b6f /* ATI */ #define USB_VENDOR_AGATE 0x0c08 /* Agate Technologies */ +#define USB_VENDOR_DMI 0x0c0b /* DMI */ #define USB_VENDOR_MOTOROLA 0x1063 /* Motorola */ #define USB_VENDOR_PLX 0x10b5 /* PLX */ #define USB_VENDOR_ASANTE 0x10bd /* Asante */ @@ -349,7 +355,7 @@ #define USB_PRODUCT_ABOCOM_XX1 0x110c /* XX1 */ #define USB_PRODUCT_ABOCOM_XX2 0x200c /* XX2 */ #define USB_PRODUCT_ABOCOM_URE450 0x4000 /* URE450 Ethernet */ -#define USB_PRODUCT_ABOCOM_XX3 0x4002 /* XX3 */ +#define USB_PRODUCT_ABOCOM_UFE1000 0x4002 /* UFE1000 Fast Ethernet */ #define USB_PRODUCT_ABOCOM_DSB650TX_PNA 0x4003 /* 1/10/100 ethernet */ #define USB_PRODUCT_ABOCOM_XX4 0x4004 /* XX4 */ #define USB_PRODUCT_ABOCOM_XX5 0x4007 /* XX5 */ @@ -361,6 +367,7 @@ /* Accton products */ #define USB_PRODUCT_ACCTON_USB320_EC 0x1046 /* USB320-EC Ethernet */ +#define USB_PRODUCT_ACCTON_SS1001 0x5046 /* SpeedStream Ethernet */ /* Acer Peripherals products */ #define USB_PRODUCT_ACERP_ACERSCAN_C310U 0x12a6 /* Acerscan C310U */ @@ -368,6 +375,9 @@ #define USB_PRODUCT_ACERP_ACERSCAN_640U 0x2040 /* Acerscan 640U */ #define USB_PRODUCT_ACERP_ACERSCAN_620U 0x2060 /* Acerscan 620U */ +/* ACTiSYS products */ +#define USB_PRODUCT_ACTISYS_IR2000U 0x0011 /* ACT-IR2000U FIR */ + /* ActiveWire products */ #define USB_PRODUCT_ACTIVEWIRE_IOBOARD 0x0100 /* I/O Board */ #define USB_PRODUCT_ACTIVEWIRE_IOBOARD_FW1 0x0101 /* I/O Board, rev. 1 */ @@ -383,9 +393,6 @@ /* Agate Technologies products */ #define USB_PRODUCT_AGATE_QDRIVE 0x0378 /* Q-Drive */ -/* Agiler products */ -#define USB_PRODUCT_ELECOM_MOUSE29UO 0x0002 /* mouse 29UO */ - /* AGFA products */ #define USB_PRODUCT_AGFA_SNAPSCAN1212U 0x0001 /* SnapScan 1212U */ #define USB_PRODUCT_AGFA_SNAPSCANTOUCH 0x0100 /* SnapScan Touch */ @@ -429,8 +436,12 @@ #define USB_PRODUCT_ATEN_UC232A 0x2008 /* Serial adapter */ #define USB_PRODUCT_ATEN_DSB650C 0x4000 /* DSB-650C */ +/* ATI products */ +#define USB_PRODUCT_ATI2_205 0xa001 /* USB Cable 205 */ + /* Atmel Comp. products */ #define USB_PRODUCT_ATMEL_UHB124 0x3301 /* UHB124 hub */ +#define USB_PRODUCT_ATMEL_DWL120 0x7602 /* DWL-120 Wireless adapter */ /* Avision products */ #define USB_PRODUCT_AVISION_1200U 0x0268 /* 1200U scanner */ @@ -476,6 +487,10 @@ /* Chicony products */ #define USB_PRODUCT_CHICONY_KB8933 0x0001 /* KB-8933 keyboard */ +/* CH Products */ +#define USB_PRODUCT_CHPRODUCTS_PROTHROTTLE 0x00f1 /* Pro Throttle */ +#define USB_PRODUCT_CHPRODUCTS_FIGHTERSTICK 0x00f3 /* Fighterstick */ + /* Compaq products */ #define USB_PRODUCT_COMPAQ_IPAQPOCKETPC 0x0003 /* iPAQ PocketPC */ #define USB_PRODUCT_COMPAQ_PJB100 0x504a /* Personal Jukebox PJB100 */ @@ -486,6 +501,7 @@ /* Corega products */ #define USB_PRODUCT_COREGA_ETHER_USB_T 0x0001 /* Ether USB-T */ #define USB_PRODUCT_COREGA_FETHER_USB_TX 0x0004 /* FEther USB-TX */ +#define USB_PRODUCT_COREGA_FETHER_USB_TXS 0x000d /* FEther USB-TXS */ /* Creative Labs products */ #define USB_PRODUCT_CREATIVELABS_NOMAD_II 0x1002 /* Nomad II */ @@ -525,6 +541,9 @@ /* Digital Stream Corp. products */ #define USB_PRODUCT_DIGITALSTREAM_PS2 0x0001 /* PS/2 Active Adapter */ +/* DMI products */ +#define USB_PRODUCT_DMI_SA2_0 0xb001 /* Storage Adapter */ + /* EIZO products */ #define USB_PRODUCT_EIZO_HUB 0x0000 /* hub */ #define USB_PRODUCT_EIZO_MONITOR 0x0001 /* monitor */ @@ -534,6 +553,7 @@ #define USB_PRODUCT_ELECOM_LDUSBTX0 0x200c /* LD-USB/TX */ #define USB_PRODUCT_ELECOM_LDUSBTX1 0x4002 /* LD-USB/TX */ #define USB_PRODUCT_ELECOM_LDUSBTX2 0x400b /* LD-USB/TX */ +#define USB_PRODUCT_ELECOM_UCSGT 0x5003 /* UC-SGT serial adapter */ #define USB_PRODUCT_ELECOM_LDUSBTX3 0xabc1 /* LD-USB/TX */ /* Elsa products */ @@ -568,6 +588,7 @@ #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 */ /* e-TEK Labs products */ #define USB_PRODUCT_ETEK_1COM 0x8007 /* Serial port */ @@ -575,6 +596,16 @@ /* Extended Systems products */ #define USB_PRODUCT_EXTENDED_XTNDACCESS 0x0100 /* XTNDAccess IrDA */ +/* Freecom products */ +#define USB_PRODUCT_FREECOM_DVD 0xfc01 /* Connector for DVD drive */ + +/* Future Technology Devices products */ +#define USB_PRODUCT_FTDI_PS2KBDMS 0x8371 /* PS/2 Keyboard/Mouse */ +#define USB_PRODUCT_FTDI_SERIAL 0x8372 /* Serial converter */ + +/* Fuji photo products */ +#define USB_PRODUCT_FUJIPHOTO_MASS0100 0x0100 /* Mass Storage */ + /* Gravis products */ #define USB_PRODUCT_GRAVIS_GAMEPADPRO 0x4001 /* GamePad Pro */ @@ -584,17 +615,11 @@ /* Griffin Technology */ #define USB_PRODUCT_GRIFFIN_IMATE 0x0405 /* iMate, ADB adapter */ -/* Freecom products */ -#define USB_PRODUCT_FREECOM_DVD 0xfc01 /* Connector for DVD drive */ - -/* Future Technology Devices products */ -#define USB_PRODUCT_FTDI_SERIAL 0x8372 /* Serial converter */ - -/* Fuji photo products */ -#define USB_PRODUCT_FUJIPHOTO_MASS0100 0x0100 /* Mass Storage */ +/* Guillemot Corporation */ +#define USB_PRODUCT_GUILLEMOT_DALEADER 0xa300 /* DA Leader */ /* Hagiwara products */ -#define USB_PRODUCT_HAGIWARA_FGSM 0x0002 /* FlashGate SmartMediaReader */ +#define USB_PRODUCT_HAGIWARA_FGSM 0x0002 /* FlashGate SmartMedia Reader */ #define USB_PRODUCT_HAGIWARA_FGCF 0x0003 /* FlashGate CompactFlash Reader */ #define USB_PRODUCT_HAGIWARA_FG 0x0005 /* FlashGate */ @@ -648,7 +673,10 @@ #define USB_PRODUCT_INSYSTEM_ATAPI 0x0031 /* ATAPI adapter */ #define USB_PRODUCT_INSYSTEM_ISD110 0x0200 /* IDE adapter ISD110 */ #define USB_PRODUCT_INSYSTEM_ISD105 0x0202 /* IDE adapter 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 */ @@ -669,6 +697,7 @@ /* Kawatsu products */ #define USB_PRODUCT_KAWATSU_MH4000P 0x0003 /* MiniHub 4000P */ +#define USB_PRODUCT_KAWATSU_KC180 0x0180 /* KC-180 IrDA */ /* Keisokugiken Corp. products */ #define USB_PRODUCT_KEISOKUGIKEN_USBDAQ 0x0068 /* HKS-0200 USBDAQ */ @@ -764,6 +793,7 @@ #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_ML_4500 0x0302 /* ML-4500 */ /* Melco, Inc products */ #define USB_PRODUCT_MELCO_LUATX1 0x0001 /* LUA-TX Ethernet */ @@ -780,7 +810,7 @@ #define USB_PRODUCT_MICROSOFT_DDS80 0x0014 /* Digital Sound System 80 */ #define USB_PRODUCT_MICROSOFT_SIDEWINDER 0x001a /* Sidewinder Precision Racing Wheel */ #define USB_PRODUCT_MICROSOFT_INTELLIEYE 0x0025 /* IntelliEye mouse */ -#define USB_PRODUCT_MICROSOFT_INETPRO 0x002b /* Internet Pro */ +#define USB_PRODUCT_MICROSOFT_INETPRO 0x002b /* Internet Keyboard Pro */ /* Microtech products */ #define USB_PRODUCT_MICROTECH_SCSIDB25 0x0004 /* USB-SCSI-DB25 */ @@ -817,6 +847,7 @@ #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_1200CUPLUS 0x0008 /* 1200 CU Plus scanner */ #define USB_PRODUCT_MUSTEK_MDC800 0xa800 /* MDC-800 digital camera */ /* M-Systems products */ @@ -829,6 +860,9 @@ #define USB_PRODUCT_NEC_HUB 0x55aa /* hub */ #define USB_PRODUCT_NEC_HUB_B 0x55ab /* hub */ +/* NEC2 products */ +#define USB_PRODUCT_NEC2_HUB2_0 0x0058 /* USB2.0 Hub */ + /* NetChip Technology Products */ #define USB_PRODUCT_NETCHIP_TURBOCONNECT 0x1080 /* Turbo-Connect */ @@ -841,6 +875,7 @@ #define USB_PRODUCT_NIKON_E880 0x0103 /* Digital Camera E880 */ /* Olympus products */ +#define USB_PRODUCT_OLYMPUS_C1 0x0102 /* C-1 Digital Camera */ #define USB_PRODUCT_OLYMPUS_C700 0x0105 /* C-700 Ultra Zoom */ /* OmniVision Technologies products */ @@ -849,6 +884,8 @@ /* Palm Computing */ #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 */ /* Panasonic products */ #define USB_PRODUCT_PANASONIC_SDCAAE 0x1b00 /* MultiMediaCard Adapter */ @@ -866,12 +903,14 @@ #define USB_PRODUCT_PHILIPS_PCA646VC 0x0303 /* PCA646VC PC Camera */ #define USB_PRODUCT_PHILIPS_PCVC680K 0x0308 /* PCVC680K Vesta Pro PC Camera */ #define USB_PRODUCT_PHILIPS_DSS150 0x0471 /* DSS 150 Digital Speaker System */ +#define USB_PRODUCT_PHILIPS_DIVAUSB 0x1801 /* DIVA USB 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_XKEYS 0x0233 /* Xkeys Programmable Keyboard */ /* PLX products */ #define USB_PRODUCT_PLX_TESTBOARD 0x9060 /* test board */ @@ -928,16 +967,17 @@ /* Rockfire products */ #define USB_PRODUCT_ROCKFIRE_GAMEPAD 0x2033 /* gamepad 203USB */ -/* Saitek */ +/* Saitek products */ #define USB_PRODUCT_SAITEK_CYBORG_3D_GOLD 0x0006 /* Cyborg 3D Gold Joystick */ /* SanDisk products */ -#define USB_PRODUCT_SANDISK_IMAGEMATE 0x0001 /* USB ImageMate */ +#define USB_PRODUCT_SANDISK_SDDR05A 0x0001 /* ImageMate SDDR-05a */ #define USB_PRODUCT_SANDISK_SDDR31 0x0002 /* ImageMate SDDR-31 */ #define USB_PRODUCT_SANDISK_SDDR12 0x0100 /* ImageMate SDDR-12 */ #define USB_PRODUCT_SANDISK_SDDR09 0x0200 /* ImageMate SDDR-09 */ /* ScanLogic products */ +#define USB_PRODUCT_SCANLOGIC_SL11R 0x0002 /* SL11R-IDE */ #define USB_PRODUCT_SCANLOGIC_336CX 0x0300 /* Phantom 336CX - C3 scanner */ /* Shark products */ @@ -955,6 +995,9 @@ #define USB_PRODUCT_SHUTTLE_EUSCSI_C 0x000c /* eUSCSI Bridge */ #define USB_PRODUCT_SHUTTLE_CDRW 0x0101 /* CD-RW Device */ +/* Sigmatel products */ +#define USB_PRODUCT_SIGMATEL_IRDA 0x4200 /* IrDA */ + /* SIIG products */ #define USB_PRODUCT_SIIG_DIGIFILMREADER 0x0004 /* DigiFilm-Combo Reader */ @@ -981,8 +1024,11 @@ /* SONY products */ #define USB_PRODUCT_SONY_DSC 0x0010 /* Sony DSC Cameras */ +#define USB_PRODUCT_SONY_DRIVEV2 0x002b /* Harddrive V2 */ #define USB_PRODUCT_SONY_MSACUS1 0x002d /* Memorystick MSAC-US1 */ #define USB_PRODUCT_SONY_MSC 0x0032 /* Sony MSC Memorystick Slot */ +#define USB_PRODUCT_SONY_CLIE_35 0x0038 /* Sony Clie v3.5 */ +#define USB_PRODUCT_SONY_CLIE_40 0x0066 /* Sony Clie v4.0 */ /* STMicroelectronics products */ #define USB_PRODUCT_STMICRO_COMMUNICATOR 0x7554 /* Communicator */ @@ -1067,6 +1113,7 @@ /* Yamaha products */ #define USB_PRODUCT_YAMAHA_UX256 0x1000 /* UX256 MIDI I/F */ +#define USB_PRODUCT_YAMAHA_UX96 0x1008 /* UX96 MIDI I/F */ /* Zoom Telephonics products */ #define USB_PRODUCT_ZOOM_2986L 0x9700 /* 2986L */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index 6fb9da0c08b..3e884d0c515 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.40 2001/11/25 20:11:37 mickey Exp $ */ +/* $OpenBSD: usbdevs_data.h,v 1.41 2002/01/03 15:42:44 nate Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: usbdevs,v 1.40 2001/11/25 20:11:17 mickey Exp + * OpenBSD: usbdevs,v 1.41 2002/01/03 15:42:12 nate Exp */ -/* $NetBSD: usbdevs,v 1.194 2001/10/26 03:47:31 mycroft Exp $ */ +/* $NetBSD: usbdevs,v 1.211 2001/12/15 00:15:01 augustss Exp $ */ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -119,10 +119,10 @@ const struct usb_knowndev usb_knowndevs[] = { "URE450 Ethernet", }, { - USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX3, + USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_UFE1000, 0, "AboCom Systems", - "XX3", + "UFE1000 Fast Ethernet", }, { USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_DSB650TX_PNA, @@ -179,6 +179,12 @@ const struct usb_knowndev usb_knowndevs[] = { "USB320-EC Ethernet", }, { + USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_SS1001, + 0, + "Accton Technology", + "SpeedStream Ethernet", + }, + { USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_C310U, 0, "Acer Peripherals", @@ -203,6 +209,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Acerscan 620U", }, { + USB_VENDOR_ACTISYS, USB_PRODUCT_ACTISYS_IR2000U, + 0, + "ACTiSYS", + "ACT-IR2000U FIR", + }, + { USB_VENDOR_ACTIVEWIRE, USB_PRODUCT_ACTIVEWIRE_IOBOARD, 0, "ActiveWire", @@ -245,27 +257,21 @@ const struct usb_knowndev usb_knowndevs[] = { "Q-Drive", }, { - USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_MOUSE29UO, - 0, - "Elecom", - "mouse 29UO", - }, - { USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1212U, 0, - "AGFA-Gevaert NV", + "AGFA-Gevaert", "SnapScan 1212U", }, { USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANTOUCH, 0, - "AGFA-Gevaert NV", + "AGFA-Gevaert", "SnapScan Touch", }, { USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1212U2, 0, - "AGFA-Gevaert NV", + "AGFA-Gevaert", "SnapScan 1212U", }, { @@ -383,12 +389,24 @@ const struct usb_knowndev usb_knowndevs[] = { "DSB-650C", }, { + USB_VENDOR_ATI2, USB_PRODUCT_ATI2_205, + 0, + "ATI", + "USB Cable 205", + }, + { USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_UHB124, 0, "Atmel", "UHB124 hub", }, { + USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_DWL120, + 0, + "Atmel", + "DWL-120 Wireless adapter", + }, + { USB_VENDOR_AVISION, USB_PRODUCT_AVISION_1200U, 0, "Avision", @@ -515,6 +533,18 @@ const struct usb_knowndev usb_knowndevs[] = { "KB-8933 keyboard", }, { + USB_VENDOR_CHPRODUCTS, USB_PRODUCT_CHPRODUCTS_PROTHROTTLE, + 0, + "CH Products", + "Pro Throttle", + }, + { + USB_VENDOR_CHPRODUCTS, USB_PRODUCT_CHPRODUCTS_FIGHTERSTICK, + 0, + "CH Products", + "Fighterstick", + }, + { USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQPOCKETPC, 0, "Compaq", @@ -545,6 +575,12 @@ const struct usb_knowndev usb_knowndevs[] = { "FEther USB-TX", }, { + USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TXS, + 0, + "Corega", + "FEther USB-TXS", + }, + { USB_VENDOR_CREATIVELABS, USB_PRODUCT_CREATIVELABS_NOMAD_II, 0, "Creative Labs", @@ -671,6 +707,12 @@ const struct usb_knowndev usb_knowndevs[] = { "PS/2 Active Adapter", }, { + USB_VENDOR_DMI, USB_PRODUCT_DMI_SA2_0, + 0, + "DMI", + "Storage Adapter", + }, + { USB_VENDOR_EIZO, USB_PRODUCT_EIZO_HUB, 0, "EIZO", @@ -707,6 +749,12 @@ const struct usb_knowndev usb_knowndevs[] = { "LD-USB/TX", }, { + USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_UCSGT, + 0, + "Elecom", + "UC-SGT serial adapter", + }, + { USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX3, 0, "Elecom", @@ -863,6 +911,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Perfection 1650 scanner", }, { + USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9700F, + 0, + "Seiko Epson", + "GT-9700F scanner", + }, + { USB_VENDOR_ETEK, USB_PRODUCT_ETEK_1COM, 0, "e-TEK Labs", @@ -875,6 +929,30 @@ const struct usb_knowndev usb_knowndevs[] = { "XTNDAccess IrDA", }, { + USB_VENDOR_FREECOM, USB_PRODUCT_FREECOM_DVD, + 0, + "Freecom", + "Connector for DVD drive", + }, + { + USB_VENDOR_FTDI, USB_PRODUCT_FTDI_PS2KBDMS, + 0, + "Future Technology Devices", + "PS/2 Keyboard/Mouse", + }, + { + USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL, + 0, + "Future Technology Devices", + "Serial converter", + }, + { + USB_VENDOR_FUJIPHOTO, USB_PRODUCT_FUJIPHOTO_MASS0100, + 0, + "Fuji Photo Film", + "Mass Storage", + }, + { USB_VENDOR_GRAVIS, USB_PRODUCT_GRAVIS_GAMEPADPRO, 0, "Advanced Gravis Computer", @@ -893,28 +971,16 @@ const struct usb_knowndev usb_knowndevs[] = { "iMate, ADB adapter", }, { - USB_VENDOR_FREECOM, USB_PRODUCT_FREECOM_DVD, - 0, - "Freecom", - "Connector for DVD drive", - }, - { - USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL, - 0, - "Future Technology Devices", - "Serial converter", - }, - { - USB_VENDOR_FUJIPHOTO, USB_PRODUCT_FUJIPHOTO_MASS0100, + USB_VENDOR_GUILLEMOT, USB_PRODUCT_GUILLEMOT_DALEADER, 0, - "Fuji Photo Film", - "Mass Storage", + "Guillemot", + "DA Leader", }, { USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FGSM, 0, "Hagiwara Sys-Com", - "FlashGate SmartMediaReader", + "FlashGate SmartMedia Reader", }, { USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FGCF, @@ -1139,12 +1205,30 @@ const struct usb_knowndev usb_knowndevs[] = { "IDE adapter ISD105", }, { + USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_DRIVEV2, + 0, + "In-System Design", + "Portable USB Harddrive V2", + }, + { + USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_DRIVEV2_5, + 0, + "In-System Design", + "Portable USB Harddrive V2", + }, + { USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_USBCABLE, 0, "In-System Design", "USB cable", }, { + USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ADAPTERV2, + 0, + "In-System Design", + "USB Storage Adapter V2", + }, + { USB_VENDOR_INTEL, USB_PRODUCT_INTEL_EASYPC_CAMERA, 0, "Intel", @@ -1205,6 +1289,12 @@ const struct usb_knowndev usb_knowndevs[] = { "MiniHub 4000P", }, { + USB_VENDOR_KAWATSU, USB_PRODUCT_KAWATSU_KC180, + 0, + "Kawatsu Semiconductor", + "KC-180 IrDA", + }, + { USB_VENDOR_KEISOKUGIKEN, USB_PRODUCT_KEISOKUGIKEN_USBDAQ, 0, "Keisokugiken", @@ -1583,6 +1673,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Sitecom USB-232 Products", }, { + USB_VENDOR_MCT, USB_PRODUCT_MCT_ML_4500, + 0, + "MCT", + "ML-4500", + }, + { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX1, 0, "Melco", @@ -1646,7 +1742,7 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_INETPRO, 0, "Microsoft", - "Internet Pro", + "Internet Keyboard Pro", }, { USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_SCSIDB25, @@ -1769,6 +1865,12 @@ const struct usb_knowndev usb_knowndevs[] = { "1200 UB scanner", }, { + USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CUPLUS, + 0, + "Mustek Systems", + "1200 CU Plus scanner", + }, + { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_MDC800, 0, "Mustek Systems", @@ -1799,6 +1901,12 @@ const struct usb_knowndev usb_knowndevs[] = { "hub", }, { + USB_VENDOR_NEC2, USB_PRODUCT_NEC2_HUB2_0, + 0, + "NEC", + "USB2.0 Hub", + }, + { USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_TURBOCONNECT, 0, "NetChip Technology", @@ -1829,6 +1937,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Digital Camera E880", }, { + USB_VENDOR_OLYMPUS, USB_PRODUCT_OLYMPUS_C1, + 0, + "Olympus", + "C-1 Digital Camera", + }, + { USB_VENDOR_OLYMPUS, USB_PRODUCT_OLYMPUS_C700, 0, "Olympus", @@ -1853,6 +1967,18 @@ const struct usb_knowndev usb_knowndevs[] = { "USB Serial Adaptor", }, { + USB_VENDOR_PALM, USB_PRODUCT_PALM_M500, + 0, + "Palm Computing", + "Palm m500", + }, + { + USB_VENDOR_PALM, USB_PRODUCT_PALM_M505, + 0, + "Palm Computing", + "Palm m505", + }, + { USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_SDCAAE, 0, "Panasonic (Matsushita)", @@ -1919,6 +2045,12 @@ const struct usb_knowndev usb_knowndevs[] = { "DSS 150 Digital Speaker System", }, { + USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DIVAUSB, + 0, + "Philips", + "DIVA USB mp3 player", + }, + { USB_VENDOR_PHILIPSSEMI, USB_PRODUCT_PHILIPSSEMI_HUB1122, 0, "Philips Semiconductors", @@ -1931,6 +2063,12 @@ const struct usb_knowndev usb_knowndevs[] = { "PS2 to Mac Adapter", }, { + USB_VENDOR_PIENGINEERING, USB_PRODUCT_PIENGINEERING_XKEYS, + 0, + "P.I. Engineering", + "Xkeys Programmable Keyboard", + }, + { USB_VENDOR_PLX, USB_PRODUCT_PLX_TESTBOARD, 0, "PLX", @@ -2135,10 +2273,10 @@ const struct usb_knowndev usb_knowndevs[] = { "Cyborg 3D Gold Joystick", }, { - USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_IMAGEMATE, + USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR05A, 0, "SanDisk", - "USB ImageMate", + "ImageMate SDDR-05a", }, { USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR31, @@ -2159,6 +2297,12 @@ const struct usb_knowndev usb_knowndevs[] = { "ImageMate SDDR-09", }, { + USB_VENDOR_SCANLOGIC, USB_PRODUCT_SCANLOGIC_SL11R, + 0, + "ScanLogic", + "SL11R-IDE", + }, + { USB_VENDOR_SCANLOGIC, USB_PRODUCT_SCANLOGIC_336CX, 0, "ScanLogic", @@ -2231,6 +2375,12 @@ const struct usb_knowndev usb_knowndevs[] = { "CD-RW Device", }, { + USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_IRDA, + 0, + "Sigmatel", + "IrDA", + }, + { USB_VENDOR_SIIG, USB_PRODUCT_SIIG_DIGIFILMREADER, 0, "SIIG", @@ -2297,6 +2447,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Sony DSC Cameras", }, { + USB_VENDOR_SONY, USB_PRODUCT_SONY_DRIVEV2, + 0, + "Sony", + "Harddrive V2", + }, + { USB_VENDOR_SONY, USB_PRODUCT_SONY_MSACUS1, 0, "Sony", @@ -2309,6 +2465,18 @@ const struct usb_knowndev usb_knowndevs[] = { "Sony MSC Memorystick Slot", }, { + USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_35, + 0, + "Sony", + "Sony Clie v3.5", + }, + { + USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_40, + 0, + "Sony", + "Sony Clie v4.0", + }, + { USB_VENDOR_STMICRO, USB_PRODUCT_STMICRO_COMMUNICATOR, 0, "STMicroelectronics", @@ -2555,6 +2723,12 @@ const struct usb_knowndev usb_knowndevs[] = { "UX256 MIDI I/F", }, { + USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX96, + 0, + "YAMAHA", + "UX96 MIDI I/F", + }, + { USB_VENDOR_ZOOM, USB_PRODUCT_ZOOM_2986L, 0, "Zoom Telephonics", @@ -3349,7 +3523,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_FFC, 0, USB_KNOWNDEV_NOPROD, - "FFC Limited", + "FFC", NULL, }, { @@ -3449,6 +3623,12 @@ const struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_SIGMATEL, 0, + USB_KNOWNDEV_NOPROD, + "Sigmatel", + NULL, + }, + { USB_VENDOR_AIWA, 0, USB_KNOWNDEV_NOPROD, "Aiwa", @@ -3473,6 +3653,12 @@ const struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_CHPRODUCTS, 0, + USB_KNOWNDEV_NOPROD, + "CH Products", + NULL, + }, + { USB_VENDOR_HAGIWARA, 0, USB_KNOWNDEV_NOPROD, "Hagiwara Sys-Com", @@ -3505,7 +3691,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_AGFA, 0, USB_KNOWNDEV_NOPROD, - "AGFA-Gevaert NV", + "AGFA-Gevaert", NULL, }, { @@ -3529,7 +3715,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_AASHIMA, 0, USB_KNOWNDEV_NOPROD, - "Aashima Technology B.V.", + "Aashima Technology", NULL, }, { @@ -3563,6 +3749,12 @@ const struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_GUILLEMOT, 0, + USB_KNOWNDEV_NOPROD, + "Guillemot", + NULL, + }, + { USB_VENDOR_SMC, 0, USB_KNOWNDEV_NOPROD, "Standard Microsystems", @@ -3619,7 +3811,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_AXIS, 0, USB_KNOWNDEV_NOPROD, - "Axis Communications AB", + "Axis Communications", NULL, }, { @@ -3859,7 +4051,7 @@ const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_2WIRE, 0, USB_KNOWNDEV_NOPROD, - "2Wire, Inc", + "2Wire", NULL, }, { @@ -4061,12 +4253,30 @@ const struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_NEC2, 0, + USB_KNOWNDEV_NOPROD, + "NEC", + NULL, + }, + { + USB_VENDOR_ATI2, 0, + USB_KNOWNDEV_NOPROD, + "ATI", + NULL, + }, + { USB_VENDOR_AGATE, 0, USB_KNOWNDEV_NOPROD, "Agate Technologies", NULL, }, { + USB_VENDOR_DMI, 0, + USB_KNOWNDEV_NOPROD, + "DMI", + NULL, + }, + { USB_VENDOR_MOTOROLA, 0, USB_KNOWNDEV_NOPROD, "Motorola", |