Sync with NetBSD usbdevs

1 files changed, 56 insertions, 16 deletions

diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 445dd08..fd0eae1 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -49,10 +49,10 @@ $FreeBSD$
  *
  * After adding a vendor ID VNDR and a product ID PRDCT you will have the
  * following extra defines:
- * #define USB_VENDOR_VNDR		0x????
- * #define USB_PRODUCT_VNDR_PRDCT	0x????
+ * #define USB_VENDOR_VNDR              0x????
+ * #define USB_PRODUCT_VNDR_PRDCT       0x????
  *
- * You will have to add these defines to the respective probe routines to
+ * You may have to add these defines to the respective probe routines to
  * make the device recognised by the appropriate device driver.
  */
 
@@ -95,7 +95,7 @@ vendor STMICRO		0x0483	STMicroelectronics
 vendor YAMAHA		0x0499	YAMAHA Corp.
 vendor COMPAQ		0x049f	Compaq Computers
 vendor ACERP		0x04a5	Acer Peripherals, Inc.
-vendor VISIONEER	0x04a7  Visioneer
+vendor VISIONEER	0x04a7	Visioneer
 vendor CANON		0x04a9	Canon, Inc.
 vendor NIKON		0x04b0	Nikon
 vendor IBM		0x04b3	IBM Corporation
@@ -120,6 +120,7 @@ vendor MYSON		0x04cf	Myson Technology Inc.
 vendor DIGI2		0x04d0	Digi International
 vendor ITTCANON		0x04d1	ITT Canon
 vendor ALTEC		0x04d2	Altec Lansing Technologies, Inc.
+vendor PANASONIC	0x04da	Panasonic (Matsushita)
 vendor SHUTTLE		0x04e6	Shuttle Technology
 vendor ANNABOOKS	0x04ed	Annabooks
 vendor CHICONY		0x04f2	Chicony Electronics Co., Ltd.
@@ -138,7 +139,7 @@ vendor ATI		0x0528	ATI Technologies, Inc.
 vendor AKS		0x0529	Aladdin Knowledge Systems
 vendor UNIACCESS	0x0540	Universal Access
 vendor ANCHOR		0x0547	Anchor Chips, Inc.
-vendor SONY		0x054c  Sony Corp.
+vendor SONY		0x054c	Sony Corp.
 vendor VISION		0x0553	VLSI Vision Ltd.
 vendor ASAHIKASEI	0x0556	Asahi Kasei Microsystems Co., Ltd
 vendor ATEN		0x0557	ATEN International Co. Ltd.
@@ -150,6 +151,7 @@ vendor WACOM		0x056a	WACOM Corp. Ltd.
 vendor ETEK		0x056c	e-TEK Labs
 vendor EIZO		0x056d	EIZO
 vendor ELECOM		0x056e	Elecom Corp. Ltd.
+vendor HAUPPAUGE	0x0573	Hauppauge Computer Works
 vendor BAFO		0x0576	BAFO/Quality Computer Accessories
 vendor YEDATA		0x057b	Y-E Data
 vendor AVM		0x057c	AVM GmbH
@@ -170,7 +172,7 @@ vendor QTRONIX		0x05c7	Qtronix Corp
 vendor ELSA		0x05cc	ELSA Gmbh
 vendor BRAINBOXES	0x05d1	Brainboxes Limited
 vendor AXIOHM		0x05d9	Axiohm Transaction Solutions
-vendor MICROTEK		0x05da  Microtek
+vendor MICROTEK		0x05da	Microtek
 vendor SYMBOL		0x05e0	Symbol Technologies
 vendor GENESYS		0x05e3	Genesys Logic, Inc.
 vendor FUJI		0x05e5	Fuji Electric Co., Ltd.
@@ -204,6 +206,7 @@ vendor ALCATELT		0x06b9	Alcatel Telecom
 vendor AGFA		0x06bd	AGFA-Gevaert NV
 vendor ASIAMD		0x06be	Asia Microelectronic Development, Inc.
 vendor BIZLINK		0x06c4	Bizlink International Corp.
