Regen.

2 files changed, 353 insertions, 55 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 7e798bf..d9646c1 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.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 
  */
 
 /*
@@ -65,6 +65,7 @@
 
 #define	USB_VENDOR_AOX	0x03e8		/* AOX, Inc. */
 #define	USB_VENDOR_ATMEL	0x03eb		/* Atmel Corp. */
+#define	USB_VENDOR_MITSUMI	0x03ee		/* Mitsumi */
 #define	USB_VENDOR_HP	0x03f0		/* Hewlett Packard */
 #define	USB_VENDOR_ADAPTEC	0x03f3		/* Adaptec, Inc. */
 #define	USB_VENDOR_NATIONAL	0x0400		/* National Semiconductor */
@@ -78,6 +79,7 @@
 #define	USB_VENDOR_CATC	0x0423		/* Computer Access Technology Corp. */
 #define	USB_VENDOR_GRAVIS	0x0428		/* Advanced Gravis Computer Tech. Ltd. */
 #define	USB_VENDOR_SUN	0x0430		/* Sun Microsystems */
+#define	USB_VENDOR_TAUGA	0x0436		/* Taugagreining HF */
 #define	USB_VENDOR_AMD	0x0438		/* Advanced Micro Devices */
 #define	USB_VENDOR_LEXMARK	0x043d		/* Lexmark International, Inc. */
 #define	USB_VENDOR_NANAO	0x0440		/* NANAO Corp. */
@@ -146,6 +148,7 @@
 #define	USB_VENDOR_ATI	0x0528		/* ATI Technologies, Inc. */
 #define	USB_VENDOR_AKS	0x0529		/* Aladdin Knowledge Systems */
 #define	USB_VENDOR_UNIACCESS	0x0540		/* Universal Access */
+#define	USB_VENDOR_XIRLINK	0x0545		/* Xirlink, Inc. */
 #define	USB_VENDOR_ANCHOR	0x0547		/* Anchor Chips, Inc. */
 #define	USB_VENDOR_SONY	0x054c		/* Sony Corp. */
 #define	USB_VENDOR_VISION	0x0553		/* VLSI Vision Ltd. */
@@ -209,6 +212,7 @@
 #define	USB_VENDOR_ACARD	0x0678		/* ACARD Technology Corp. */
 #define	USB_VENDOR_PROLIFIC	0x067b		/* Prolific Technology Inc. */
 #define	USB_VENDOR_ADVANCELOGIC	0x0680		/* Avance Logic, Inc. */
+#define	USB_VENDOR_HAGIWARA	0x0693		/* Hagiwara Sys-Com */
 #define	USB_VENDOR_CTX	0x0698		/* Chuntex */
 #define	USB_VENDOR_ASKEY	0x069a		/* Askey Computer Corp. */
 #define	USB_VENDOR_ALCATELT	0x06b9		/* Alcatel Telecom */
@@ -319,8 +323,8 @@
 /* 3Com products */
 #define	USB_PRODUCT_3COM_HOMECONN	0x009d		/* HomeConnect USB Camera */
 #define	USB_PRODUCT_3COM_3C19250	0x03E8		/* 3C19250 Ethernet adapter */
-#define	USB_PRODUCT_3COM_3C460	0x11f8		/* HomeConnect Ethernet USB Adapter */
 #define	USB_PRODUCT_3COM_USR56K	0x3021		/* U.S.Robotics 56000 Voice Faxmodem Pro */
+#define	USB_PRODUCT_3COM_3C460	0x11f8		/* HomeConnect Ethernet USB Adapter */
 
 #define	USB_PRODUCT_3COMUSR_OFFICECONN	0x0082		/* 3Com OfficeConnect Analog Modem */
 #define	USB_PRODUCT_3COMUSR_USRISDN	0x008f		/* 3Com U.S. Robotics Pro ISDN TA */
@@ -329,6 +333,7 @@
 
 /* AboCom products */
 #define	USB_PRODUCT_ABOCOM_URE450	0x4000		/* URE450 Ethernet Adapter */
+#define	USB_PRODUCT_ABOCOM_DSB650TX_PNA	0x4003		/* 1/10/100 ethernet adapter */
 
 /* Acer Peripherals, Inc. products */
 #define	USB_PRODUCT_ACERP_ACERSCAN_C310U	0x12a6		/* Acerscan C310U */
