Regen.

1 files changed, 286 insertions, 34 deletions

diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index f9e296d..724a758 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -4,7 +4,7 @@
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.60 2001/04/30 17:37:11 n_hibma Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.61 2001/07/05 09:35:46 n_hibma Exp 
  */
 
 /*
@@ -58,16 +58,16 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "3C19250 Ethernet adapter",
 	},
 	{
-	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460,
+	    USB_VENDOR_3COM, USB_PRODUCT_3COM_USR56K,
 	    0,
 	    "3Com Corp.",
-	    "HomeConnect Ethernet USB Adapter",
+	    "U.S.Robotics 56000 Voice Faxmodem Pro",
 	},
 	{
-	    USB_VENDOR_3COM, USB_PRODUCT_3COM_USR56K,
+	    USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460,
 	    0,
 	    "3Com Corp.",
-	    "U.S.Robotics 56000 Voice Faxmodem Pro",
+	    "HomeConnect Ethernet USB Adapter",
 	},
 	{
 	    USB_VENDOR_3COMUSR, USB_PRODUCT_3COMUSR_OFFICECONN,
@@ -100,6 +100,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "URE450 Ethernet Adapter",
 	},
 	{
+	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_DSB650TX_PNA,
+	    0,
+	    "AboCom Systems, Inc.",
+	    "1/10/100 ethernet adapter",
+	},
+	{
 	    USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_C310U,
 	    0,
 	    "Acer Peripherals, Inc.",
@@ -580,12 +586,6 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "2U4S serial connector/usb hub",
 	},
 	{
-	    USB_VENDOR_ETEK, USB_PRODUCT_ETEK_1COM,
-	    0,
-	    "e-TEK Labs",
-	    "Serial port",
-	},
-	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER1,
 	    0,
 	    "Seiko Epson Corp.",
@@ -628,12 +628,6 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Perfection 1200U / 1200Photo scanner",
 	},
 	{
-	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1240,
-	    0,
-	    "Seiko Epson Corp.",
-	    "Perfection 1240U / 1240Photo scanner",
-	},
-	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1600,
 	    0,
 	    "Seiko Epson Corp.",
@@ -643,13 +637,13 @@ struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1640,
 	    0,
 	    "Seiko Epson Corp.",
-	    "Perfection 1640SU scanner / GT-8700(F)",
+	    "Perfection 1640SU scanner",
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1240,
 	    0,
 	    "Seiko Epson Corp.",
-	    "Perfection 1240U / 1240Photo scanner / GT 7700",
+	    "Perfection 1240U / 1240Photo scanner",
 	},
 	{
 	    USB_VENDOR_ETEK, USB_PRODUCT_ETEK_1COM,
@@ -700,6 +694,24 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Mass Storage",
 	},
 	{
+	    USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FGSM,
+	    0,
+	    "Hagiwara Sys-Com",
+	    "FlashGate SmartMedia Card Reader",
+	},
+	{
+	    USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FGCF,
+	    0,
+	    "Hagiwara Sys-Com",
+	    "FlashGate CompactFlash Card Reader",
+	},
+	{
+	    USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FG,
+	    0,
+	    "Hagiwara Sys-Com",
+	    "FlashGate",
+	},
+	{
 	    USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_VISOR,
 	    0,
 	    "Handspring, Inc.",
@@ -712,6 +724,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "WinTV USB FM",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_895C,
+	    0,
+	    "Hewlett Packard",
+	    "DeskJet 895C",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_4100C,
 	    0,
 	    "Hewlett Packard",
@@ -724,12 +742,30 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Photosmart S20",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_880C,
+	    0,
+	    "Hewlett Packard",
+	    "DeskJet 880C",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_4200C,
 	    0,
 	    "Hewlett Packard",
 	    "ScanJet 4200C",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_CDWRITERPLUS,
+	    0,
+	    "Hewlett Packard",
+	    "CD-Writer Plus",
+	},
+	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_KBDHUB,
+	    0,
+	    "Hewlett Packard",
+	    "Multimedia Keyboard Hub",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_6200C,
 	    0,
 	    "Hewlett Packard",
@@ -742,16 +778,40 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "PhotoSmart S20",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_815C,
+	    0,
+	    "Hewlett Packard",
+	    "DeskJet 815C",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_3300C,
 	    0,
 	    "Hewlett Packard",
 	    "ScanJet 3300C",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_CDW8200,
+	    0,
+	    "Hewlett Packard",
+	    "CD-Writer Plus 8200e",
+	},
+	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_810C,
+	    0,
+	    "Hewlett Packard",
+	    "DeskJet 810C/812C",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_4300C,
 	    0,
 	    "Hewlett Packard",
-	    "ScanJet 4300C",
+	    "Scanjet 4300C",
+	},
+	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_G85XI,
+	    0,
+	    "Hewlett Packard",
+	    "OfficeJet G85xi",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_5200C,
@@ -760,10 +820,16 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Scanjet 5200C",
 	},
 	{
-	    USB_VENDOR_HP, USB_PRODUCT_HP_3400C,
+	    USB_VENDOR_HP, USB_PRODUCT_HP_830C,
+	    0,
+	    "Hewlett Packard",
+	    "DeskJet 830C",
+	},
+	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_3400CSE,
 	    0,
 	    "Hewlett Packard",
-	    "ScanJet 3400C",
+	    "ScanJet 3400cse",
 	},
 	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_6300C,
@@ -772,6 +838,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Scanjet 6300C",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_840C,
+	    0,
+	    "Hewlett Packard",
+	    "DeskJet 840c",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_5300C,
 	    0,
 	    "Hewlett Packard",
@@ -784,6 +856,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Deskjet 970Cse",
 	},
 	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_930C,
+	    0,
+	    "Hewlett Packard",
+	    "DeskJet 930c",
+	},
+	{
+	    USB_VENDOR_HP, USB_PRODUCT_HP_640C,
+	    0,
+	    "Hewlett Packard",
+	    "DeskJet 640c",
+	},
+	{
 	    USB_VENDOR_HP, USB_PRODUCT_HP_P1100,
 	    0,
 	    "Hewlett Packard",
@@ -814,6 +898,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Parallel printer adapter",
 	},
 	{
+	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ATAPI,
+	    0,
+	    "In-System Design",
+	    "ATAPI adapter",
+	},
+	{
 	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ISD110,
 	    0,
 	    "In-System Design",
@@ -1018,6 +1108,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "ColorPage Vivid-Pro scanner",
 	},
 	{
+	    USB_VENDOR_LACIE, USB_PRODUCT_LACIE_HD,
+	    0,
+	    "LaCie",
+	    "Hard Disk",
+	},
+	{
 	    USB_VENDOR_LACIE, USB_PRODUCT_LACIE_CDRW,
 	    0,
 	    "LaCie",
@@ -1036,6 +1132,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Optra S 2450",
 	},
 	{
+	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_MAUSB2,
+	    0,
+	    "Linksys, Inc.",
+	    "Camedia MAUSB-2",
+	},
+	{
 	    USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10T,
 	    0,
 	    "Linksys, Inc.",
@@ -1132,6 +1234,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "BD58 mouse",
 	},
 	{
+	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_UN58A,
+	    0,
+	    "Logitech, Inc.",
+	    "iFeel Mouse",
+	},
+	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_BB13,
 	    0,
 	    "Logitech, Inc.",
@@ -1264,12 +1372,30 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Internet Keyboard Pro",
 	},
 	{
+	    USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_SCSIDB25,
+	    0,
+	    "Microtech",
+	    "USB-SCSI-DB25",
+	},
+	{
+	    USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_SCSIHD50,
+	    0,
+	    "Microtech",
+	    "USB-SCSI-HD50",
+	},
+	{
 	    USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_DPCM,
 	    0,
 	    "Microtech",
 	    "USB CameraMate",
 	},
 	{
+	    USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_FREECOM,
+	    0,
+	    "Microtech",
+	    "Freecom USB-IDE",
+	},
+	{
 	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_336CX,
 	    0,
 	    "Microtek",
@@ -1318,6 +1444,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Midisport 2x2",
 	},
 	{
+	    USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_CDRRW,
+	    0,
+	    "Mitsumi",
+	    "CD-R/RW Drive",
+	},
+	{
 	    USB_VENDOR_MOTOROLA, USB_PRODUCT_MOTOROLA_MC141555,
 	    0,
 	    "Motorola",
@@ -1468,6 +1600,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "hub",
 	},
 	{
+	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCA646VC,
+	    0,
+	    "Philips",
+	    "PCA646VC PC Camera",
+	},
+	{
 	    USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_PCVC680K,
 	    0,
 	    "Philips",
@@ -1600,12 +1738,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "PL2302 Host-Host interface",
 	},
 	{
-	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303,
+	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_RSAQ2,
 	    0,
 	    "Prolific Technology Inc.",
 	    "PL2303 Serial adapter (IODATA USB-RSAQ2)",
 	},
 	{
+	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303,
+	    0,
+	    "Prolific Technology Inc.",
+	    "PL2303 Serial adapter (ATEN/IOGEAR UC232A)",
+	},
+	{
 	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2305,
 	    0,
 	    "Prolific Technology Inc.",
@@ -1654,16 +1798,28 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "gamepad 203USB",
 	},
 	{
-	    USB_VENDOR_QTRONIX, USB_PRODUCT_QTRONIX_980N,
+	    USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR05A,
 	    0,
-	    "Qtronix Corp",
-	    "Scorpion-980N keyboard",
+	    "SanDisk Corp",
+	    "ImageMate SDDR-05a",
 	},
 	{
-	    USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_IMAGEMATE,
+	    USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR31,
 	    0,
 	    "SanDisk Corp",
-	    "USB ImageMate",
+	    "ImageMate SDDR-31",
+	},
+	{
+	    USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR12,
+	    0,
+	    "SanDisk Corp",
+	    "ImageMate SDDR-12",
+	},
+	{
+	    USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR09,
+	    0,
+	    "SanDisk Corp",
+	    "ImageMate SDDR-09",
 	},
 	{
 	    USB_VENDOR_SCANLOGIC, USB_PRODUCT_SCANLOGIC_336CX,
@@ -1678,12 +1834,60 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "E-USB Bridge",
 	},
 	{
+	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSCSI,
+	    0,
+	    "Shuttle Technology",
+	    "eUSCSI Bridge",
+	},
+	{
+	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_SDDR09,
+	    0,
+	    "Shuttle Technology",
+	    "ImageMate SDDR09",
+	},
+	{
 	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_ZIOMMC,
 	    0,
 	    "Shuttle Technology",
 	    "eUSB MultiMediaCard Adapter",
 	},
 	{
+	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_HIFD,
+	    0,
+	    "Shuttle Technology",
+	    "Sony Hifd",
+	},
+	{
+	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSBATAPI,
+	    0,
+	    "Shuttle Technology",
+	    "eUSB ATA/ATAPI Adapter",
+	},
+	{
+	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_CF,
+	    0,
+	    "Shuttle Technology",
+	    "eUSB CompactFlash Adapter",
+	},
+	{
+	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSCSI_B,
+	    0,
+	    "Shuttle Technology",
+	    "eUSCSI Bridge",
+	},
+	{
+	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSCSI_C,
+	    0,
+	    "Shuttle Technology",
+	    "eUSCSI Bridge",
+	},
+	{
+	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_CDRW,
+	    0,
+	    "Shuttle Technology",
+	    "CD-RW Device",
+	},
+	{
 	    USB_VENDOR_SIIG, USB_PRODUCT_SIIG_DIGIFILMREADER,
 	    0,
 	    "SIIG",
@@ -1735,13 +1939,19 @@ struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_DSC,
 	    0,
 	    "Sony Corp.",
-	    "Sony DSC cameras",
+	    "DSC cameras",
+	},
+	{
+	    USB_VENDOR_SONY, USB_PRODUCT_SONY_MSACUS1,
+	    0,
+	    "Sony Corp.",
+	    "Memorystick MSAC-US1",
 	},
 	{
 	    USB_VENDOR_SONY, USB_PRODUCT_SONY_MSC,
 	    0,
 	    "Sony Corp.",
-	    "Sony MSC memory stick slot",
+	    "MSC memory stick slot",
 	},
 	{
 	    USB_VENDOR_STMICRO, USB_PRODUCT_STMICRO_COMMUNICATOR,
@@ -1792,28 +2002,34 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Rio 800 USB",
 	},
 	{
+	    USB_VENDOR_TAUGA, USB_PRODUCT_TAUGA_CAMERAMATE,
+	    0,
+	    "Taugagreining HF",
+	    "CameraMate (DPCM_USB)",
+	},
+	{
 	    USB_VENDOR_TDK, USB_PRODUCT_TDK_UPA9664,
 	    0,
 	    "TDK Corp.",
-	    "TDK USB-PDC Adapter UPA9664",
+	    "USB-PDC Adapter UPA9664",
 	},
 	{
 	    USB_VENDOR_TDK, USB_PRODUCT_TDK_UCA1464,
 	    0,
 	    "TDK Corp.",
-	    "TDK USB-cdmaOne Adapter UCA1464",
+	    "USB-cdmaOne Adapter UCA1464",
 	},
 	{
 	    USB_VENDOR_TDK, USB_PRODUCT_TDK_UHA6400,
 	    0,
 	    "TDK Corp.",
-	    "TDK USB-PHS Adapter UHA6400",
+	    "USB-PHS Adapter UHA6400",
 	},
 	{
 	    USB_VENDOR_TDK, USB_PRODUCT_TDK_UPA6400,
 	    0,
 	    "TDK Corp.",
-	    "TDK USB-PHS Adapter UPA6400",
+	    "USB-PHS Adapter UPA6400",
 	},
 	{
 	    USB_VENDOR_TEAC, USB_PRODUCT_TEAC_FD05PUB,
@@ -1948,6 +2164,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Intuos A5",
 	},
 	{
+	    USB_VENDOR_XIRLINK, USB_PRODUCT_XIRLINK_PCCAM,
+	    0,
+	    "Xirlink, Inc.",
+	    "IBM PC Camera",
+	},
+	{
 	    USB_VENDOR_YEDATA, USB_PRODUCT_YEDATA_FLASHBUSTERU,
 	    0,
 	    "Y-E Data",
@@ -1966,6 +2188,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "UX256 MIDI I/F",
 	},
 	{
+	    USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX96,
+	    0,
+	    "YAMAHA Corp.",
+	    "UX96 MIDI I/F",
+	},
+	{
 	    USB_VENDOR_ZOOM, USB_PRODUCT_ZOOM_2986L,
 	    0,
 	    "Zoom Telephonics, Inc.",
@@ -1996,6 +2224,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_MITSUMI, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Mitsumi",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_HP, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Hewlett Packard",
@@ -2074,6 +2308,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_TAUGA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Taugagreining HF",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_AMD, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Advanced Micro Devices",
@@ -2482,6 +2722,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_XIRLINK, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Xirlink, Inc.",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ANCHOR, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Anchor Chips, Inc.",
@@ -2860,6 +3106,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_HAGIWARA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Hagiwara Sys-Com",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_CTX, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Chuntex",