+vendor KEYSPAN		0x06cd	Keyspan
 vendor AASHIMA		0x06d6	Aashima Technology B.V.
 vendor MULTITECH	0x06e0	MultiTech
 vendor ADS		0x06e1	ADS Technologies, Inc.
@@ -234,6 +237,7 @@ vendor BUG		0x07c8	B.U.G., Inc.
 vendor ALLIEDTELESYN	0x07c9	Allied Telesyn International
 vendor AVERMEDIA	0x07ca	AVerMedia Technologies, Inc.
 vendor SIIG		0x07cc	SIIG
+vendor CASIO		0x07cf	CASIO
 vendor APTIO		0x07d2	Aptio Products, Inc.
 vendor ARASAN		0x07da	Arasan Chip Systems
 vendor ALLIEDCABLE	0x07e6	Allied Cable Corp.
@@ -258,6 +262,7 @@ vendor AIPTEK		0x08ca	AIPTEK International, Inc.
 vendor SMARTBRIDGES	0x08d1	SmartBridges Pte Ltd.
 vendor BILLIONTON	0x08dd	Billionton Systems, Inc.
 vendor EXTENDED		0x08e9	Extended Systems, Inc.
+vendor MSYSTEMS		0x08ec	M-Systems
 vendor AUTHENTEC	0x08ff	AuthenTec, Inc.
 vendor ALATION		0x0910	Alation Systems, Inc.
 vendor BIOMETRIC	0x0929	American Biometric Company
@@ -282,6 +287,7 @@ vendor TREK		0x0a16	Trek Technology
 vendor ASAHIOPTICAL	0x0a17	Asahi Optical Co., Ltd.
 vendor BOCASYSTEMS	0x0a43	Boca Systems, Inc.
 vendor BROADCOM		0x0a5c	Broadcom Corp.
+vendor GREENHOUSE	0x0a6b	GREENHOUSE Co., Ltd.
 vendor GEOCAST		0x0a79	Geocast Network Systems
 vendor MOTOROLA		0x1063	Motorola
 vendor PLX		0x10b5	PLX
@@ -316,7 +322,7 @@ product ABOCOM URE450		0x4000	URE450 Ethernet Adapter
 /* Acer Peripherals, Inc. products */
 product ACERP ACERSCAN_C310U	0x12a6	Acerscan C310U
 product ACERP ACERSCAN_320U	0x2022	Acerscan 320U
-product ACERP ACERSCAN_640U	0x2040  Acerscan 640U
+product ACERP ACERSCAN_640U	0x2040	Acerscan 640U
 product ACERP ACERSCAN_620U	0x2060	Acerscan 620U
 
 /* ActiveWire, Inc. products */
@@ -373,13 +379,14 @@ product ATEN UC232A		0x2008	Serial adapter
 
 /* Atmel Comp. products */
 product ATMEL UHB124		0x3301	UHB124 hub
+product ATMEL DWL120		0x7602	DWL-120 Wireless adapter
 
 /* Avision products */
 product AVISION 1200U		0x0268	1200U scanner
 
 /* Belkin products */
 /*product BELKIN F5U111		0x????	F5U111 Ethernet adapter*/
-product BELKIN2 F5U002		0x0002  F5U002 Parallel printer adapter
+product BELKIN2 F5U002		0x0002	F5U002 Parallel printer adapter
 
 /* Billionton products */
 product BILLIONTON USB100	0x0986	USB100N 10/100 FastEthernet Adapter
@@ -392,6 +399,7 @@ product BTC BTC7932		0x6782	Keyboard with mouse port
 
 /* Canon, Inc. products */
 product CANON S10		0x3041	PowerShot S10
+product CANON N656U		0x2206	CANOSCAN N656U
 
 /* CATC products */
 product CATC NETMATE		0x000a	Netmate ethernet adapter
@@ -399,6 +407,9 @@ product CATC NETMATE2		0x000c	Netmate2 ethernet adapter
 product CATC CHIEF		0x000d	USB Chief Bus & Protocol Analyzer
 product CATC ANDROMEDA		0x1237	Andromeda hub
 
+/* CASIO products */
+product	CASIO NAMELAND		0x4001	CASIO Nameland EZ-USB
+
 /* Cherry products */
 product CHERRY MY3000KBD	0x0001	My3000 keyboard
 product CHERRY MY3000HUB	0x0003	My3000 hub
