diff options
author | n_hibma <n_hibma@FreeBSD.org> | 2000-10-07 11:11:12 +0000 |
---|---|---|
committer | n_hibma <n_hibma@FreeBSD.org> | 2000-10-07 11:11:12 +0000 |
commit | 2f43c7014124bbdab8d84f8af679c287f2198aa9 (patch) | |
tree | ec73b53082ece42ff71221fbdb2b5230d74ebdac /sys/dev | |
parent | c6c89ef6331b716b982e386c5ef3fcdfaf523bd5 (diff) | |
download | FreeBSD-src-2f43c7014124bbdab8d84f8af679c287f2198aa9.zip FreeBSD-src-2f43c7014124bbdab8d84f8af679c287f2198aa9.tar.gz |
Regen.
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/usb/usbdevs.h | 79 | ||||
-rw-r--r-- | sys/dev/usb/usbdevs_data.h | 314 |
2 files changed, 332 insertions, 61 deletions
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index 9f3bcb3..09f5cf8 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -4,7 +4,7 @@ * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.38 2000/10/07 11:01:54 n_hibma Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.39 2000/10/07 11:10:53 n_hibma Exp */ /* @@ -69,7 +69,7 @@ #define USB_VENDOR_TI 0x0451 /* Texas Instruments */ #define USB_VENDOR_ANALOGDEVICES 0x0456 /* Analog Devices, Inc. */ #define USB_VENDOR_KYE 0x0458 /* KYE Systems Corp. */ -#define USB_VENDOR_SUPRA 0x045a /* Supra */ +#define USB_VENDOR_DIAMOND2 0x045a /* Diamond (Supra) */ #define USB_VENDOR_MICROSOFT 0x045e /* Microsoft */ #define USB_VENDOR_PRIMAX 0x0461 /* Primax Electronics */ #define USB_VENDOR_AMP 0x0464 /* AMP, Inc. */ @@ -84,14 +84,29 @@ #define USB_VENDOR_STMICRO 0x0483 /* STMicroelectronics */ #define USB_VENDOR_COMPAQ 0x049f /* Compaq Computers */ #define USB_VENDOR_ACERP 0x04a5 /* Acer Peripherals, Inc. */ -#define USB_VENDOR_CANON 0x04a9 /* Canon, Inc. */ #define USB_VENDOR_VISIONEER 0x04a7 /* Visioneer */ +#define USB_VENDOR_CANON 0x04a9 /* Canon, Inc. */ #define USB_VENDOR_IBM 0x04b3 /* IBM Corporation */ #define USB_VENDOR_CYPRESS 0x04b4 /* Cypress Semiconductor */ #define USB_VENDOR_EPSON 0x04b8 /* Seiko Epson Corp. */ +#define USB_VENDOR_RAINBOW 0x04b9 /* Rainbow Technologies */ #define USB_VENDOR_IODATA 0x04bb /* I/O Data */ #define USB_VENDOR_3COMUSR 0x04c1 /* U.S. Robotics */ +#define USB_VENDOR_METHODE 0x04c2 /* Methode Electronics Far East PTE Ltd. */ +#define USB_VENDOR_MAXISWITCH 0x04c3 /* Maxi Switch, Inc. */ +#define USB_VENDOR_LOCKHEEDMER 0x04c4 /* Lockheed Martin Energy Research */ +#define USB_VENDOR_FUJITSU 0x04c5 /* Fujitsu Ltd. */ +#define USB_VENDOR_TOSHIBAAM 0x04c6 /* Toshiba America Electronic Components */ +#define USB_VENDOR_MICROMACRO 0x04c7 /* Micro Macro Technologies */ #define USB_VENDOR_KONICA 0x04c8 /* Konica Corp. */ +#define USB_VENDOR_LITEON 0x04ca /* Lite-On Technology Corp. */ +#define USB_VENDOR_FUJIPHOTO 0x04cb /* Fuji Photo Film Co., Ltd. */ +#define USB_VENDOR_PHILIPSSEMI 0x04cc /* Philips Semiconductors */ +#define USB_VENDOR_TATUNG 0x04cd /* Tatung Co. Of America */ +#define USB_VENDOR_SCANLOGIC 0x04ce /* ScanLogic Corp. */ +#define USB_VENDOR_MYSON 0x04cf /* Myson Technology Inc. */ +#define USB_VENDOR_DIGI2 0x04d0 /* Digi International */ +#define USB_VENDOR_ITTCANON 0x04d1 /* ITT Canon */ #define USB_VENDOR_ALTEC 0x04d2 /* Altec Lansing Technologies, Inc. */ #define USB_VENDOR_SHUTTLE 0x04e6 /* Shuttle Technology */ #define USB_VENDOR_ANNABOOKS 0x04ed /* Annabooks */ @@ -133,6 +148,7 @@ #define USB_VENDOR_IOMEGA 0x059b /* Iomega Corp. */ #define USB_VENDOR_ATREND 0x059c /* A-Trend Technology Co., Ltd. */ #define USB_VENDOR_AID 0x059d /* Advanced Input Devices */ +#define USB_VENDOR_LACIE 0x059f /* LaCie */ #define USB_VENDOR_OMNIVISION 0x05a9 /* OmniVision */ #define USB_VENDOR_INSYSTEM 0x05ab /* In-System Design */ #define USB_VENDOR_APPLE 0x05ac /* Apple Computer */ @@ -142,8 +158,13 @@ #define USB_VENDOR_BRAINBOXES 0x05d1 /* Brainboxes Limited */ #define USB_VENDOR_AXIOHM 0x05d9 /* Axiohm Transaction Solutions */ #define USB_VENDOR_MICROTEK 0x05da /* Microtek */ +#define USB_VENDOR_SYMBOL 0x05e0 /* Symbol Technologies */ +#define USB_VENDOR_GENESYS 0x05e3 /* Genesys Logic, Inc. */ +#define USB_VENDOR_FUJI 0x05e5 /* Fuji Electric Co., Ltd. */ +#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_ANKO 0x05ef /* Anko Electronic Co., Ltd. */ #define USB_VENDOR_PIENGINEERING 0x05f3 /* P.I. Engineering */ #define USB_VENDOR_AOC 0x05f6 /* AOC International */ @@ -180,15 +201,19 @@ #define USB_VENDOR_MCT 0x0711 /* MCT Corp. */ #define USB_VENDOR_AUREAL 0x0755 /* Aureal Semiconductor */ #define USB_VENDOR_MIDIMAN 0x0763 /* Midiman */ +#define USB_VENDOR_GRIFFIN 0x077d /* Griffin Technology, Inc. */ #define USB_VENDOR_SANDISK 0x0781 /* SanDisk Corp */ #define USB_VENDOR_BRIMAX 0x078e /* Brimax, Inc. */ #define USB_VENDOR_AXIS 0x0792 /* Axis Communications AB */ #define USB_VENDOR_ABL 0x0794 /* ABL Electronics Corp. */ #define USB_VENDOR_ALFADATA 0x079d /* Alfadata Computer Corp. */ +#define USB_VENDOR_NATIONALTECH 0x07a2 /* National Technical Systems */ +#define USB_VENDOR_ONNTO 0x07a3 /* Onnto Corp. */ #define USB_VENDOR_BE 0x07a4 /* Be, Inc. */ #define USB_VENDOR_ADMTEK 0x07a6 /* ADMtek, Inc. */ #define USB_VENDOR_COREGA 0x07aa /* Corega */ #define USB_VENDOR_FREECOM 0x07ab /* Freecom */ +#define USB_VENDOR_MICROTECH 0x07af /* Microtech */ #define USB_VENDOR_ABOCOM 0x07b8 /* AboCom Systems, Inc. */ #define USB_VENDOR_KEISOKUGIKEN 0x07c1 /* Keisokugiken Corp. */ #define USB_VENDOR_APG 0x07c5 /* APG Cash Drawer */ @@ -237,13 +262,14 @@ #define USB_VENDOR_ARESCOM 0x09f5 /* ARESCOM */ #define USB_VENDOR_BAY 0x09f9 /* Bay Associates */ #define USB_VENDOR_ALTERA 0x09fb /* Altera */ +#define USB_VENDOR_TREK 0x0a16 /* Trek Technology */ #define USB_VENDOR_ASAHIOPTICAL 0x0a17 /* Asahi Optical Co., Ltd. */ #define USB_VENDOR_BOCASYSTEMS 0x0a43 /* Boca Systems, Inc. */ #define USB_VENDOR_BROADCOM 0x0a5c /* Broadcom Corp. */ #define USB_VENDOR_GEOCAST 0x0a79 /* Geocast Network Systems */ #define USB_VENDOR_MOTOROLA 0x1063 /* Motorola */ #define USB_VENDOR_PLX 0x10b5 /* PLX */ -#define USB_VENDOR_BELKIN2 0x1293 /* Belkin Components (second entry) */ +#define USB_VENDOR_BELKIN2 0x1293 /* Belkin Components (2nd) */ #define USB_VENDOR_UMAX 0x1606 /* UMAX Data Systems, Inc. */ #define USB_VENDOR_INSIDEOUT 0x1608 /* Inside Out Networks */ #define USB_VENDOR_ENTREGA 0x1645 /* Entrega */ @@ -270,6 +296,7 @@ /* Acer Peripherals, Inc. products */ #define USB_PRODUCT_ACERP_ACERSCAN_C310U 0x12a6 /* Acerscan C310U */ +#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 */ @@ -288,8 +315,8 @@ /* AGFA products */ #define USB_PRODUCT_AGFA_SNAPSCAN1212U 0x0001 /* SnapScan 1212U */ -#define USB_PRODUCT_AGFA_SNAPSCAN1212U2 0x2061 /* SnapScan 1212U */ #define USB_PRODUCT_AGFA_SNAPSCANTOUCH 0x0100 /* SnapScan Touch */ +#define USB_PRODUCT_AGFA_SNAPSCAN1212U2 0x2061 /* SnapScan 1212U */ /* AKS products */ #define USB_PRODUCT_AKS_USBHASP 0x0001 /* USB-HASP 0.06 */ @@ -316,6 +343,9 @@ /* AOX, Inc. products */ #define USB_PRODUCT_AOX_USB101 0x0008 /* USB ethernet controller engine */ +/* Apple Computer products */ +#define USB_PRODUCT_APPLE_SPEAKERS 0x1101 /* Speakers */ + /* ATen products */ #define USB_PRODUCT_ATEN_UC1284 0x2001 /* Parallel printer adapter */ #define USB_PRODUCT_ATEN_UC10T 0x2002 /* 10Mbps ethernet adapter */ @@ -410,13 +440,14 @@ #define USB_PRODUCT_ENTREGA_1S9 0x0093 /* 1S9 serial connector */ #define USB_PRODUCT_ENTREGA_EZUSB 0x8000 /* EZ-USB */ /*product ENTREGA SERIAL 0x8001 DB25 Serial connector*/ -#define USB_PRODUCT_ENTREGA_2U4S 0x8004 /* 2 USB + 4 serial ports */ +#define USB_PRODUCT_ENTREGA_2U4S 0x8004 /* 2U4S serial connector/usb hub */ /*product ENTREGA SERIAL_DB9 0x8093 DB9 Serial connector*/ /* e-TEK Labs products */ #define USB_PRODUCT_ETEK_1COM 0x8007 /* Serial port */ /* Epson products */ +#define USB_PRODUCT_EPSON_PRINTER1 0x0001 /* USB Printer */ #define USB_PRODUCT_EPSON_PRINTER2 0x0002 /* ISD USB Smart Cable for Mac */ #define USB_PRODUCT_EPSON_PRINTER3 0x0003 /* ISD USB Smart Cable */ #define USB_PRODUCT_EPSON_636 0x0101 /* Perfection 636U / 636Photo scanner */ @@ -432,6 +463,9 @@ /* Gravis products */ #define USB_PRODUCT_GRAVIS_GAMEPADPRO 0x4001 /* GamePad Pro */ +/* Griffin Technology */ +#define USB_PRODUCT_GRIFFIN_IMATE 0x0405 /* iMate, ABD adapter */ + /* Freecom products */ #define USB_PRODUCT_FREECOM_DVD 0xfc01 /* Connector for DVD drive */ @@ -508,6 +542,9 @@ #define USB_PRODUCT_KYE_FLIGHT2000 0x1004 /* Flight 2000 joystick */ #define USB_PRODUCT_KYE_VIVIDPRO 0x2001 /* ColorPage Vivid-Pro scanner */ +/* LaCie products */ +#define USB_PRODUCT_LACIE_CDRW 0xa602 /* CD R/W */ + /* Lexmark products */ #define USB_PRODUCT_LEXMARK_S2450 0x0009 /* Optra S 2450 */ @@ -529,6 +566,7 @@ #define USB_PRODUCT_LOGITECH_N48 0xc001 /* N48 mouse */ #define USB_PRODUCT_LOGITECH_MBA47 0xc002 /* M-BA47 mouse */ #define USB_PRODUCT_LOGITECH_WMMOUSE 0xc004 /* WingMan Gaming Mouse */ +#define USB_PRODUCT_LOGITECH_BB13 0xc401 /* USB-PS/2 Trackball */ #define USB_PRODUCT_LOGITECH_WMPAD 0xc208 /* WingMan GamePad Extreme */ #define USB_PRODUCT_LOGITECH_WMJOY 0xc281 /* WingMan Force joystick */ #define USB_PRODUCT_LOGITECH_QUICKCAMPRO2 0xd001 /* QuickCam Pro */ @@ -574,8 +612,8 @@ #define USB_PRODUCT_MULTITECH_ATLAS 0xf101 /* MT5634ZBA-USB modem */ /* Mustek products */ -#define USB_PRODUCT_MUSTEK_MDC800 0xa800 /* MDC-800 digital camera */ #define USB_PRODUCT_MUSTEK_1200CU 0x0001 /* 1200 CU scanner */ +#define USB_PRODUCT_MUSTEK_MDC800 0xa800 /* MDC-800 digital camera */ /* NEC products */ #define USB_PRODUCT_NEC_HUB 0x55aa /* hub */ @@ -614,28 +652,34 @@ #define USB_PRODUCT_PLX_TESTBOARD 0x9060 /* test board */ /* Primax products */ -#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 */ #define USB_PRODUCT_PRIMAX_G2E300 0x0301 /* G2E-300 scanner */ -#define USB_PRODUCT_PRIMAX_636I 0x0381 /* ReadyScan 636i */ #define USB_PRODUCT_PRIMAX_G2300 0x0302 /* G2-300 scanner */ -#define USB_PRODUCT_PRIMAX_G2600 0x0382 /* G2-600 scanner */ #define USB_PRODUCT_PRIMAX_G2E3002 0x0303 /* G2E-300 scanner */ -#define USB_PRODUCT_PRIMAX_G2E600 0x0383 /* G2E-600 scanner */ #define USB_PRODUCT_PRIMAX_9600 0x0340 /* Colorado USB 9600 scanner */ -#define USB_PRODUCT_PRIMAX_19200 0x0360 /* Colorado USB 19200 scanner */ #define USB_PRODUCT_PRIMAX_600U 0x0341 /* Colorado 600u scanner */ +#define USB_PRODUCT_PRIMAX_19200 0x0360 /* Colorado USB 19200 scanner */ #define USB_PRODUCT_PRIMAX_1200U 0x0361 /* Colorado 1200u scanner */ +#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_COMFORT 0x4d01 /* Comfort */ +#define USB_PRODUCT_PRIMAX_MOUSEINABOX 0x4d02 /* Mouse-in-a-Box */ +#define USB_PRODUCT_PRIMAX_PCGAUMS1 0x4d04 /* Sony PCGA-UMS1 */ /* 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_ATAPI4 0x2307 /* ATAPI-4 Bridge Controller */ +/* Qtronix products */ +#define USB_PRODUCT_QTRONIX_980N 0x2011 /* Scorpion-980N keyboard */ + /* Quickshot products */ #define USB_PRODUCT_QUICKSHOT_STRIKEPAD 0x6238 /* USB StrikePad */ +/* Rainbow Technologies products */ +#define USB_PRODUCT_RAINBOW_IKEY2000 0x1200 /* i-Key 2000 */ + /* Rockfire products */ #define USB_PRODUCT_ROCKFIRE_GAMEPAD 0x2033 /* gamepad 203USB */ @@ -675,7 +719,9 @@ /* XXX The above is a North American PC style keyboard possibly */ /* Supra products */ -#define USB_PRODUCT_SUPRA_SUPRAEXPRESS56K 0x07da /* Supra Express 56K modem */ +#define USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K 0x07da /* Supra Express 56K modem */ +#define USB_PRODUCT_DIAMOND2_SUPRA2890 0x0b4a /* SupraMax 2890 56K Modem */ +#define USB_PRODUCT_DIAMOND2_RIO600USB 0x5001 /* Rio 600 USB */ /* TEAC products */ #define USB_PRODUCT_TEAC_FD05PUB 0x0000 /* FD-05PUB floppy */ @@ -689,6 +735,9 @@ /* Thrustmaster products */ #define USB_PRODUCT_THRUST_FUSION_PAD 0xa0a3 /* Fusion Digital Gamepad */ +/* Trek Technology products */ +#define USB_PRODUCT_TREK_THUMBDRIVE 0x1111 /* ThumbDrive */ + /* UMAX products */ #define USB_PRODUCT_UMAX_ASTRA1236U 0x0002 /* Astra 1236U Scanner */ #define USB_PRODUCT_UMAX_ASTRA1220U 0x0010 /* Astra 1220U Scanner */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index a724f16..79b74e7 100644 --- a/sys/dev/usb/usbdevs_data.h +++ b/sys/dev/usb/usbdevs_data.h @@ -4,7 +4,7 @@ * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.38 2000/10/07 11:01:54 n_hibma Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.39 2000/10/07 11:10:53 n_hibma Exp */ /* @@ -100,6 +100,12 @@ struct usb_knowndev usb_knowndevs[] = { "Acerscan C310U", }, { + USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_320U, + 0, + "Acer Peripherals, Inc.", + "Acerscan 320U", + }, + { USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_640U, 0, "Acer Peripherals, Inc.", @@ -148,16 +154,16 @@ struct usb_knowndev usb_knowndevs[] = { "SnapScan 1212U", }, { - USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1212U2, + USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANTOUCH, 0, "AGFA-Gevaert NV", - "SnapScan 1212U", + "SnapScan Touch", }, { - USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANTOUCH, + USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1212U2, 0, "AGFA-Gevaert NV", - "SnapScan Touch", + "SnapScan 1212U", }, { USB_VENDOR_AKS, USB_PRODUCT_AKS_USBHASP, @@ -232,6 +238,12 @@ struct usb_knowndev usb_knowndevs[] = { "USB ethernet controller engine", }, { + USB_VENDOR_APPLE, USB_PRODUCT_APPLE_SPEAKERS, + 0, + "Apple Computer", + "Speakers", + }, + { USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC1284, 0, "ATEN International Co. Ltd.", @@ -258,7 +270,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_BELKIN2, USB_PRODUCT_BELKIN2_F5U002, 0, - "Belkin Components (second entry)", + "Belkin Components (2nd)", "F5U002 Parallel printer adapter", }, { @@ -511,7 +523,7 @@ struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_2U4S, 0, "Entrega", - "2 USB + 4 serial ports", + "2U4S serial connector/usb hub", }, { USB_VENDOR_ETEK, USB_PRODUCT_ETEK_1COM, @@ -520,6 +532,12 @@ struct usb_knowndev usb_knowndevs[] = { "Serial port", }, { + USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER1, + 0, + "Seiko Epson Corp.", + "USB Printer", + }, + { USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER2, 0, "Seiko Epson Corp.", @@ -568,6 +586,12 @@ struct usb_knowndev usb_knowndevs[] = { "GamePad Pro", }, { + USB_VENDOR_GRIFFIN, USB_PRODUCT_GRIFFIN_IMATE, + 0, + "Griffin Technology, Inc.", + "iMate, ABD adapter", + }, + { USB_VENDOR_FREECOM, USB_PRODUCT_FREECOM_DVD, 0, "Freecom", @@ -808,6 +832,12 @@ struct usb_knowndev usb_knowndevs[] = { "ColorPage Vivid-Pro scanner", }, { + USB_VENDOR_LACIE, USB_PRODUCT_LACIE_CDRW, + 0, + "LaCie", + "CD R/W", + }, + { USB_VENDOR_LEXMARK, USB_PRODUCT_LEXMARK_S2450, 0, "Lexmark International, Inc.", @@ -904,6 +934,12 @@ struct usb_knowndev usb_knowndevs[] = { "WingMan Gaming Mouse", }, { + USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_BB13, + 0, + "Logitech, Inc.", + "USB-PS/2 Trackball", + }, + { USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMPAD, 0, "Logitech, Inc.", @@ -1054,16 +1090,16 @@ struct usb_knowndev usb_knowndevs[] = { "MT5634ZBA-USB modem", }, { - USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_MDC800, + USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CU, 0, "Mustek Systems, Inc.", - "MDC-800 digital camera", + "1200 CU scanner", }, { - USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CU, + USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_MDC800, 0, "Mustek Systems, Inc.", - "1200 CU scanner", + "MDC-800 digital camera", }, { USB_VENDOR_NEC, USB_PRODUCT_NEC_HUB, @@ -1174,82 +1210,82 @@ struct usb_knowndev usb_knowndevs[] = { "test board", }, { - USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_COMFORT, + USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E300, 0, "Primax Electronics", - "Comfort", + "G2E-300 scanner", }, { - USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_MOUSEINABOX, + USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2300, 0, "Primax Electronics", - "Mouse-in-a-Box", + "G2-300 scanner", }, { - USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_PCGAUMS1, + USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E3002, 0, "Primax Electronics", - "Sony PCGA-UMS1", + "G2E-300 scanner", }, { - USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E300, + USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_9600, 0, "Primax Electronics", - "G2E-300 scanner", + "Colorado USB 9600 scanner", }, { - USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_636I, + USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_600U, 0, "Primax Electronics", - "ReadyScan 636i", + "Colorado 600u scanner", }, { - USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2300, + USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_19200, 0, "Primax Electronics", - "G2-300 scanner", + "Colorado USB 19200 scanner", }, { - USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2600, + USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_1200U, 0, "Primax Electronics", - "G2-600 scanner", + "Colorado 1200u scanner", }, { - USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E3002, + USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_636I, 0, "Primax Electronics", - "G2E-300 scanner", + "ReadyScan 636i", }, { - USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E600, + USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2600, 0, "Primax Electronics", - "G2E-600 scanner", + "G2-600 scanner", }, { - USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_9600, + USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E600, 0, "Primax Electronics", - "Colorado USB 9600 scanner", + "G2E-600 scanner", }, { - USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_19200, + USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_COMFORT, 0, "Primax Electronics", - "Colorado USB 19200 scanner", + "Comfort", }, { - USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_600U, + USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_MOUSEINABOX, 0, "Primax Electronics", - "Colorado 600u scanner", + "Mouse-in-a-Box", }, { - USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_1200U, + USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_PCGAUMS1, 0, "Primax Electronics", - "Colorado 1200u scanner", + "Sony PCGA-UMS1", }, { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2301, @@ -1270,12 +1306,24 @@ struct usb_knowndev usb_knowndevs[] = { "ATAPI-4 Bridge Controller", }, { + USB_VENDOR_QTRONIX, USB_PRODUCT_QTRONIX_980N, + 0, + "Qtronix Corp", + "Scorpion-980N keyboard", + }, + { USB_VENDOR_QUICKSHOT, USB_PRODUCT_QUICKSHOT_STRIKEPAD, 0, "Quickshot", "USB StrikePad", }, { + USB_VENDOR_RAINBOW, USB_PRODUCT_RAINBOW_IKEY2000, + 0, + "Rainbow Technologies", + "i-Key 2000", + }, + { USB_VENDOR_ROCKFIRE, USB_PRODUCT_ROCKFIRE_GAMEPAD, 0, "Rockfire", @@ -1354,12 +1402,24 @@ struct usb_knowndev usb_knowndevs[] = { "Type 6 USB", }, { - USB_VENDOR_SUPRA, USB_PRODUCT_SUPRA_SUPRAEXPRESS56K, + USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_SUPRAEXPRESS56K, 0, - "Supra", + "Diamond (Supra)", "Supra Express 56K modem", }, { + USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_SUPRA2890, + 0, + "Diamond (Supra)", + "SupraMax 2890 56K Modem", + }, + { + USB_VENDOR_DIAMOND2, USB_PRODUCT_DIAMOND2_RIO600USB, + 0, + "Diamond (Supra)", + "Rio 600 USB", + }, + { USB_VENDOR_TEAC, USB_PRODUCT_TEAC_FD05PUB, 0, "TEAC", @@ -1384,6 +1444,12 @@ struct usb_knowndev usb_knowndevs[] = { "Fusion Digital Gamepad", }, { + USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE, + 0, + "Trek Technology", + "ThumbDrive", + }, + { USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1236U, 0, "UMAX Data Systems, Inc.", @@ -1606,9 +1672,9 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { - USB_VENDOR_SUPRA, 0, + USB_VENDOR_DIAMOND2, 0, USB_KNOWNDEV_NOPROD, - "Supra", + "Diamond (Supra)", NULL, }, { @@ -1696,15 +1762,15 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { - USB_VENDOR_CANON, 0, + USB_VENDOR_VISIONEER, 0, USB_KNOWNDEV_NOPROD, - "Canon, Inc.", + "Visioneer", NULL, }, { - USB_VENDOR_VISIONEER, 0, + USB_VENDOR_CANON, 0, USB_KNOWNDEV_NOPROD, - "Visioneer", + "Canon, Inc.", NULL, }, { @@ -1726,6 +1792,12 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_RAINBOW, 0, + USB_KNOWNDEV_NOPROD, + "Rainbow Technologies", + NULL, + }, + { USB_VENDOR_IODATA, 0, USB_KNOWNDEV_NOPROD, "I/O Data", @@ -1738,12 +1810,96 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_METHODE, 0, + USB_KNOWNDEV_NOPROD, + "Methode Electronics Far East PTE Ltd.", + NULL, + }, + { + USB_VENDOR_MAXISWITCH, 0, + USB_KNOWNDEV_NOPROD, + "Maxi Switch, Inc.", + NULL, + }, + { + USB_VENDOR_LOCKHEEDMER, 0, + USB_KNOWNDEV_NOPROD, + "Lockheed Martin Energy Research", + NULL, + }, + { + USB_VENDOR_FUJITSU, 0, + USB_KNOWNDEV_NOPROD, + "Fujitsu Ltd.", + NULL, + }, + { + USB_VENDOR_TOSHIBAAM, 0, + USB_KNOWNDEV_NOPROD, + "Toshiba America Electronic Components", + NULL, + }, + { + USB_VENDOR_MICROMACRO, 0, + USB_KNOWNDEV_NOPROD, + "Micro Macro Technologies", + NULL, + }, + { USB_VENDOR_KONICA, 0, USB_KNOWNDEV_NOPROD, "Konica Corp.", NULL, }, { + USB_VENDOR_LITEON, 0, + USB_KNOWNDEV_NOPROD, + "Lite-On Technology Corp.", + NULL, + }, + { + USB_VENDOR_FUJIPHOTO, 0, + USB_KNOWNDEV_NOPROD, + "Fuji Photo Film Co., Ltd.", + NULL, + }, + { + USB_VENDOR_PHILIPSSEMI, 0, + USB_KNOWNDEV_NOPROD, + "Philips Semiconductors", + NULL, + }, + { + USB_VENDOR_TATUNG, 0, + USB_KNOWNDEV_NOPROD, + "Tatung Co. Of America", + NULL, + }, + { + USB_VENDOR_SCANLOGIC, 0, + USB_KNOWNDEV_NOPROD, + "ScanLogic Corp.", + NULL, + }, + { + USB_VENDOR_MYSON, 0, + USB_KNOWNDEV_NOPROD, + "Myson Technology Inc.", + NULL, + }, + { + USB_VENDOR_DIGI2, 0, + USB_KNOWNDEV_NOPROD, + "Digi International", + NULL, + }, + { + USB_VENDOR_ITTCANON, 0, + USB_KNOWNDEV_NOPROD, + "ITT Canon", + NULL, + }, + { USB_VENDOR_ALTEC, 0, USB_KNOWNDEV_NOPROD, "Altec Lansing Technologies, Inc.", @@ -1990,6 +2146,12 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_LACIE, 0, + USB_KNOWNDEV_NOPROD, + "LaCie", + NULL, + }, + { USB_VENDOR_OMNIVISION, 0, USB_KNOWNDEV_NOPROD, "OmniVision", @@ -2044,6 +2206,30 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_SYMBOL, 0, + USB_KNOWNDEV_NOPROD, + "Symbol Technologies", + NULL, + }, + { + USB_VENDOR_GENESYS, 0, + USB_KNOWNDEV_NOPROD, + "Genesys Logic, Inc.", + NULL, + }, + { + USB_VENDOR_FUJI, 0, + USB_KNOWNDEV_NOPROD, + "Fuji Electric Co., Ltd.", + NULL, + }, + { + USB_VENDOR_KEITHLEY, 0, + USB_KNOWNDEV_NOPROD, + "Keithley Instruments", + NULL, + }, + { USB_VENDOR_EIZONANAO, 0, USB_KNOWNDEV_NOPROD, "EIZO Nanao", @@ -2056,6 +2242,12 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_FFC, 0, + USB_KNOWNDEV_NOPROD, + "FFC Limited", + NULL, + }, + { USB_VENDOR_ANKO, 0, USB_KNOWNDEV_NOPROD, "Anko Electronic Co., Ltd.", @@ -2272,6 +2464,12 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_GRIFFIN, 0, + USB_KNOWNDEV_NOPROD, + "Griffin Technology, Inc.", + NULL, + }, + { USB_VENDOR_SANDISK, 0, USB_KNOWNDEV_NOPROD, "SanDisk Corp", @@ -2302,6 +2500,18 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_NATIONALTECH, 0, + USB_KNOWNDEV_NOPROD, + "National Technical Systems", + NULL, + }, + { + USB_VENDOR_ONNTO, 0, + USB_KNOWNDEV_NOPROD, + "Onnto Corp.", + NULL, + }, + { USB_VENDOR_BE, 0, USB_KNOWNDEV_NOPROD, "Be, Inc.", @@ -2326,6 +2536,12 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_MICROTECH, 0, + USB_KNOWNDEV_NOPROD, + "Microtech", + NULL, + }, + { USB_VENDOR_ABOCOM, 0, USB_KNOWNDEV_NOPROD, "AboCom Systems, Inc.", @@ -2614,6 +2830,12 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_TREK, 0, + USB_KNOWNDEV_NOPROD, + "Trek Technology", + NULL, + }, + { USB_VENDOR_ASAHIOPTICAL, 0, USB_KNOWNDEV_NOPROD, "Asahi Optical Co., Ltd.", @@ -2652,7 +2874,7 @@ struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_BELKIN2, 0, USB_KNOWNDEV_NOPROD, - "Belkin Components (second entry)", + "Belkin Components (2nd)", NULL, }, { |