@@ -495,9 +500,6 @@
 #define	USB_PRODUCT_ENTREGA_2U4S	0x8004		/* 2U4S serial connector/usb hub */
 /*product ENTREGA SERIAL_DB9	0x8093	DB9 Serial connector*/
 
-/* e-TEK Labs products */
-#define	USB_PRODUCT_ETEK_1COM	0x8007		/* Serial port */
-
 /* Epson products */
 #define	USB_PRODUCT_EPSON_PRINTER1	0x0001		/* USB Printer */
 #define	USB_PRODUCT_EPSON_PRINTER2	0x0002		/* ISD USB Smart Cable for Mac */
@@ -506,10 +508,9 @@
 #define	USB_PRODUCT_EPSON_636	0x0101		/* Perfection 636U / 636Photo scanner */
 #define	USB_PRODUCT_EPSON_610	0x0103		/* Perfection 610 scanner */
 #define	USB_PRODUCT_EPSON_1200	0x0104		/* Perfection 1200U / 1200Photo scanner */
-#define	USB_PRODUCT_EPSON_1240	0x010b		/* Perfection 1240U / 1240Photo scanner */
 #define	USB_PRODUCT_EPSON_1600	0x0107		/* Expression 1600 scanner */
-#define	USB_PRODUCT_EPSON_1640	0x010a		/* Perfection 1640SU scanner / GT-8700(F) */
-#define	USB_PRODUCT_EPSON_1240	0x010b		/* Perfection 1240U / 1240Photo scanner / GT 7700 */
+#define	USB_PRODUCT_EPSON_1640	0x010a		/* Perfection 1640SU scanner */
+#define	USB_PRODUCT_EPSON_1240	0x010b		/* Perfection 1240U / 1240Photo scanner */
 
 /* e-TEK Labs products */
 #define	USB_PRODUCT_ETEK_1COM	0x8007		/* Serial port */
@@ -535,6 +536,11 @@
 /* Fuji photo products */
 #define	USB_PRODUCT_FUJIPHOTO_MASS0100	0x0100		/* Mass Storage */
 
+/* Hagiwara products */
+#define	USB_PRODUCT_HAGIWARA_FGSM	0x0002		/* FlashGate SmartMedia Card Reader */
+#define	USB_PRODUCT_HAGIWARA_FGCF	0x0003		/* FlashGate CompactFlash Card Reader */
+#define	USB_PRODUCT_HAGIWARA_FG	0x0005		/* FlashGate */
+
 /* Handspring, Inc. */
 #define	USB_PRODUCT_HANDSPRING_VISOR	0x0100		/* Handspring Visor */
 
@@ -542,18 +548,30 @@
 #define	USB_PRODUCT_HAUPPAUGE_WINTV_USB_FM	0x4d12		/* WinTV USB FM */
 
 /* HP products */
+#define	USB_PRODUCT_HP_895C	0x0004		/* DeskJet 895C */
 #define	USB_PRODUCT_HP_4100C	0x0101		/* Scanjet 4100C */
 #define	USB_PRODUCT_HP_S20	0x0102		/* Photosmart S20 */
+#define	USB_PRODUCT_HP_880C	0x0104		/* DeskJet 880C */
 #define	USB_PRODUCT_HP_4200C	0x0105		/* ScanJet 4200C */
+#define	USB_PRODUCT_HP_CDWRITERPLUS	0x0107		/* CD-Writer Plus */
+#define	USB_PRODUCT_HP_KBDHUB	0x010c		/* Multimedia Keyboard Hub */
 #define	USB_PRODUCT_HP_6200C	0x0201		/* ScanJet 6200C */
 #define	USB_PRODUCT_HP_S20b	0x0202		/* PhotoSmart S20 */
+#define	USB_PRODUCT_HP_815C	0x0204		/* DeskJet 815C */
 #define	USB_PRODUCT_HP_3300C	0x0205		/* ScanJet 3300C */
-#define	USB_PRODUCT_HP_4300C	0x0305		/* ScanJet 4300C */
+#define	USB_PRODUCT_HP_CDW8200	0x0207		/* CD-Writer Plus 8200e */
+#define	USB_PRODUCT_HP_810C	0x0304		/* DeskJet 810C/812C */
+#define	USB_PRODUCT_HP_4300C	0x0305		/* Scanjet 4300C */
+#define	USB_PRODUCT_HP_G85XI	0x0311		/* OfficeJet G85xi */
 #define	USB_PRODUCT_HP_5200C	0x0401		/* Scanjet 5200C */
