Regen.

1 files changed, 311 insertions, 71 deletions

diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index ddc6e7c..8307eda 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -4,11 +4,11 @@
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.17 2000/03/29 19:44:48 wpaul Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.20 2000/04/03 14:47:43 n_hibma 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
@@ -48,22 +48,46 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_HOMECONN,
 	    0,
-	    "3Com Corporation",
+	    "3Com Corp.",
 	    "HomeConnect USB Camera",
 	},
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3C19250,
 	    0,
-	    "3Com Corporation",
+	    "3Com Corp.",
 	    "3C19250 Ethernet adapter",
 	},
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_USR56K,
 	    0,
-	    "3Com Corporation",
+	    "3Com Corp.",
 	    "U.S.Robotics 56000 Voice Faxmodem Pro",
 	},
 	{
+	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460,
+	    0,
+	    "3Com Corp.",
+	    "HomeConnect Ethernet USB Adapter",
+	},
+	{
+	    USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_OFFICECONN,
+	    0,
+	    "U.S. Robotics",
+	    "3Com OfficeConnect Analog Modem",
+	},
+	{
+	    USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_USRISDN,
+	    0,
+	    "U.S. Robotics",
+	    "3Com U.S. Robotics Pro ISDN TA",
+	},
+	{
+	    USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_HOMECONN,
+	    0,
+	    "U.S. Robotics",
+	    "3Com HomeConnect camera",
+	},
+	{
 	    USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_USR56K,
 	    0,
 	    "U.S. Robotics",
@@ -72,25 +96,25 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_C310U,
 	    0,
-	    "Acer Peripherals 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 Incorporated",
+	    "ADMtek, Inc.",
 	    "AN986 USB Ethernet adapter",
 	},
 	{
@@ -112,6 +136,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "USB-HASP 0.06",
 	},
 	{
+	    USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ADA70,
+	    0,
+	    "Altec Lansing Technologies, Inc.",
+	    "ADA70 Speakers",
+	},
+	{
 	    USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ASC495,
 	    0,
 	    "Altec Lansing Technologies, Inc.",
@@ -126,13 +156,13 @@ 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",
 	},
 	{
@@ -162,13 +192,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_BTC, USB_PRODUCT_BTC_BTC7932,
 	    0,
-	    "Behavior Tech. Computer Corporation",
+	    "Behavior Tech. Computer",
 	    "Keyboard with mouse port",
 	},
 	{
 	    USB_VENDOR_CANON, USB_PRODUCT_CANON_S10,
 	    0,
-	    "Canon Inc.",
+	    "Canon, Inc.",
 	    "PowerShot S10",
 	},
 	{
@@ -214,6 +244,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "mouse",
 	},
 	{
+	    USB_VENDOR_CHIC, USB_PRODUCT_CHIC_CYPRESS,
+	    0,
+	    "Chic Technology",
+	    "Cypress USB Mouse",
+	},
+	{
 	    USB_VENDOR_CHICONY, USB_PRODUCT_CHICONY_KB8933,
 	    0,
 	    "Chicony Electronics Co., Ltd.",
@@ -280,6 +316,24 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Rio 500 USB",
 	},
 	{
+	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT2,
+	    0,
+	    "Digi International",
+	    "AccelePort USB 2",
+	},
+	{
+	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT4,
+	    0,
+	    "Digi International",
+	    "AccelePort USB 4",
+	},
+	{
+	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT8,
+	    0,
+	    "Digi International",
+	    "AccelePort USB 8",
+	},
+	{
 	    USB_VENDOR_EIZO, USB_PRODUCT_EIZO_HUB,
 	    0,
 	    "EIZO",
@@ -370,9 +424,21 @@ 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",
+	    "Serial converter",
+	},
+	{
 	    USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_VISOR,
 	    0,
-	    "Handspring Inc.",
+	    "Handspring, Inc.",
 	    "Handspring Visor",
 	},
 	{
@@ -388,6 +454,30 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Photosmart S20",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_4200C,
+	    0,
+	    "Hewlett Packard",
+	    "ScanJet 4200C",
+	},
+	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_6200C,
+	    0,
+	    "Hewlett Packard",
+	    "ScanJet 6200C",
+	},
+	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_S20b,
+	    0,
+	    "Hewlett Packard",
+	    "PhotoSmart S20",
+	},
+	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_3300C,
+	    0,
+	    "Hewlett Packard",
+	    "ScanJet 3300C",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_5200,
 	    0,
 	    "Hewlett Packard",
