1 files changed, 107 insertions, 30 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 1b4b214708ae..2ba03126fad0 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.11.2.11 2001/05/17 22:07:32 n_hibma Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.11.2.13 2001/12/06 16:36:00 iedowse Exp 
  */
 
 /*
@@ -47,25 +47,43 @@
 /*
  * List of known USB vendors
  *
- * Please note that these IDs do not do anything. Adding an ID here and
+ * Adding an ID and its string description for a device to the usbdevs file,
+ * enables the USB stack to print a useful description of the device that was
+ * connected.
+ *
+ * The ID should be added in usbdevs and then the files usbdevs.h and
+ * usbdevs_data.h need to be regenerated.
+ *
+ *	# edit usbdevs
+ *	make -f Makefile.usbdevs
+ *	# test your change
+ *	cd ../../modules/usb
+ *	make
+ *	# commit, if appropriate
+ *	cvs -m "ID for device XYZ" commit usbdevs
+ *	# commit the derived files after the $ FreeBSD $ has been updated.
+ *	cvs commit usbdevs.h usbdevs_data.h
+ *
+ * Please note that these IDs do not do anything. Adding an ID in usbdevs and
  * regenerating the usbdevs.h and usbdevs_data.h only makes a symbolic name
- * available to the source code and does not change any functionality, nor
- * does it make your device available to a specific driver.
- * It will however make the descriptive string available if a device does not
- * provide the string itself.
+ * available to the source code and does not change any functionality, nor does
+ * it make your device available to a specific driver.  It will however make
+ * the descriptive string available if a device does not provide the string
+ * itself.
  *
  * After adding a vendor ID VNDR and a product ID PRDCT you will have the
  * following extra defines:
  * #define USB_VENDOR_VNDR              0x????
  * #define USB_PRODUCT_VNDR_PRDCT       0x????
  *
- * You may have to add these defines to the respective probe routines to
- * make the device recognised by the appropriate device driver.
+ * You will have to add these defines to the respective probe routines to make
+ * the device recognised by the appropriate device driver.
  */
 
 #define	USB_VENDOR_AOX	0x03e8		/* AOX, Inc. */
 #define	USB_VENDOR_ATMEL	0x03eb		/* Atmel Corp. */
-#define	USB_VENDOR_HP	0x03f0		/* Hewlett Packard */
+#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 */
 #define	USB_VENDOR_ACERLABS	0x0402		/* Acer Labs, Inc. */
@@ -78,6 +96,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 +165,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. */
@@ -179,6 +199,7 @@
 #define	USB_VENDOR_QTRONIX	0x05c7		/* Qtronix Corp */
 #define	USB_VENDOR_ELSA	0x05cc		/* ELSA Gmbh */
 #define	USB_VENDOR_BRAINBOXES	0x05d1		/* Brainboxes Limited */
+#define	USB_VENDOR_ULTIMA	0x05d8		/* Ultima */
 #define	USB_VENDOR_AXIOHM	0x05d9		/* Axiohm Transaction Solutions */
 #define	USB_VENDOR_MICROTEK	0x05da		/* Microtek */
 #define	USB_VENDOR_LEXAR	0x05dc		/* Lexar Media */
@@ -209,6 +230,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 */
@@ -240,6 +262,7 @@
 #define	USB_VENDOR_COREGA	0x07aa		/* Corega */
 #define	USB_VENDOR_FREECOM	0x07ab		/* Freecom */
 #define	USB_VENDOR_MICROTECH	0x07af		/* Microtech */
+#define	USB_VENDOR_OLYMPUS	0x07b4		/* Olympus */
 #define	USB_VENDOR_ABOCOM	0x07b8		/* AboCom Systems, Inc. */
 #define	USB_VENDOR_KEISOKUGIKEN	0x07c1		/* Keisokugiken Corp. */
 #define	USB_VENDOR_APG	0x07c5		/* APG Cash Drawer */
@@ -310,7 +333,7 @@
 #define	USB_VENDOR_ACTIONTEC	0x1668		/* Actiontec Electronics, Inc. */
 #define	USB_VENDOR_DLINK	0x2001		/* D-Link Corp */
 #define	USB_VENDOR_INTEL	0x8086		/* Intel */
