Sync with NetBSD.

1 files changed, 650 insertions, 67 deletions

diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 7029f0b0882..8c52b6004a0 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,14 +1,15 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.14 2000/03/28 19:37:52 aaron Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.15 2000/04/04 22:52:30 aaron Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: usbdevs,v 1.87 2000/03/26 15:08:02 augustss Exp 
+ *	OpenBSD:
  */
+/* $NetBSD: usbdevs,v 1.88 2000/04/03 12:09:43 augustss Exp $ */
 
 /*
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -94,33 +95,33 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "U.S.Robotics 56000 Voice Faxmodem Pro",
 	},
 	{
-	    USB_VENDOR_ACER, USB_PRODUCT_ACER_ACERSCAN_C310U,
+	    USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_C310U,
 	    0,
-	    "Acer Peripheral Inc.",
+	    "Acer Peripherals, Inc.",
 	    "Acerscan C310U",
 	},
 	{
 	    USB_VENDOR_ACTIVEWIRE, USB_PRODUCT_ACTIVEWIRE_IOBOARD,
 	    0,
-	    "ActiveWire Inc.",
+	    "ActiveWire, Inc.",
 	    "I/O Board",
 	},
 	{
 	    USB_VENDOR_ACTIVEWIRE, USB_PRODUCT_ACTIVEWIRE_IOBOARD_FW1,
 	    0,
-	    "ActiveWire Inc.",
+	    "ActiveWire, Inc.",
 	    "I/O Board, rev. 1 firmware",
 	},
 	{
 	    USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS,
 	    0,
-	    "ADMtek Inc.",
+	    "ADMtek, Inc.",
 	    "AN986 USB Ethernet adapter",
 	},
 	{
 	    USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BT,
 	    0,
-	    "ADS Technologies",
+	    "ADS Technologies, Inc.",
 	    "UBS-10BT Ethernet adapter",
 	},
 	{
@@ -132,19 +133,19 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_AKS, USB_PRODUCT_AKS_USBHASP,
 	    0,
-	    "Fast Security AG",
+	    "Aladdin Knowledge Systems",
 	    "USB-HASP 0.06",
 	},
 	{
 	    USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ADA70,
 	    0,
-	    "Altec Lansing",
+	    "Altec Lansing Technologies, Inc.",
 	    "ADA70 Speakers",
 	},
 	{
 	    USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ASC495,
 	    0,
-	    "Altec Lansing",
+	    "Altec Lansing Technologies, Inc.",
 	    "ASC495 Speakers",
 	},
 	{
@@ -156,37 +157,37 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ANCHOR, USB_PRODUCT_ANCHOR_EZUSB,
 	    0,
-	    "Anchor Chips Inc.",
+	    "Anchor Chips, Inc.",
 	    "EZUSB",
 	},
 	{
 	    USB_VENDOR_AOX, USB_PRODUCT_AOX_USB101,
 	    0,
-	    "Aox Inc.",
+	    "AOX, Inc.",
 	    "USB ethernet controller engine",
 	},
 	{
 	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC1284,
 	    0,
-	    "ATEN International Corp. Ltd.",
+	    "ATEN International Co. Ltd.",
 	    "Parallel printer adapter",
 	},
 	{
 	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC10T,
 	    0,
-	    "ATEN International Corp. Ltd.",
+	    "ATEN International Co. Ltd.",
 	    "10Mbps ethernet adapter",
 	},
 	{
 	    USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100,
 	    0,
-	    "Billionton Systems Inc.",
+	    "Billionton Systems, Inc.",
 	    "USB100N 10/100 FastEthernet Adapter",
 	},
 	{
 	    USB_VENDOR_BROTHER, USB_PRODUCT_BROTHER_HL1050,
 	    0,
-	    "Brother Industries Corp.",
+	    "Brother Industries, Ltd.",
 	    "HL-1050 laser printer",
 	},
 	{
@@ -198,7 +199,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_CANON, USB_PRODUCT_CANON_S10,
 	    0,
-	    "Canon Inc.",
+	    "Canon, Inc.",
 	    "PowerShot S10",
 	},
 	{
@@ -424,6 +425,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "GamePad Pro",
 	},
 	{
+	    USB_VENDOR_FREECOM, USB_PRODUCT_FREECOM_DVD,
+	    0,
+	    "Freecom",
+	    "Connector for DVD drive",
+	},
+	{
 	    USB_VENDOR_FUTURE, USB_PRODUCT_FUTURE_SERIAL,
 	    0,
 	    "Future Technology Devices",
@@ -432,7 +439,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_VISOR,
 	    0,
-	    "Handspring Inc.",
+	    "Handspring, Inc.",
 	    "Handspring Visor",
 	},
 	{
@@ -522,8 +529,8 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTX,
 	    0,
-	    "I/O DATA",
-	    "",
+	    "I/O Data",
+	    "USB ETTX",
 	},
 	{
 	    USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP100,
@@ -544,6 +551,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "MiniHub 4000P",
 	},
 	{
+	    USB_VENDOR_KEISOKUGIKEN, USB_PRODUCT_KEISOKUGIKEN_USBDAQ,
+	    0,
+	    "Keisokugiken Corp.",
+	    "HKS-0200 USBDAQ",
+	},
+	{
+	    USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BT,
+	    0,
+	    "Kawasaki LSI",
+	    "10BT Ethernet adapter, in the DU-H3E",
+	},
+	{
 	    USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_ORBIT,
 	    0,
 	    "Kensington",
@@ -618,79 +637,85 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_LEXMARK, USB_PRODUCT_LEXMARK_S2450,
 	    0,
-	    "Lexmark International Inc.",
+	    "Lexmark International, Inc.",
 	    "Optra S 2450",
 	},
 	{
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10T,
 	    0,
-	    "Linksys Inc.",
+	    "Linksys, Inc.",
 	    "USB10T Ethernet",
 	},
 	{
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100TX,
 	    0,
-	    "Linksys Inc.",
+	    "Linksys, Inc.",
 	    "USB100TX Ethernet",
 	},
 	{
+	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TA,
+	    0,
+	    "Linksys, Inc.",
+	    "USB10TA Ethernet",
+	},
+	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M2452,
 	    0,
-	    "Logitech Inc.",
+	    "Logitech, Inc.",
 	    "M2452 keyboard",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M4848,
 	    0,
-	    "Logitech Inc.",
+	    "Logitech, Inc.",
 	    "M4848 mouse",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAM,
 	    0,
-	    "Logitech Inc.",
+	    "Logitech, Inc.",
 	    "QuickCam",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_QUICKCAMPRO,
 	    0,
-	    "Logitech Inc.",
+	    "Logitech, Inc.",
 	    "QuickCam Pro",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_N43,
 	    0,
-	    "Logitech Inc.",
+	    "Logitech, Inc.",
 	    "N43",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_N48,
 	    0,
-	    "Logitech Inc.",
+	    "Logitech, Inc.",
 	    "N48 mouse",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_MBA47,
 	    0,
-	    "Logitech Inc.",
+	    "Logitech, Inc.",
 	    "M-BA47 mouse",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMMOUSE,
 	    0,
-	    "Logitech Inc.",
+	    "Logitech, Inc.",
 	    "WingMan Gaming Mouse",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMPAD,
 	    0,
-	    "Logitech Inc.",
+	    "Logitech, Inc.",
 	    "WingMan GamePad Extreme",
 	},
 	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMJOY,
 	    0,
-	    "Logitech Inc.",
+	    "Logitech, Inc.",
 	    "WingMan Force joystick",
 	},
 	{
@@ -708,7 +733,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX,
 	    0,
-	    "Melco Inc.",
+	    "Melco, Inc.",
 	    "LU-ATX Ethernet",
 	},
 	{
@@ -774,7 +799,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_MDC800,
 	    0,
-	    "Mustek Systems Inc.",
+	    "Mustek Systems, Inc.",
 	    "MDC-800 digital camera",
 	},
 	{
@@ -798,7 +823,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101,
 	    0,
-	    "BayNETGEAR Inc.",
+	    "BayNETGEAR, Inc.",
 	    "Ethernet adapter",
 	},
 	{
@@ -816,19 +841,25 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1,
 	    0,
-	    "Peracom Networks Inc.",
+	    "Peracom Networks, Inc.",
 	    "Serial Converter",
 	},
 	{
 	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET,
 	    0,
-	    "Peracom Networks Inc.",
+	    "Peracom Networks, Inc.",
 	    "Ethernet adapter",
 	},
 	{
+	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET3,
+	    0,
+	    "Peracom Networks, Inc.",
+	    "At Home Ethernet Adapter",
+	},
+	{
 	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET2,
 	    0,
-	    "Peracom Networks Inc.",
+	    "Peracom Networks, Inc.",
 	    "Ethernet adapter",
 	},
 	{
@@ -960,7 +991,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_TELEX, USB_PRODUCT_TELEX_MIC1,
 	    0,
-	    "Telex Communications Inc.",
+	    "Telex Communications, Inc.",
 	    "Enhanced USB Microphone",
 	},
 	{
@@ -1014,13 +1045,19 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ZOOM, USB_PRODUCT_ZOOM_2986L,
 	    0,
-	    "Zoom Telephonics Inc.",
+	    "Zoom Telephonics, Inc.",
 	    "2986L Fax modem",
 	},
 	{
 	    USB_VENDOR_AOX, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Aox Inc.",
+	    "AOX, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ATMEL, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Atmel Corp.",
 	    NULL,
 	},
 	{
@@ -1030,6 +1067,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ADAPTEC, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Adaptec, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ACERLABS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Acer Labs, Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_FUTURE, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Future Technology Devices",
@@ -1050,7 +1099,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_MELCO, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Melco Inc.",
+	    "Melco, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ADI, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "ADI Systems, Inc.",
 	    NULL,
 	},
 	{
@@ -1072,9 +1127,15 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_AMD, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Advanced Micro Devices",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_LEXMARK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Lexmark International Inc.",
+	    "Lexmark International, Inc.",
 	    NULL,
 	},
 	{
@@ -1084,6 +1145,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ALPS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Alps Electric Co., Ltd.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_THRUST, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Thrustmaster",
@@ -1096,6 +1163,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ANALOGDEVICES, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Analog Devices, Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_KYE, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "KYE Systems Corp.",
@@ -1114,15 +1187,27 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_AMP, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "AMP, Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_CHERRY, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Cherry Mikroschalter GmbH",
 	    NULL,
 	},
 	{
+	    USB_VENDOR_MEGATRENDS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "American Megatrends",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_LOGITECH, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Logitech Inc.",
+	    "Logitech, Inc.",
 	    NULL,
 	},
 	{
@@ -1162,15 +1247,15 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    USB_VENDOR_ACER, 0,
+	    USB_VENDOR_ACERP, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Acer Peripheral Inc.",
+	    "Acer Peripherals, Inc.",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_CANON, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Canon Inc.",
+	    "Canon, Inc.",
 	    NULL,
 	},
 	{
@@ -1188,7 +1273,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_IODATA, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "I/O DATA",
+	    "I/O Data",
 	    NULL,
 	},
 	{
@@ -1206,7 +1291,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ALTEC, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Altec Lansing",
+	    "Altec Lansing Technologies, Inc.",
 	    NULL,
 	},
 	{
@@ -1216,6 +1301,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ANNABOOKS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Annabooks",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_CHICONY, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Chicony Electronics Co., Ltd.",
@@ -1224,7 +1315,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_BROTHER, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Brother Industries Corp.",
+	    "Brother Industries, Ltd.",
 	    NULL,
 	},
 	{
@@ -1234,12 +1325,24 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ACER, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Acer, Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_3COM, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "3Com Corp.",
 	    NULL,
 	},
 	{
+	    USB_VENDOR_AZTECH, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Aztech Systems Ltd",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_BELKIN, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Belkin Components",
@@ -1258,15 +1361,33 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_CONNECTEK, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Advanced Connectek USA, Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_NETCHIP, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "NetChip Technology",
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ALTRA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "ALTRA",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ATI, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "ATI Technologies, Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_AKS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Fast Security AG",
+	    "Aladdin Knowledge Systems",
 	    NULL,
 	},
 	{
@@ -1278,7 +1399,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ANCHOR, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Anchor Chips Inc.",
+	    "Anchor Chips, Inc.",
 	    NULL,
 	},
 	{
@@ -1288,27 +1409,33 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ASAHIKASEI, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Asahi Kasei Microsystems Co., Ltd",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ATEN, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ATEN International Corp. Ltd.",
+	    "ATEN International Co. Ltd.",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_MUSTEK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Mustek Systems Inc.",
+	    "Mustek Systems, Inc.",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_TELEX, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Telex Communications Inc.",
+	    "Telex Communications, Inc.",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_PERACOM, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Peracom Networks Inc.",
+	    "Peracom Networks, Inc.",
 	    NULL,
 	},
 	{
@@ -1336,12 +1463,24 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_BAFO, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "BAFO/Quality Computer Accessories",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_YEDATA, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Y-E Data",
 	    NULL,
 	},
 	{
+	    USB_VENDOR_AVM, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "AVM GmbH",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_QUICKSHOT, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Quickshot",
@@ -1354,12 +1493,30 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ALCOR, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Alcor Micro, Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_IOMEGA, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Iomega Corp.",
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ATREND, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "A-Trend Technology Co., Ltd.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_AID, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Advanced Input Devices",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_OMNIVISION, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "OmniVision",
@@ -1396,6 +1553,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_BRAINBOXES, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Brainboxes Limited",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_AXIOHM, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Axiohm Transaction Solutions",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_EIZONANAO, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "EIZO Nanao",
@@ -1408,33 +1577,147 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ANKO, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Anko Electronic Co., Ltd.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_PIENGINEERING, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "P.I. Engineering",
 	    NULL,
 	},
 	{
+	    USB_VENDOR_AOC, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "AOC International",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_CHIC, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Chic Technology",
 	    NULL,
 	},
 	{
+	    USB_VENDOR_BARCO, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Barco Display Systems",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_BRIDGE, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Bridge Information Co., Ltd.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_SOLIDYEAR, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Solid Year",
 	    NULL,
 	},
 	{
+	    USB_VENDOR_BIORAD, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Bio-Rad Laboratories",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_MACALLY, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Macally",
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ACTLABS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Act Labs, Ltd.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ALARIS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Alaris, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_APEX, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Apex, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_AVISION, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Avision, Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_LINKSYS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Linksys Inc.",
+	    "Linksys, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ACERSA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Acer Semiconductor America, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_AIWA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Aiwa Co., Ltd.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ACARD, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "ACARD Technology Corp.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ADVANCELOGIC, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Avance Logic, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ASKEY, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Askey Computer Corp.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ALCATELT, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Alcatel Telecom",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_AGFA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "AGFA-Gevaert NV",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ASIAMD, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Asia Microelectronic Development, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_BIZLINK, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Bizlink International Corp.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_AASHIMA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Aashima Technology B.V.",
 	    NULL,
 	},
 	{
@@ -1446,7 +1729,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ADS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ADS Technologies",
+	    "ADS Technologies, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ALCATELM, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Alcatel Microelectronics",
 	    NULL,
 	},
 	{
@@ -1456,12 +1745,24 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_BOSTON, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Boston Acoustics",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_SMC, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Standard Microsystems Corp",
 	    NULL,
 	},
 	{
+	    USB_VENDOR_AUREAL, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Aureal Semiconductor",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_MIDIMAN, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Midiman",
@@ -1474,9 +1775,39 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_BRIMAX, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Brimax, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_AXIS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Axis Communications AB",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ABL, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "ABL Electronics Corp.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ALFADATA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Alfadata Computer Corp.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_BE, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Be, Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ADMTEK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ADMtek Inc.",
+	    "ADMtek, Inc.",
 	    NULL,
 	},
 	{
@@ -1486,21 +1817,93 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_FREECOM, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Freecom",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ABOCOM, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "AboCom Systems, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_KEISOKUGIKEN, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Keisokugiken Corp.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_APG, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "APG Cash Drawer",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_BUG, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "B.U.G., Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ALLIEDTELESYN, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Allied Telesyn International",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_AVERMEDIA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "AVerMedia Technologies, Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_SIIG, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "SIIG",
 	    NULL,
 	},
 	{
+	    USB_VENDOR_APTIO, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Aptio Products, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ARASAN, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Arasan Chip Systems",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ALLIEDCABLE, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Allied Cable Corp.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ZOOM, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Zoom Telephonics Inc.",
+	    "Zoom Telephonics, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_BROADLOGIC, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "BroadLogic, Inc.",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_HANDSPRING, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Handspring Inc.",
+	    "Handspring, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ACTIONSTAR, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Action Star Enterprise Co., Ltd.",
 	    NULL,
 	},
 	{
@@ -1510,6 +1913,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ACCTON, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Accton Technology Corp.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_DIAMOND, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Diamond",
@@ -1518,19 +1927,187 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_NETGEAR, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "BayNETGEAR Inc.",
+	    "BayNETGEAR, Inc.",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ACTIVEWIRE, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ActiveWire Inc.",
+	    "ActiveWire, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ADESSOKBTEK, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "ADESSO/Kbtek America, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_APT, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "APT Technologies, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_BOCARESEARCH, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Boca Research, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ANDREA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Andrea Electronics",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_BURRBROWN, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Burr-Brown Japan, Ltd.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_2WIRE, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "2Wire, Inc",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_AIPTEK, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "AIPTEK International, Inc.",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_BILLIONTON, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Billionton Systems Inc.",
+	    "Billionton Systems, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_AUTHENTEC, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "AuthenTec, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ALATION, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Alation Systems, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_BIOMETRIC, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "American Biometric Company",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_BLUEWATER, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "BlueWater Systems, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_AGILENT, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Agilent Technologies, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ADIRONDACK, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Adirondack Wire & Cable",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_BECKHOFF, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Beckhoff Gmbh",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ALTIUS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Altius Solutions, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ARRIS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Arris Interactive LLC",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ACTIVCARD, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "ACTIVCARD, INC.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ACTISYS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "ACTiSYS Corp.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_AFOURTECH, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "A-FOUR TECH CO., LTD.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_AIMEX, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "AIMEX Corp.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ADDONICS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Addonics Technologies Corp.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_AKAI, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "AKAI professional M.I. Corp.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ARESCOM, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "ARESCOM",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_BAY, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Bay Associates",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ALTERA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Altera",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ASAHIOPTICAL, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Asahi Optical Co., Ltd.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_BOCASYSTEMS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Boca Systems, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_BROADCOM, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Broadcom Corp.",
 	    NULL,
 	},
 	{
@@ -1558,6 +2135,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ACTIONTEC, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Actiontec Electronics, Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_DLINK, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "D-Link Corp",