@@ -483,6 +494,7 @@ product EPSON 1200		0x0104	Perfection 1200U / 1200Photo scanner
 product EPSON 1240		0x010b	Perfection 1240U / 1240Photo scanner
 product EPSON 1600		0x0107	Expression 1600 scanner
 product EPSON 1640		0x010a	Perfection 1640SU scanner
+product EPSON 1240		0x010b	Perfection 1240U / 1240Photo scanner
 
 /* e-TEK Labs products */
 product ETEK 1COM		0x8007	Serial port
@@ -493,6 +505,9 @@ product EXTENDED XTNDACCESS	0x0100	XTNDAccess IrDA
 /* Gravis products */
 product GRAVIS GAMEPADPRO	0x4001	GamePad Pro
 
+/* GREENHOUSE products */
+product GREENHOUSE KANA21	0x0001	CF-writer with Portable MP3 Player
+
 /* Griffin Technology */
 product GRIFFIN IMATE		0x0405	iMate, ADB adapter
 
@@ -508,6 +523,9 @@ product FUJIPHOTO MASS0100	0x0100	Mass Storage
 /* Handspring, Inc. */
 product HANDSPRING VISOR	0x0100	Handspring Visor
 
+/* Hauppauge Computer Works */
+product HAUPPAUGE WINTV_USB_FM	0x4d12	WinTV USB FM
+
 /* HP products */
 product HP 4100C		0x0101	Scanjet 4100C
 product HP S20			0x0102	Photosmart S20
@@ -525,15 +543,15 @@ product HP P1100		0x3102	Photosmart P1100
 product HP2 C500		0x6002	PhotoSmart C500
 
 /* IBM Corporation */
-product	IBM USBCDROMDRIVE	0x4427	USB CD-ROM Drive
+product IBM USBCDROMDRIVE	0x4427	USB CD-ROM Drive
 
 /* Inside Out Networks products */
 product INSIDEOUT EDGEPORT4	0x0001	EdgePort/4 serial ports
 
 /* In-System products */
 product INSYSTEM F5U002		0x0002	Parallel printer adapter
-product INSYSTEM ISD110		0x0200  IDE adapter ISD110
-product INSYSTEM ISD105		0x0202  IDE adapter ISD105
+product INSYSTEM ISD110		0x0200	IDE adapter ISD110
+product INSYSTEM ISD105		0x0202	IDE adapter ISD105
 product INSYSTEM USBCABLE	0x081a	USB cable
 
 /* Intel products */
@@ -565,6 +583,14 @@ product KLSI DUH3E10BT		0x0008	10BT Ethernet adapter, in the DU-H3E
 product KENSINGTON ORBIT	0x1003	Orbit USB/PS2 trackball
 product KENSINGTON TURBOBALL	0x1005	TurboBall
 
+/* Keyspan products */
+product KEYSPAN USA28		0x0101	USA-28 serial adapter
+product KEYSPAN USA28X		0x0102	USA-28X serial adapter
+product KEYSPAN USA19		0x0103	USA-19 serial adapter
+product KEYSPAN USA18X		0x0105	USA-18X serial adapter
+product KEYSPAN USA19W		0x0106	USA-19W serial adapter
+product KEYSPAN USA49W		0x0109	USA-49W serial adapter
+
 /* Kingston products */
 product KINGSTON KNU101TX	0x000a	KNU101TX USB Ethernet
 
@@ -613,6 +639,8 @@ product LOGITECH BD58		0xc00c	BD58 mouse
 product LOGITECH BB13		0xc401	USB-PS/2 Trackball
 product LOGITECH WMPAD		0xc208	WingMan GamePad Extreme
 product LOGITECH WMJOY		0xc281	WingMan Force joystick 
+product LOGITECH RK53		0xc501	Cordless mouse
+product LOGITECH RB6		0xc503	Cordless keyboard
 product LOGITECH QUICKCAMPRO2	0xd001	QuickCam Pro
 
 /* Lucent products */
@@ -624,6 +652,8 @@ product MACALLY MOUSE1		0x0101	mouse
 /* MCT Corp. */
 product MCT HUB0100		0x0100	Hub
 product MCT USB232		0x0210	USB-232 Interface