-#define	USB_PRODUCT_HP_3400C	0x0405		/* ScanJet 3400C */
+#define	USB_PRODUCT_HP_830C	0x0404		/* DeskJet 830C */
+#define	USB_PRODUCT_HP_3400CSE	0x0405		/* ScanJet 3400cse */
 #define	USB_PRODUCT_HP_6300C	0x0601		/* Scanjet 6300C */
+#define	USB_PRODUCT_HP_840C	0x0604		/* DeskJet 840c */
 #define	USB_PRODUCT_HP_5300C	0x0701		/* Scanjet 5300C */
 #define	USB_PRODUCT_HP_970CSE	0x1004		/* Deskjet 970Cse */
+#define	USB_PRODUCT_HP_930C	0x1204		/* DeskJet 930c */
+#define	USB_PRODUCT_HP_640C	0x2004		/* DeskJet 640c */
 #define	USB_PRODUCT_HP_P1100	0x3102		/* Photosmart P1100 */
 
 /* HP products */
@@ -567,6 +585,7 @@
 
 /* In-System products */
 #define	USB_PRODUCT_INSYSTEM_F5U002	0x0002		/* Parallel printer adapter */
+#define	USB_PRODUCT_INSYSTEM_ATAPI	0x0031		/* ATAPI adapter */
 #define	USB_PRODUCT_INSYSTEM_ISD110	0x0200		/* IDE adapter ISD110 */
 #define	USB_PRODUCT_INSYSTEM_ISD105	0x0202		/* IDE adapter ISD105 */
 #define	USB_PRODUCT_INSYSTEM_USBCABLE	0x081a		/* USB cable */
@@ -629,6 +648,7 @@
 #define	USB_PRODUCT_KYE_VIVIDPRO	0x2001		/* ColorPage Vivid-Pro scanner */
 
 /* LaCie products */
+#define	USB_PRODUCT_LACIE_HD	0xa601		/* Hard Disk */
 #define	USB_PRODUCT_LACIE_CDRW	0xa602		/* CD R/W */
 
 /* Lexar products */
@@ -638,6 +658,7 @@
 #define	USB_PRODUCT_LEXMARK_S2450	0x0009		/* Optra S 2450 */
 
 /* Linksys products */
+#define	USB_PRODUCT_LINKSYS_MAUSB2	0x0105		/* Camedia MAUSB-2 */
 #define	USB_PRODUCT_LINKSYS_USB10T	0x2202		/* USB10T Ethernet */
 #define	USB_PRODUCT_LINKSYS_USB100TX	0x2203		/* USB100TX Ethernet */
 #define	USB_PRODUCT_LINKSYS_USB100H1	0x2204		/* USB100H1 Ethernet/HPNA */
@@ -656,6 +677,7 @@
 #define	USB_PRODUCT_LOGITECH_MBA47	0xc002		/* M-BA47 mouse */
 #define	USB_PRODUCT_LOGITECH_WMMOUSE	0xc004		/* WingMan Gaming Mouse */
 #define	USB_PRODUCT_LOGITECH_BD58	0xc00c		/* BD58 mouse */
+#define	USB_PRODUCT_LOGITECH_UN58A	0xc030		/* iFeel Mouse */
 #define	USB_PRODUCT_LOGITECH_BB13	0xc401		/* USB-PS/2 Trackball */
 #define	USB_PRODUCT_LOGITECH_WMPAD	0xc208		/* WingMan GamePad Extreme */
 #define	USB_PRODUCT_LOGITECH_WMJOY	0xc281		/* WingMan Force joystick */
@@ -692,7 +714,10 @@
 #define	USB_PRODUCT_MICROSOFT_INETPRO	0x002b		/* Internet Keyboard Pro */
 
 /* Microtech products */
+#define	USB_PRODUCT_MICROTECH_SCSIDB25	0x0004		/* USB-SCSI-DB25 */
+#define	USB_PRODUCT_MICROTECH_SCSIHD50	0x0005		/* USB-SCSI-HD50 */
 #define	USB_PRODUCT_MICROTECH_DPCM	0x0006		/* USB CameraMate */