-#define	USB_VENDOR_HP2	0xf003		/* Hewlett Packard */
+#define	USB_VENDOR_HP2	0xf003		/* Hewlett-Packard */
 
 /*
  * List of known products.  Grouped by vendor.
@@ -319,8 +342,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 +352,10 @@
 
 /* AboCom products */
 #define	USB_PRODUCT_ABOCOM_URE450	0x4000		/* URE450 Ethernet Adapter */
+#define	USB_PRODUCT_ABOCOM_DSB650TX_PNA	0x4003		/* 1/10/100 ethernet adapter */
+
+/* Accton Technology Corp. products */
+#define	USB_PRODUCT_ACCTON_USB320_EC	0x1046		/* USB320-EC Ethernet Adapter */
 
 /* Acer Peripherals, Inc. products */
 #define	USB_PRODUCT_ACERP_ACERSCAN_C310U	0x12a6		/* Acerscan C310U */
@@ -495,9 +522,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 +530,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 +558,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 +570,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 +607,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 +670,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 +680,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 +699,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 */
@@ -678,6 +722,7 @@
 /* Melco, Inc products */
 #define	USB_PRODUCT_MELCO_LUATX1	0x0001		/* LUA-TX Ethernet */
 #define	USB_PRODUCT_MELCO_LUATX5	0x0005		/* LUA-TX Ethernet */
+#define	USB_PRODUCT_MELCO_LUA2TX5	0x0009		/* LUA2-TX Ethernet */
 
 /* Metricom products */
 #define	USB_PRODUCT_METRICOM_RICOCHET_GS	0x0001		/* Ricochet GS */
@@ -692,7 +737,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 +754,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 */
 
@@ -718,6 +769,7 @@
 #define	USB_PRODUCT_MUSTEK_1200USB	0x0003		/* 1200 USB scanner */
 #define	USB_PRODUCT_MUSTEK_1200UB	0x0006		/* 1200 UB scanner */
 #define	USB_PRODUCT_MUSTEK_1200USBPLUS	0x0007		/* 1200 USB Plus scanner */
+#define	USB_PRODUCT_MUSTEK_1200CUPLUS	0x0008		/* 1200 CU Plus scanner */
 #define	USB_PRODUCT_MUSTEK_BEARPAW1200F	0x0010		/* BearPaw 1200F scanner */
 #define	USB_PRODUCT_MUSTEK_600USB	0x0873		/* 600 USB scanner */
 #define	USB_PRODUCT_MUSTEK_MDC800	0xa800		/* MDC-800 digital camera */
@@ -742,6 +794,10 @@
 /* Nikon products */
 #define	USB_PRODUCT_NIKON_E990	0x0102		/* Digital Camera E990 */
 
+/* Olympus products */
+#define	USB_PRODUCT_OLYMPUS_C1	0x0102		/* C-1 Digital Camera */
+#define	USB_PRODUCT_OLYMPUS_C700	0x0105		/* C-700 Ultra Zoom */
+
 /* OmniVision Technologies, Inc. products */
 #define	USB_PRODUCT_OMNIVISION_OV511	0x0511		/* OV511 Camera */
 #define	USB_PRODUCT_OMNIVISION_OV511PLUS	0xa511		/* OV511+ Camera */
@@ -762,6 +818,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 */
 
@@ -794,7 +851,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 */
 
@@ -816,18 +874,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 */
@@ -850,8 +916,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 */
@@ -870,11 +937,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 */
@@ -892,6 +962,9 @@
 /* Trek Technology products */
 #define	USB_PRODUCT_TREK_THUMBDRIVE	0x1111		/* ThumbDrive */
 
+/* Ultima products */
+#define	USB_PRODUCT_ULTIMA_1200UBPLUS	0x4002		/* 1200 UB Plus scanner */
+
 /* UMAX products */
 #define	USB_PRODUCT_UMAX_ASTRA1236U	0x0002		/* Astra 1236U Scanner */
 #define	USB_PRODUCT_UMAX_ASTRA1220U	0x0010		/* Astra 1220U Scanner */
@@ -918,6 +991,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 */
 
@@ -926,6 +1002,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 */