sync

1 files changed, 445 insertions, 67 deletions

diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index e7a1979f8a4..1e84ae19099 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,12 +1,12 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.42 2002/01/03 19:16:07 nate Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.43 2002/04/01 21:36:16 nate Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.42 2002/01/03 19:15:39 nate Exp 
+ *	OpenBSD: usbdevs,v 1.43 2002/04/01 21:35:52 nate Exp 
  */
-/* $NetBSD: usbdevs,v 1.211 2001/12/15 00:15:01 augustss Exp $ */
+/* $NetBSD: usbdevs,v 1.240 2002/03/31 00:41:37 ichiro Exp $ */
 
 /*
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -209,6 +209,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Acerscan 620U",
 	},
 	{
+	    USB_VENDOR_ACTIONTEC, USB_PRODUCT_ACTIONTEC_PRISM_25,
+	    0,
+	    "Actiontec Electronics",
+	    "Prism2.5 WLAN",
+	},
+	{
 	    USB_VENDOR_ACTISYS, USB_PRODUCT_ACTISYS_IR2000U,
 	    0,
 	    "ACTiSYS",
@@ -227,6 +233,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "I/O Board, rev. 1",
 	},
 	{
+	    USB_VENDOR_ADDONICS2, USB_PRODUCT_ADDONICS2_205,
+	    0,
+	    "Addonics Technology",
+	    "Cable 205",
+	},
+	{
 	    USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS,
 	    0,
 	    "ADMtek",
@@ -461,6 +473,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "F5U002 Parallel adapter",
 	},
 	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_SCSI,
+	    0,
+	    "Belkin Components",
+	    "SCSI Adaptor",
+	},
+	{
 	    USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100,
 	    0,
 	    "Billionton Systems",
@@ -494,7 +512,7 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_BTC, USB_PRODUCT_BTC_BTC7932,
 	    0,
 	    "Behavior Tech. Computer",
-	    "Keyboard",
+	    "Keyboard/Mouse",
 	},
 	{
 	    USB_VENDOR_CANON, USB_PRODUCT_CANON_N656U,
@@ -539,12 +557,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Andromeda hub",
 	},
 	{
+	    USB_VENDOR_CASIO, USB_PRODUCT_CASIO_QV,
+	    0,
+	    "CASIO",
+	    "QV DigitalCamera",
+	},
+	{
 	    USB_VENDOR_CASIO, USB_PRODUCT_CASIO_NAMELAND,
 	    0,
 	    "CASIO",
 	    "CASIO Nameland EZ-USB",
 	},
 	{
+	    USB_VENDOR_CCYU, USB_PRODUCT_CCYU_EASYDISK,
+	    0,
+	    "CCYU Technology",
+	    "EasyDisk Portable",
+	},
+	{
 	    USB_VENDOR_CHERRY, USB_PRODUCT_CHERRY_MY3000KBD,
 	    0,
 	    "Cherry Mikroschalter",
@@ -593,12 +623,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "iPAQ PocketPC",
 	},
 	{
+	    USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_A1500,
+	    0,
+	    "Compaq",
+	    "A1500",
+	},
+	{
 	    USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_PJB100,
 	    0,
 	    "Compaq",
 	    "Personal Jukebox PJB100",
 	},
 	{
+	    USB_VENDOR_CONCORDCAMERA, USB_PRODUCT_CONCORDCAMERA_EYE_Q_3X,
+	    0,
+	    "Concord Camera",
+	    "Eye Q 3x",
+	},
+	{
 	    USB_VENDOR_CONNECTIX, USB_PRODUCT_CONNECTIX_QUICKCAM,
 	    0,
 	    "Connectix",
@@ -617,6 +659,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "FEther USB-TX",
 	},
 	{
+	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_WLAN_USB_USB_11,
+	    0,
+	    "Corega",
+	    "WirelessLAN USB-11",
+	},
+	{
 	    USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TXS,
 	    0,
 	    "Corega",
@@ -659,6 +707,54 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "FM Radio",
 	},
 	{
+	    USB_VENDOR_DAISY, USB_PRODUCT_DAISY_DMC,
+	    0,
+	    "Daisy Technology",
+	    "PhotoClip Camera",
+	},
+	{
+	    USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502,
+	    0,
+	    "Dallas Semiconductor",
+	    "J-6502 speakers",
+	},
+	{
+	    USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_USB_FOB_IBUTTON,
+	    0,
+	    "Dallas Semiconductor",
+	    "USB-FOB/iBUTTON",
+	},
+	{
+	    USB_VENDOR_DIAMOND, USB_PRODUCT_DIAMOND_RIO500USB,
+	    0,
+	    "Diamond",
+	    "Rio 500 USB",
+	},
+	{
+	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT2,
+	    0,
+	    "Digi International",
+	    "AccelePort 2",
+	},
+	{
+	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT4,
+	    0,
+	    "Digi International",
+	    "AccelePort 4",
+	},
+	{
+	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT8,
+	    0,
+	    "Digi International",
+	    "AccelePort 8",
+	},
+	{
+	    USB_VENDOR_DIGITALSTREAM, USB_PRODUCT_DIGITALSTREAM_PS2,
+	    0,
+	    "Digital Stream",
+	    "PS/2 Active Adapter",
+	},
+	{
 	    USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX4,
 	    0,
 	    "D-Link",
@@ -707,48 +803,6 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "10/100 Ethernet",
 	},
 	{
-	    USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_J6502,
-	    0,
-	    "Dallas Semiconductor",
-	    "J-6502 speakers",
-	},
-	{
-	    USB_VENDOR_DALLAS, USB_PRODUCT_DALLAS_USB_FOB_IBUTTON,
-	    0,
-	    "Dallas Semiconductor",
-	    "USB-FOB/iBUTTON",
-	},
-	{
-	    USB_VENDOR_DIAMOND, USB_PRODUCT_DIAMOND_RIO500USB,
-	    0,
-	    "Diamond",
-	    "Rio 500 USB",
-	},
-	{
-	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT2,
-	    0,
-	    "Digi International",
-	    "AccelePort 2",
-	},
-	{
-	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT4,
-	    0,
-	    "Digi International",
-	    "AccelePort 4",
-	},
-	{
-	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT8,
-	    0,
-	    "Digi International",
-	    "AccelePort 8",
-	},
-	{
-	    USB_VENDOR_DIGITALSTREAM, USB_PRODUCT_DIGITALSTREAM_PS2,
-	    0,
-	    "Digital Stream",
-	    "PS/2 Active Adapter",
-	},
-	{
 	    USB_VENDOR_DMI, USB_PRODUCT_DMI_SA2_0,
 	    0,
 	    "DMI",
@@ -785,6 +839,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "LD-USB/TX",
 	},
 	{
+	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBLTX,
+	    0,
+	    "Elecom",
+	    "LD-USBL/TX",
+	},
+	{
 	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX2,
 	    0,
 	    "Elecom",
@@ -1007,6 +1067,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "CF-writer/MP3 Player",
 	},
 	{
+	    USB_VENDOR_GREENHOUSE2, USB_PRODUCT_GREENHOUSE2_USBKR100,
+	    0,
+	    "GREENHOUSE",
+	    "GH-USB100B Ethernet",
+	},
+	{
 	    USB_VENDOR_GRIFFIN, USB_PRODUCT_GRIFFIN_IMATE,
 	    0,
 	    "Griffin Technology",
@@ -1019,6 +1085,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "DA Leader",
 	},
 	{
+	    USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL641USB,
+	    0,
+	    "Genesys Logic",
+	    "GL641USB CompactFlash",
+	},
+	{
 	    USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FGSM,
 	    0,
 	    "Hagiwara Sys-Com",
@@ -1049,6 +1121,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "WinTV USB FM",
 	},
 	{
+	    USB_VENDOR_HITACHI, USB_PRODUCT_HITACHI_DZMV100A,
+	    0,
+	    "Hitachi",
+	    "DVD-CAM DZ-MV100A Camcorder",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_895C,
 	    0,
 	    "Hewlett Packard",
@@ -1133,6 +1211,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Scanjet 4300C",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_CD4E,
+	    0,
+	    "Hewlett Packard",
+	    "CD-Writer+ CD-4e",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_G85XI,
 	    0,
 	    "Hewlett Packard",
@@ -1175,16 +1259,28 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Scanjet 5300C",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_970CSE,
+	    0,
+	    "Hewlett Packard",
+	    "Deskjet 970Cse",
+	},
+	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_5400C,
+	    0,
+	    "Hewlett Packard",
+	    "Scanjet 5400C",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_930C,
 	    0,
 	    "Hewlett Packard",
 	    "DeskJet 930c",
 	},
 	{
-	    USB_VENDOR_HP, USB_PRODUCT_HP_970CSE,
+	    USB_VENDOR_HP, USB_PRODUCT_HP_P2000U,
 	    0,
 	    "Hewlett Packard",
-	    "Deskjet 970Cse",
+	    "Inkjet P-2000U",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_640C,
@@ -1283,6 +1379,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "82930 test board",
 	},
 	{
+	    USB_VENDOR_INTERSIL, USB_PRODUCT_INTERSIL_PRISM_2X,
+	    0,
+	    "Intersil",
+	    "Prism2.x WLAN",
+	},
+	{
 	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETT,
 	    0,
 	    "I/O Data",
@@ -1325,6 +1427,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Ethernet Device Adapter",
 	},
 	{
+	    USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BT,
+	    0,
+	    "Kawasaki LSI",
+	    "10BT Ethernet",
+	},
+	{
+	    USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BTN,
+	    0,
+	    "Kawasaki LSI",
+	    "10BT Ethernet",
+	},
+	{
 	    USB_VENDOR_KAWATSU, USB_PRODUCT_KAWATSU_MH4000P,
 	    0,
 	    "Kawatsu Semiconductor",
@@ -1343,18 +1457,6 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "HKS-0200 USBDAQ",
 	},
 	{
-	    USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BT,
-	    0,
-	    "Kawasaki LSI",
-	    "10BT Ethernet",
-	},
-	{
-	    USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BTN,
-	    0,
-	    "Kawasaki LSI",
-	    "10BT Ethernet",
-	},
-	{
 	    USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_ORBIT,
 	    0,
 	    "Kensington",
@@ -1373,6 +1475,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Orbit USB trackball for Mac",
 	},
 	{
+	    USB_VENDOR_KENSINGTON, USB_PRODUCT_KENSINGTON_VIDEOCAM_VGA,
+	    0,
+	    "Kensington",
+	    "VideoCAM VGA",
+	},
+	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA28,
 	    0,
 	    "Keyspan",
@@ -1409,6 +1517,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USA-49W serial adapter",
 	},
 	{
+	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_USA19Q,
+	    0,
+	    "Keyspan",
+	    "USA-19Q serial adapter",
+	},
+	{
 	    USB_VENDOR_KEYSPAN, USB_PRODUCT_KEYSPAN_UIA10_NF,
 	    0,
 	    "Keyspan",
@@ -1553,6 +1667,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USB10TA Ethernet",
 	},
 	{
+	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_WUSB11,
+	    0,
+	    "Linksys",
+	    "WUSB11 802.11b",
+	},
+	{
+	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_WUSB11_25,
+	    0,
+	    "Linksys",
+	    "WUSB11 802.11b v2.5",
+	},
+	{
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX2,
 	    0,
 	    "Linksys",
@@ -1739,6 +1865,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "LUA2-TX Ethernet",
 	},
 	{
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUAKTX,
+	    0,
+	    "Melco",
+	    "LUA-KTX Ethernet",
+	},
+	{
 	    USB_VENDOR_METRICOM, USB_PRODUCT_METRICOM_RICOCHET_GS,
 	    0,
 	    "Metricom",
@@ -1859,12 +1991,36 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Midisport 2x2",
 	},
 	{
+	    USB_VENDOR_MINDSATWORK, USB_PRODUCT_MINDSATWORK_DW,
+	    0,
+	    "Minds At Work",
+	    "Digital Wallet",
+	},
+	{
+	    USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_S304,
+	    0,
+	    "Minolta",
+	    "Dimage S304",
+	},
+	{
+	    USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_X,
+	    0,
+	    "Minolta",
+	    "Dimage X",
+	},
+	{
 	    USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_CDRRW,
 	    0,
 	    "Mitsumi",
 	    "CD-R/RW Drive",
 	},
 	{
+	    USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_FDD,
+	    0,
+	    "Mitsumi",
+	    "FDD",
+	},
+	{
 	    USB_VENDOR_MOBILITY, USB_PRODUCT_MOBILITY_EA,
 	    0,
 	    "Mobility",
@@ -1979,6 +2135,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Turbo-Connect",
 	},
 	{
+	    USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_CLIK40,
+	    0,
+	    "NetChip Technology",
+	    "Clik! 40",
+	},
+	{
 	    USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101,
 	    0,
 	    "BayNETGEAR",
@@ -2027,6 +2189,60 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "OV511+ Camera",
 	},
 	{
+	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_MD2,
+	    0,
+	    "OnSpec Electronic",
+	    "disk",
+	},
+	{
+	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_MDCFEB,
+	    0,
+	    "OnSpec Electronic",
+	    "MDCFE-B USB CF Reader",
+	},
+	{
+	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_SIIGMS,
+	    0,
+	    "OnSpec Electronic",
+	    "Memory Stick+CF Reader/Writer",
+	},
+	{
+	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_DATAFAB3,
+	    0,
+	    "OnSpec Electronic",
+	    "Datafab-based Reader",
+	},
+	{
+	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_DATAFAB4,
+	    0,
+	    "OnSpec Electronic",
+	    "Datafab-based Reader",
+	},
+	{
+	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_PNYCFSM,
+	    0,
+	    "OnSpec Electronic",
+	    "PNY/Datafab CF+SM Reader",
+	},
+	{
+	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_STECHCFSM,
+	    0,
+	    "OnSpec Electronic",
+	    "Simple Tech/Datafab CF+SM Reader",
+	},
+	{
+	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_LC1,
+	    0,
+	    "OnSpec Electronic",
+	    "CF + SM Combo (LC1)",
+	},
+	{
+	    USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_MD1II,
+	    0,
+	    "OnSpec Electronic",
+	    "Datafab MD1-II PC-Card Reader",
+	},
+	{
 	    USB_VENDOR_PALM, USB_PRODUCT_PALM_SERIAL,
 	    0,
 	    "Palm Computing",
@@ -2045,12 +2261,30 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Palm m505",
 	},
 	{
+	    USB_VENDOR_PALM, USB_PRODUCT_PALM_M125,
+	    0,
+	    "Palm Computing",
+	    "Palm m125",
+	},
+	{
+	    USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_LS120,
+	    0,
+	    "Panasonic (Matsushita)",
+	    "LS-120 Camera",
+	},
+	{
 	    USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_SDCAAE,
 	    0,
 	    "Panasonic (Matsushita)",
 	    "MultiMediaCard Adapter",
 	},
 	{
+	    USB_VENDOR_PEN, USB_PRODUCT_PEN_USBDISK,
+	    0,
+	    "Pen Drive",
+	    "USB Disk",
+	},
+	{
 	    USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1,
 	    0,
 	    "Peracom Networks",
@@ -2309,6 +2543,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "i-Key 2000",
 	},
 	{
+	    USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60,
+	    0,
+	    "RATOC Systems",
+	    "USB serial adapter REX-USB60",
+	},
+	{
 	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM1,
 	    0,
 	    "Roland",
@@ -2399,6 +2639,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "ImageMate SDDR09",
 	},
 	{
+	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSBSMCF,
+	    0,
+	    "Shuttle Technology",
+	    "eUSB SmartMedia / CompactFlash Adapter",
+	},
+	{
 	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_ZIOMMC,
 	    0,
 	    "Shuttle Technology",
@@ -2441,6 +2687,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "CD-RW Device",
 	},
 	{
+	    USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM,
+	    0,
+	    "Siemens",
+	    "SpeedStream USB",
+	},
+	{
 	    USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_IRDA,
 	    0,
 	    "Sigmatel",
@@ -2495,6 +2747,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "10/100 Ethernet",
 	},
 	{
+	    USB_VENDOR_SMC2, USB_PRODUCT_SMC2_2020HUB,
+	    0,
+	    "Standard Microsystems",
+	    "USB Hub",
+	},
+	{
 	    USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB100,
 	    0,
 	    "SOHOware",
@@ -2513,6 +2771,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Sony DSC Cameras",
 	},
 	{
+	    USB_VENDOR_SONY, USB_PRODUCT_SONY_NWMS7,
+	    0,
+	    "Sony",
+	    "Memorystick NW-MS7",
+	},
+	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_DRIVEV2,
 	    0,
 	    "Sony",
@@ -2525,6 +2789,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Memorystick MSAC-US1",
 	},
 	{
+	    USB_VENDOR_SONY, USB_PRODUCT_SONY_HANDYCAM,
+	    0,
+	    "Sony",
+	    "Handycam",
+	},
+	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_MSC,
 	    0,
 	    "Sony",
@@ -2561,6 +2831,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Internet Access Device",
 	},
 	{
+	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_PS64P1,
+	    0,
+	    "SUN Corporation",
+	    "SUNTAC U-Cable type P1",
+	},
+	{
+	    USB_VENDOR_SUNTAC, USB_PRODUCT_SUNTAC_VS10U,
+	    0,
+	    "SUN Corporation",
+	    "SUNTAC Slipper U",
+	},
+	{
 	    USB_VENDOR_SUN, USB_PRODUCT_SUN_KEYBOARD,
 	    0,
 	    "Sun Microsystems",
@@ -2651,6 +2933,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "TUSB2046 hub",
 	},
 	{
+	    USB_VENDOR_TI, USB_PRODUCT_TI_NEXII,
+	    0,
+	    "Texas Instruments",
+	    "Nex II Digital",
+	},
+	{
 	    USB_VENDOR_THRUST, USB_PRODUCT_THRUST_FUSION_PAD,
 	    0,
 	    "Thrustmaster",
@@ -2789,12 +3077,6 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Flashbuster-U",
 	},
 	{
-	    USB_VENDOR_YANO, USB_PRODUCT_YANO_U640MO,
-	    0,
-	    "Yano",
-	    "U640MO-03",
-	},
-	{
 	    USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX256,
 	    0,
 	    "YAMAHA",
@@ -2807,10 +3089,16 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "UX96 MIDI I/F",
 	},
 	{
+	    USB_VENDOR_YANO, USB_PRODUCT_YANO_U640MO,
+	    0,
+	    "Yano",
+	    "U640MO-03",
+	},
+	{
 	    USB_VENDOR_ZOOM, USB_PRODUCT_ZOOM_2986L,
 	    0,
 	    "Zoom Telephonics",
-	    "2986L",
+	    "2986L Fax Modem",
 	},
 	{
 	    USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_OMNI56K,
@@ -2909,6 +3197,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_SMC2, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Standard Microsystems",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_GRAVIS, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Advanced Gravis Computer",
@@ -3065,6 +3359,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_HITACHI, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Hitachi",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ACERP, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Acer Peripherals",
@@ -3467,6 +3767,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_RATOC, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "RATOC Systems",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ZYXEL, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "ZyXEL Communication",
@@ -3563,6 +3869,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_SUNTAC, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "SUN Corporation",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_LEXAR, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Lexar Media",
@@ -3731,12 +4043,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_SIEMENS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Siemens",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ADVANCELOGIC, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Avance Logic",
 	    NULL,
 	},
 	{
+	    USB_VENDOR_MINOLTA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Minolta",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_CHPRODUCTS, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "CH Products",
@@ -3971,6 +4295,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ONSPEC, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "OnSpec Electronic",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_APG, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "APG Cash Drawer",
@@ -4181,6 +4511,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_CONCORDCAMERA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Concord Camera",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_BIOMETRIC, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "American Biometric Company",
@@ -4229,6 +4565,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_MINDSATWORK, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Minds At Work",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_INTERSIL, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Intersil",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ALTIUS, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Altius Solutions",
@@ -4349,6 +4697,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_GREENHOUSE2, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "GREENHOUSE",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_ADDONICS2, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Addonics Technology",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_AGATE, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Agate Technologies",
@@ -4361,12 +4721,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_PEN, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Pen Drive",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_MOTOROLA, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Motorola",
 	    NULL,
 	},
 	{
+	    USB_VENDOR_CCYU, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "CCYU Technology",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_PLX, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "PLX",
@@ -4439,6 +4811,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_DAISY, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Daisy Technology",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_INTEL, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Intel",