+#define	USB_PRODUCT_MICROTECH_FREECOM	0xfc01		/* Freecom USB-IDE */
 
 /* Microtek products */
 #define	USB_PRODUCT_MICROTEK_336CX	0x0094		/* Phantom 336CX - C3 scanner */
@@ -706,6 +731,9 @@
 /* Midiman products */
 #define	USB_PRODUCT_MIDIMAN_MIDISPORT2X2	0x1001		/* Midisport 2x2 */
 
+/* Mitsumi products */
+#define	USB_PRODUCT_MITSUMI_CDRRW	0x0000		/* CD-R/RW Drive */
+
 /* Motorola products */
 #define	USB_PRODUCT_MOTOROLA_MC141555	0x1555		/* MC141555 hub controller */
 
@@ -758,6 +786,7 @@
 #define	USB_PRODUCT_PHILIPS_DSS350	0x0101		/* DSS 350 Digital Speaker System */
 #define	USB_PRODUCT_PHILIPS_DSS	0x0104		/* DSS XXX Digital Speaker System */
 #define	USB_PRODUCT_PHILIPS_HUB	0x0201		/* hub */
+#define	USB_PRODUCT_PHILIPS_PCA646VC	0x0303		/* PCA646VC PC Camera */
 #define	USB_PRODUCT_PHILIPS_PCVC680K	0x0308		/* PCVC680K Vesta Pro PC Camera */
 #define	USB_PRODUCT_PHILIPS_DSS150	0x0471		/* DSS 150 Digital Speaker System */
 
@@ -790,7 +819,8 @@
 /* Prolific products */
 #define	USB_PRODUCT_PROLIFIC_PL2301	0x0000		/* PL2301 Host-Host interface */
 #define	USB_PRODUCT_PROLIFIC_PL2302	0x0001		/* PL2302 Host-Host interface */
-#define	USB_PRODUCT_PROLIFIC_PL2303	0x04bb		/* PL2303 Serial adapter (IODATA USB-RSAQ2) */
+#define	USB_PRODUCT_PROLIFIC_RSAQ2	0x04bb		/* PL2303 Serial adapter (IODATA USB-RSAQ2) */
+#define	USB_PRODUCT_PROLIFIC_PL2303	0x2303		/* PL2303 Serial adapter (ATEN/IOGEAR UC232A) */
 #define	USB_PRODUCT_PROLIFIC_PL2305	0x2305		/* Parallel printer adapter */
 #define	USB_PRODUCT_PROLIFIC_ATAPI4	0x2307		/* ATAPI-4 Bridge Controller */
 
@@ -812,18 +842,26 @@
 /* Rockfire products */
 #define	USB_PRODUCT_ROCKFIRE_GAMEPAD	0x2033		/* gamepad 203USB */
 
-/* Qtronix products */
-#define	USB_PRODUCT_QTRONIX_980N	0x2011		/* Scorpion-980N keyboard */
-
 /* SanDisk products */
-#define	USB_PRODUCT_SANDISK_IMAGEMATE	0x0001		/* USB ImageMate */
+#define	USB_PRODUCT_SANDISK_SDDR05A	0x0001		/* ImageMate SDDR-05a */
+#define	USB_PRODUCT_SANDISK_SDDR31	0x0002		/* ImageMate SDDR-31 */
+#define	USB_PRODUCT_SANDISK_SDDR12	0x0100		/* ImageMate SDDR-12 */
+#define	USB_PRODUCT_SANDISK_SDDR09	0x0200		/* ImageMate SDDR-09 */
 
 /* ScanLogic products */
 #define	USB_PRODUCT_SCANLOGIC_336CX	0x0300		/* Phantom 336CX - C3 scanner */
 
 /* Shuttle Technology products */
 #define	USB_PRODUCT_SHUTTLE_EUSB	0x0001		/* E-USB Bridge */
+#define	USB_PRODUCT_SHUTTLE_EUSCSI	0x0002		/* eUSCSI Bridge */
+#define	USB_PRODUCT_SHUTTLE_SDDR09	0x0003		/* ImageMate SDDR09 */
 #define	USB_PRODUCT_SHUTTLE_ZIOMMC	0x0006		/* eUSB MultiMediaCard Adapter */
