Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src/sys/dev/usb Regen after pulling up rev. 1.104 -> 1.117 ...
details: https://anonhg.NetBSD.org/src/rev/1ea0f50e8dd7
branches: netbsd-1-5
changeset: 489717:1ea0f50e8dd7
user: hubertf <hubertf%NetBSD.org@localhost>
date: Sun Oct 08 19:51:35 2000 +0000
description:
Regen after pulling up rev. 1.104 -> 1.117 of usbdevs to netbsd-1-5 branch,
OK'd by thorpej:
revision 1.117
date: 2000/10/04 02:09:07; author: augustss; state: Exp; lines: +15 -1
Add more vendors.
----------------------------
revision 1.116
date: 2000/09/28 01:26:49; author: augustss; state: Exp; lines: +8 -1
Add a couple of Apple products.
----------------------------
revision 1.115
date: 2000/09/24 03:21:55; author: augustss; state: Exp; lines: +2 -1
Add another scanner.
----------------------------
revision 1.114
date: 2000/09/23 18:39:41; author: augustss; state: Exp; lines: +9 -1
Add some more vendors.
----------------------------
revision 1.113
date: 2000/09/16 11:45:38; author: ichiro; state: Exp; lines: +2 -2
delete "128MB"
same products number; 32MB,64MB,128MB
----------------------------
revision 1.112
date: 2000/09/14 03:11:23; author: augustss; state: Exp; lines: +7 -4
Ad some new devices and change vendor name from SUPRA to DIAMOND2.
----------------------------
revision 1.111
date: 2000/09/14 00:02:56; author: hubertf; state: Exp; lines: +5 -1
Add Trek Technology ThumbDrive (128MB)
----------------------------
revision 1.110
date: 2000/09/07 03:59:55; author: augustss; state: Exp; lines: +59 -6
Add scores of scanners (from FreeBSD).
----------------------------
revision 1.109
date: 2000/09/05 22:39:16; author: augustss; state: Exp; lines: +2 -1
Add a Logitech trackball.
----------------------------
revision 1.108
date: 2000/08/17 15:17:00; author: darrenr; state: Exp; lines: +8 -4
add vendor/product information for Rainbow i-Key 2000
----------------------------
revision 1.107
date: 2000/08/12 14:51:01; author: augustss; state: Exp; lines: +10 -1
Add some more vendors and devices.
----------------------------
revision 1.106
date: 2000/08/04 11:57:34; author: augustss; state: Exp; lines: +2 -1
Add ATEN serial adapter.
----------------------------
revision 1.105
date: 2000/07/17 13:06:54; author: augustss; state: Exp; lines: +9 -1
Some more products (from FreeBSD).
diffstat:
sys/dev/usb/usbdevs.h | 123 +++++++++-
sys/dev/usb/usbdevs_data.h | 538 ++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 648 insertions(+), 13 deletions(-)
diffs (truncated from 1151 to 300 lines):
diff -r 24546fdde4d8 -r 1ea0f50e8dd7 sys/dev/usb/usbdevs.h
--- a/sys/dev/usb/usbdevs.h Sun Oct 08 19:49:04 2000 +0000
+++ b/sys/dev/usb/usbdevs.h Sun Oct 08 19:51:35 2000 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.104.2.1 2000/07/03 22:56:15 thorpej Exp $ */
+/* $NetBSD: usbdevs.h,v 1.104.2.2 2000/10/08 19:51:36 hubertf Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.103.2.1 2000/07/03 22:55:53 thorpej Exp
+ * NetBSD: usbdevs,v 1.103.2.2 2000/10/08 19:49:04 hubertf Exp
*/
/*
@@ -69,6 +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_DIAMOND2 0x045a /* Diamond (Supra) */
#define USB_VENDOR_MICROSOFT 0x045e /* Microsoft */
#define USB_VENDOR_PRIMAX 0x0461 /* Primax Electronics */
#define USB_VENDOR_AMP 0x0464 /* AMP, Inc. */
@@ -83,12 +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_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 */
@@ -108,6 +126,7 @@
#define USB_VENDOR_AKS 0x0529 /* Aladdin Knowledge Systems */
#define USB_VENDOR_UNIACCESS 0x0540 /* Universal Access */
#define USB_VENDOR_ANCHOR 0x0547 /* Anchor Chips, Inc. */
+#define USB_VENDOR_SONY 0x054c /* Sony Corp. */
#define USB_VENDOR_VISION 0x0553 /* VLSI Vision Ltd. */
#define USB_VENDOR_ASAHIKASEI 0x0556 /* Asahi Kasei Microsystems Co., Ltd */
#define USB_VENDOR_ATEN 0x0557 /* ATEN International Co. Ltd. */
@@ -128,6 +147,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 */
@@ -136,8 +156,14 @@
#define USB_VENDOR_ELSA 0x05cc /* ELSA Gmbh */
#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 */
@@ -174,15 +200,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 */
@@ -230,12 +260,15 @@
#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 (2nd) */
+#define USB_VENDOR_UMAX 0x1606 /* UMAX */
#define USB_VENDOR_INSIDEOUT 0x1608 /* Inside Out Networks */
#define USB_VENDOR_ENTREGA 0x1645 /* Entrega */
#define USB_VENDOR_ACTIONTEC 0x1668 /* Actiontec Electronics, Inc. */
@@ -261,6 +294,9 @@
/* 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 */
/* ActiveWire, Inc. products */
#define USB_PRODUCT_ACTIVEWIRE_IOBOARD 0x0100 /* I/O Board */
@@ -275,6 +311,11 @@
/* 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 */
+#define USB_PRODUCT_AGFA_SNAPSCAN1212U2 0x2061 /* SnapScan 1212U */
+
/* AKS products */
#define USB_PRODUCT_AKS_USBHASP 0x0001 /* USB-HASP 0.06 */
@@ -295,16 +336,25 @@
/* Anchor products */
#define USB_PRODUCT_ANCHOR_EZUSB 0x2131 /* EZUSB */
+#define USB_PRODUCT_ANCHOR_EZLINK 0x2720 /* EZLINK */
/* 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 */
+#define USB_PRODUCT_ATEN_UC232A 0x2008 /* Serial adapter */
+
+/* Avision products */
+#define USB_PRODUCT_AVISION_1200U 0x0268 /* 1200U scanner */
/* Belkin products */
/*product BELKIN F5U111 0x???? F5U111 Ethernet adapter*/
+#define USB_PRODUCT_BELKIN2_F5U002 0x0002 /* F5U002 Parallel printer adapter */
/* Billionton products */
#define USB_PRODUCT_BILLIONTON_USB100 0x0986 /* USB100N 10/100 FastEthernet Adapter */
@@ -387,11 +437,16 @@
#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 /* 2U4S serial connector/usb hub */
/*product ENTREGA SERIAL_DB9 0x8093 DB9 Serial connector*/
/* 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 */
+#define USB_PRODUCT_EPSON_610 0x0103 /* Perfection 610 scanner */
+#define USB_PRODUCT_EPSON_1200 0x0104 /* Perfection 1200U / 1200Photo scanner */
/* e-TEK Labs products */
#define USB_PRODUCT_ETEK_1COM 0x8007 /* Serial port */
@@ -402,6 +457,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 */
@@ -423,6 +481,9 @@
#define USB_PRODUCT_HP_970CSE 0x1004 /* Deskjet 970Cse */
#define USB_PRODUCT_HP_P1100 0x3102 /* Photosmart P1100 */
+/* IBM Corporation */
+#define USB_PRODUCT_IBM_USBCDROMDRIVE 0x4427 /* USB CD-ROM Drive */
+
/* Inside Out Networks products */
#define USB_PRODUCT_INSIDEOUT_EDGEPORT4 0x0001 /* EdgePort/4 serial ports */
@@ -430,6 +491,7 @@
#define USB_PRODUCT_INSYSTEM_F5U002 0x0002 /* Parallel printer adapter */
#define USB_PRODUCT_INSYSTEM_ISD110 0x0200 /* IDE adapter ISD110 */
#define USB_PRODUCT_INSYSTEM_ISD105 0x0202 /* IDE adapter ISD105 */
+#define USB_PRODUCT_INSYSTEM_USBCABLE 0x081a /* USB cable */
/* Intel products */
#define USB_PRODUCT_INTEL_TESTBOARD 0x9890 /* 82930 test board */
@@ -472,6 +534,10 @@
#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 */
+
+/* LaCie products */
+#define USB_PRODUCT_LACIE_CDRW 0xa602 /* CD R/W */
/* Lexmark products */
#define USB_PRODUCT_LEXMARK_S2450 0x0009 /* Optra S 2450 */
@@ -494,6 +560,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 */
@@ -520,6 +587,15 @@
#define USB_PRODUCT_MICROSOFT_INTELLIEYE 0x0025 /* IntelliEye mouse */
#define USB_PRODUCT_MICROSOFT_INETPRO 0x002b /* Internet Keyboard Pro */
+/* Microtek products */
+#define USB_PRODUCT_MICROTEK_X6U 0x0099 /* ScanMaker X6 - X6U */
+#define USB_PRODUCT_MICROTEK_336CX 0x0094 /* Phantom 336CX - C3 scanner */
+#define USB_PRODUCT_MICROTEK_336CX2 0x00a0 /* Phantom 336CX - C3 scanner */
+#define USB_PRODUCT_MICROTEK_C6 0x009a /* Phantom C6 scanner */
+#define USB_PRODUCT_MICROTEK_V6USL 0x00a3 /* ScanMaker V6USL */
+#define USB_PRODUCT_MICROTEK_V6USL2 0x80a3 /* ScanMaker V6USL */
+#define USB_PRODUCT_MICROTEK_V6UL 0x80ac /* ScanMaker V6UL */
+
/* Midiman products */
#define USB_PRODUCT_MIDIMAN_MIDISPORT2X2 0x1001 /* Midisport 2x2 */
@@ -530,6 +606,7 @@
#define USB_PRODUCT_MULTITECH_ATLAS 0xf101 /* MT5634ZBA-USB modem */
/* Mustek products */
+#define USB_PRODUCT_MUSTEK_1200CU 0x0001 /* 1200 CU scanner */
#define USB_PRODUCT_MUSTEK_MDC800 0xa800 /* MDC-800 digital camera */
/* NEC products */
@@ -569,6 +646,16 @@
#define USB_PRODUCT_PLX_TESTBOARD 0x9060 /* test board */
/* Primax products */
+#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 USB 9600 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 */
@@ -576,16 +663,20 @@
/* 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 */
-/* Qtronix products */
-#define USB_PRODUCT_QTRONIX_980N 0x2011 /* Scorpion-980N keyboard */
-
/* SanDisk products */
#define USB_PRODUCT_SANDISK_IMAGEMATE 0x0001 /* USB ImageMate */
@@ -608,6 +699,9 @@
/* SOLID YEAR products */
Home |
Main Index |
Thread Index |
Old Index