@@ -436,12 +526,24 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "82930 test board",
 	},
 	{
+	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTX,
+	    0,
+	    "I/O Data",
+	    "USB ETTX",
+	},
+	{
 	    USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP100,
 	    0,
 	    "Iomega Corp.",
 	    "Zip 100",
 	},
 	{
+	    USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BT,
+	    0,
+	    "Kawasaki LSI",
+	    "USB ethernet controller engine",
+	},
+	{
 	    USB_VENDOR_KAWATSU, USB_PRODUCT_KAWATSU_MH4000P,
 	    0,
 	    "Kawatsu Semiconductor, Inc.",
@@ -460,6 +562,24 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "10BT Ethernet adapter, in the DU-H3E",
 	},
 	{
+	    USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_ORBIT,
+	    0,
+	    "Kensington",
+	    "Orbit USB/PS2 trackball",
+	},
+	{
+	    USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_TURBOBALL,
+	    0,
+	    "Kensington",
+	    "TurboBall",
+	},
+	{
+	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC220,
+	    0,
+	    "Eastman Kodak Corp.",
+	    "Digital Science DC220",
+	},
+	{
 	    USB_VENDOR_KODAK, USB_PRODUCT_KODAK_DC260,
 	    0,
 	    "Eastman Kodak Corp.",
@@ -502,6 +622,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Niche mouse",
 	},
 	{
+	    USB_VENDOR_KYE, USB_PRODUCT_KYE_NETSCROLL,
+	    0,
+	    "KYE Systems Corp.",
+	    "Genius NetScroll mouse",
+	},
+	{
 	    USB_VENDOR_KYE, USB_PRODUCT_KYE_FLIGHT2000,
 	    0,
 	    "KYE Systems Corp.",
@@ -510,64 +636,88 @@ 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.",
+	    "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.",
+	    "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.",
+	    "WingMan Gaming Mouse",
+	},
+	{
+	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMPAD,
+	    0,
+	    "Logitech, Inc.",
+	    "WingMan GamePad Extreme",
+	},
+	{
+	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_WMJOY,
+	    0,
+	    "Logitech, Inc.",
+	    "WingMan Force joystick",
+	},
+	{
 	    USB_VENDOR_LUCENT, USB_PRODUCT_LUCENT_EVALKIT,
 	    0,
 	    "Lucent",
@@ -582,10 +732,16 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX,
 	    0,
-	    "Melco Inc.",
+	    "Melco, Inc.",
 	    "LU-ATX Ethernet",
 	},
 	{
+	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_SIDEPREC,
+	    0,
+	    "Microsoft",
+	    "SideWinder Precision Pro",
+	},
+	{
 	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_INTELLIMOUSE,
 	    0,
 	    "Microsoft",
@@ -610,6 +766,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Sidewinder Precision Racing Wheel",
 	},
 	{
+	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_INTELLIEYE,
+	    0,
+	    "Microsoft",
+	    "IntelliEye mouse",
+	},
+	{
+	    USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_INETPRO,
+	    0,
+	    "Microsoft",
+	    "Internet Keyboard Pro",
+	},
+	{
 	    USB_VENDOR_MIDIMAN, USB_PRODUCT_MIDIMAN_MIDISPORT2X2,
 	    0,
 	    "Midiman",
@@ -630,7 +798,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_MDC800,
 	    0,
-	    "Mustek Systems Inc.",
+	    "Mustek Systems, Inc.",
 	    "MDC-800 digital camera",
 	},
 	{
@@ -654,7 +822,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101,
 	    0,
-	    "BayNETGEAR Inc.",
+	    "BayNETGEAR, Inc.",
 	    "Ethernet adapter",
 	},
 	{
@@ -664,27 +832,33 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "OV511 Camera",
 	},
 	{
+	    USB_VENDOR_PALM, USB_PRODUCT_PALM_SERIAL,
+	    0,
+	    "Palm Computing, Inc.",
+	    "USB Serial Adaptor",
+	},
+	{
 	    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.",
+	    "Peracom Networks, Inc.",
 	    "At Home Ethernet Adapter",
 	},
 	{
 	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET2,
 	    0,
-	    "Peracom Networks Inc.",
+	    "Peracom Networks, Inc.",
 	    "Ethernet adapter",
 	},
 	{
@@ -709,7 +883,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_DSS150,
 	    0,
 	    "Philips",
-	    "DSS XXX Digital Speaker System",
+	    "DSS 150 Digital Speaker System",
 	},
 	{
 	    USB_VENDOR_PIENGINEERING, USB_PRODUCT_PIENGINEERING_PS2USB,
@@ -736,6 +910,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Mouse-in-a-Box",
 	},
 	{
+	    USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_PCGAUMS1,
+	    0,
+	    "Primax Electronics",
+	    "Sony PCGA-UMS1",
+	},
+	{
+	    USB_VENDOR_QUICKSHOT, USB_PRODUCT_QUICKSHOT_STRIKEPAD,
+	    0,
+	    "Quickshot",
+	    "USB StrikePad",
+	},
+	{
 	    USB_VENDOR_ROCKFIRE, USB_PRODUCT_ROCKFIRE_GAMEPAD,
 	    0,
 	    "Rockfire",
@@ -804,7 +990,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_TELEX, USB_PRODUCT_TELEX_MIC1,
 	    0,
-	    "Telex Communications Inc.",
+	    "Telex Communications, Inc.",
 	    "Enhanced USB Microphone",
 	},
 	{
@@ -838,6 +1024,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "CT-0405-U Tablet",
 	},
 	{
+	    USB_VENDOR_WACOM, USB_PRODUCT_WACOM_GRAPHIRE,
+	    0,
+	    "WACOM Corp. Ltd.",
+	    "Graphire",
+	},
+	{
+	    USB_VENDOR_WACOM, USB_PRODUCT_WACOM_INTUOSA5,
+	    0,
+	    "WACOM Corp. Ltd.",
+	    "Intuos A5",
+	},
+	{
 	    USB_VENDOR_YEDATA, USB_PRODUCT_YEDATA_FLASHBUSTERU,
 	    0,
 	    "Y-E Data",
@@ -846,19 +1044,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 Corporation",
+	    "Atmel Corp.",
 	    NULL,
 	},
 	{
@@ -876,7 +1074,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ACERLABS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Acer Labs Inc.",
+	    "Acer Labs, Inc.",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_FUTURE, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Future Technology Devices",
 	    NULL,
 	},
 	{
@@ -894,13 +1098,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.",
+	    "ADI Systems, Inc.",
 	    NULL,
 	},
 	{
@@ -930,7 +1134,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_LEXMARK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Lexmark International Inc.",
+	    "Lexmark International, Inc.",
 	    NULL,
 	},
 	{
@@ -984,7 +1188,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_AMP, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "AMP Incorporated",
+	    "AMP, Inc.",
 	    NULL,
 	},
 	{
@@ -1002,13 +1206,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_LOGITECH, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Logitech Inc.",
+	    "Logitech, Inc.",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_BTC, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Behavior Tech. Computer Corporation",
+	    "Behavior Tech. Computer",
 	    NULL,
 	},
 	{
@@ -1024,6 +1228,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_KENSINGTON, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Kensington",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_LUCENT, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Lucent",
@@ -1038,13 +1248,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ACERP, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Acer Peripherals Inc.",
+	    "Acer Peripherals, Inc.",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_CANON, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Canon Inc.",
+	    "Canon, Inc.",
 	    NULL,
 	},
 	{
@@ -1060,6 +1270,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_IODATA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "I/O Data",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_3COMUSR, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "U.S. Robotics",
@@ -1116,7 +1332,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_3COM, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "3Com Corporation",
+	    "3Com Corp.",
 	    NULL,
 	},
 	{
@@ -1146,7 +1362,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_CONNECTEK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Advanced Connectek USA Inc.",
+	    "Advanced Connectek USA, Inc.",
 	    NULL,
 	},
 	{
@@ -1182,7 +1398,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ANCHOR, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Anchor Chips Inc.",
+	    "Anchor Chips, Inc.",
 	    NULL,
 	},
 	{
@@ -1206,19 +1422,19 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    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,
 	},
 	{
@@ -1264,6 +1480,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_QUICKSHOT, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Quickshot",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ROCKFIRE, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Rockfire",
@@ -1312,6 +1534,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_DIGI, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Digi International",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_QTRONIX, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Qtronix Corp",
@@ -1428,7 +1656,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_LINKSYS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Linksys Inc.",
+	    "Linksys, Inc.",
 	    NULL,
 	},
 	{
@@ -1458,7 +1686,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ASKEY, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Askey Computer Corporation",
+	    "Askey Computer Corp.",
 	    NULL,
 	},
 	{
@@ -1482,7 +1710,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_BIZLINK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Bizlink International Corporation",
+	    "Bizlink International Corp.",
 	    NULL,
 	},
 	{
@@ -1548,7 +1776,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_BRIMAX, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Brimax Inc.",
+	    "Brimax, Inc.",
 	    NULL,
 	},
 	{
@@ -1560,7 +1788,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ABL, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ABL Electronics Corporation",
+	    "ABL Electronics Corp.",
 	    NULL,
 	},
 	{
@@ -1572,13 +1800,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_BE, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Be Incorporated",
+	    "Be, Inc.",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ADMTEK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ADMtek Incorporated",
+	    "ADMtek, Inc.",
 	    NULL,
 	},
 	{
@@ -1588,6 +1816,12 @@ 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.",
@@ -1632,7 +1866,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_APTIO, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Aptio Products Inc.",
+	    "Aptio Products, Inc.",
 	    NULL,
 	},
 	{
@@ -1644,13 +1878,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ALLIEDCABLE, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Allied Cable Corporation",
+	    "Allied Cable Corp.",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_ZOOM, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Zoom Telephonics Inc.",
+	    "Zoom Telephonics, Inc.",
 	    NULL,
 	},
 	{
@@ -1662,7 +1896,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_HANDSPRING, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Handspring Inc.",
+	    "Handspring, Inc.",
 	    NULL,
 	},
 	{
@@ -1672,9 +1906,15 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_PALM, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Palm Computing, Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ACCTON, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Accton Technology Corporation",
+	    "Accton Technology Corp.",
 	    NULL,
 	},
 	{
@@ -1686,25 +1926,25 @@ 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.",
+	    "ADESSO/Kbtek America, Inc.",
 	    NULL,
 	},
 	{
 	    USB_VENDOR_APT, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "APT Technologies Inc.",
+	    "APT Technologies, Inc.",
 	    NULL,
 	},
 	{
@@ -1734,7 +1974,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_AIPTEK, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "AIPTEK International Inc.",
+	    "AIPTEK International, Inc.",
 	    NULL,
 	},
 	{
@@ -1806,7 +2046,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_ACTISYS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "ACTiSYS Corporation",
+	    "ACTiSYS Corp.",
 	    NULL,
 	},
 	{
@@ -1818,7 +2058,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_AIMEX, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "AIMEX Corporation",
+	    "AIMEX Corp.",
 	    NULL,
 	},
 	{
@@ -1860,7 +2100,7 @@ struct usb_knowndev usb_knowndevs[] = {
 	{
 	    USB_VENDOR_BOCASYSTEMS, 0,
 	    USB_KNOWNDEV_NOPROD,
-	    "Boca Systems Inc.",
+	    "Boca Systems, Inc.",
 	    NULL,
 	},
 	{