+#define	USB_PRODUCT_SHUTTLE_HIFD	0x0007		/* Sony Hifd */
+#define	USB_PRODUCT_SHUTTLE_EUSBATAPI	0x0009		/* eUSB ATA/ATAPI Adapter */
+#define	USB_PRODUCT_SHUTTLE_CF	0x000a		/* eUSB CompactFlash Adapter */
+#define	USB_PRODUCT_SHUTTLE_EUSCSI_B	0x000b		/* eUSCSI Bridge */
+#define	USB_PRODUCT_SHUTTLE_EUSCSI_C	0x000c		/* eUSCSI Bridge */
+#define	USB_PRODUCT_SHUTTLE_CDRW	0x0101		/* CD-RW Device */
 
 /* SIIG products */
 #define	USB_PRODUCT_SIIG_DIGIFILMREADER	0x0004		/* DigiFilm-Combo Reader */
@@ -846,8 +884,9 @@
 #define	USB_PRODUCT_SOLIDYEAR_KEYBOARD	0x2101		/* Solid Year USB keyboard */
 
 /* SONY products */
-#define	USB_PRODUCT_SONY_DSC	0x0010		/* Sony DSC cameras */
-#define	USB_PRODUCT_SONY_MSC	0x0032		/* Sony MSC memory stick slot */
+#define	USB_PRODUCT_SONY_DSC	0x0010		/* DSC cameras */
+#define	USB_PRODUCT_SONY_MSACUS1	0x002d		/* Memorystick MSAC-US1 */
+#define	USB_PRODUCT_SONY_MSC	0x0032		/* MSC memory stick slot */
 
 /* STMicroelectronics products */
 #define	USB_PRODUCT_STMICRO_COMMUNICATOR	0x7554		/* USB Communicator */
@@ -866,11 +905,14 @@
 #define	USB_PRODUCT_DIAMOND2_RIO600USB	0x5001		/* Rio 600 USB */
 #define	USB_PRODUCT_DIAMOND2_RIO800USB	0x5002		/* Rio 800 USB */
 
+/* Taugagreining products */
+#define	USB_PRODUCT_TAUGA_CAMERAMATE	0x0005		/* CameraMate (DPCM_USB) */
+ 
 /* TDK products */
-#define	USB_PRODUCT_TDK_UPA9664	0x0115		/* TDK USB-PDC Adapter UPA9664 */
-#define	USB_PRODUCT_TDK_UCA1464	0x0116		/* TDK USB-cdmaOne Adapter UCA1464 */
-#define	USB_PRODUCT_TDK_UHA6400	0x0117		/* TDK USB-PHS Adapter UHA6400 */
-#define	USB_PRODUCT_TDK_UPA6400	0x0118		/* TDK USB-PHS Adapter UPA6400 */
+#define	USB_PRODUCT_TDK_UPA9664	0x0115		/* USB-PDC Adapter UPA9664 */
+#define	USB_PRODUCT_TDK_UCA1464	0x0116		/* USB-cdmaOne Adapter UCA1464 */
+#define	USB_PRODUCT_TDK_UHA6400	0x0117		/* USB-PHS Adapter UHA6400 */
+#define	USB_PRODUCT_TDK_UPA6400	0x0118		/* USB-PHS Adapter UPA6400 */
 
 /* TEAC products */
 #define	USB_PRODUCT_TEAC_FD05PUB	0x0000		/* FD-05PUB floppy */
@@ -914,6 +956,9 @@
 #define	USB_PRODUCT_WACOM_GRAPHIRE	0x0010		/* Graphire */
 #define	USB_PRODUCT_WACOM_INTUOSA5	0x0021		/* Intuos A5 */
  
+/* Xirlink products */
+#define	USB_PRODUCT_XIRLINK_PCCAM	0x8080		/* IBM PC Camera */
+
 /* Y-E Data products */
 #define	USB_PRODUCT_YEDATA_FLASHBUSTERU	0x0000		/* Flashbuster-U */
 
@@ -922,6 +967,7 @@
 
 /* Yamaha products */
 #define	USB_PRODUCT_YAMAHA_UX256	0x1000		/* UX256 MIDI I/F */
+#define	USB_PRODUCT_YAMAHA_UX96	0x1008		/* UX96 MIDI I/F */
 
 /* Zoom Telephonics, Inc. products */
 #define	USB_PRODUCT_ZOOM_2986L	0x9700		/* 2986L Fax modem */
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",