+product MCT SITECOM_USB232	0x0230	Sitecom USB-232 Products
+product MCT DU_H3SP_USB232	0x0200	D-Link DU-H3SP USB BAY Hub
 
 /* Melco, Inc products */
 product MELCO LUATX1		0x0001	LUA-TX Ethernet
@@ -641,6 +671,9 @@ product MICROSOFT SIDEWINDER	0x001a	Sidewinder Precision Racing Wheel
 product MICROSOFT INTELLIEYE	0x0025	IntelliEye mouse
 product MICROSOFT INETPRO	0x002b	Internet Keyboard Pro
 
+/* Microtech products */
+product MICROTECH DPCM		0x0006	USB CameraMate
+
 /* Microtek products */
 product MICROTEK 336CX		0x0094	Phantom 336CX - C3 scanner
 product MICROTEK X6U		0x0099	ScanMaker X6 - X6U
@@ -666,6 +699,9 @@ product MUSTEK 1200USB		0x0003	1200 USB scanner
 product MUSTEK 1200UB		0x0006	1200 UB scanner
 product MUSTEK MDC800		0xa800	MDC-800 digital camera
 
+/* M-Systems products */
+product MSYSTEMS DISKONKEY	0x0010	DiskOnKey
+
 /* National Semiconductor */
 product NATIONAL BEARPAW	0x1000	BearPaw 1200
 
@@ -686,9 +722,12 @@ product NIKON E990		0x0102	Digital Camera E990
 product OMNIVISION OV511	0x0511	OV511 Camera
 product OMNIVISION OV511PLUS	0xa511	OV511+ Camera
 
-/* Palm Computing, Inc. */
+/* Palm Computing, Inc. product */
 product PALM SERIAL		0x0080	USB Serial Adaptor
 
+/* Panasonic products */
+product PANASONIC SDCAAE	0x1b00	MultiMediaCard Adapter
+
 /* Peracom products */
 product PERACOM SERIAL1		0x0001	Serial Converter
 product PERACOM ENET		0x0002	Ethernet adapter
@@ -761,6 +800,7 @@ product SCANLOGIC 336CX		0x0300	Phantom 336CX - C3 scanner
 
 /* Shuttle Technology products */
 product SHUTTLE EUSB		0x0001	E-USB Bridge
+product SHUTTLE ZIOMMC		0x0006	eUSB MultiMediaCard Adapter
 
 /* SIIG products */
 product SIIG DIGIFILMREADER	0x0004	DigiFilm-Combo Reader
@@ -783,8 +823,8 @@ product SMC 2202USB		0x0200	10/100 ethernet adapter
 product SOLIDYEAR KEYBOARD	0x2101	Solid Year USB keyboard
 
 /* SONY products */
-product SONY DSC	0x0010	Sony DSC cameras
-product SONY MSC	0x0032	Sony MSC memory stick slot
+product SONY DSC		0x0010	Sony DSC cameras
+product SONY MSC		0x0032	Sony MSC memory stick slot
 
 /* STMicroelectronics products */
 product STMICRO COMMUNICATOR	0x7554	USB Communicator
@@ -801,7 +841,7 @@ product DIAMOND2 SUPRAEXPRESS56K 0x07da	Supra Express 56K modem
 product DIAMOND2 SUPRA2890	0x0b4a	SupraMax 2890 56K Modem
 product DIAMOND2 RIO600USB	0x5001	Rio 600 USB
 product DIAMOND2 RIO800USB	0x5002	Rio 800 USB
-
+ 
 /* TEAC products */
 product TEAC FD05PUB		0x0000	FD-05PUB floppy
 
@@ -838,7 +878,7 @@ product VISIONEER 6100		0x0231	OneTouch 6100
 product VISIONEER 6200		0x0311	OneTouch 6200
 product VISIONEER 8100		0x0321	OneTouch 8100
 product VISIONEER 8600		0x0331	OneTouch 8600
-
+								       
 /* Wacom products */
 product WACOM CT0405U		0x0000	CT-0405-U Tablet
 product WACOM GRAPHIRE		0x0010	Graphire