sync

2 files changed, 147 insertions, 26 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 5869f936504..a81416ed336 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbdevs.h,v 1.29 2001/01/27 04:02:16 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.30 2001/01/28 09:35:11 aaron Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -85,10 +85,12 @@
 #define	USB_VENDOR_KENSINGTON	0x047d		/* Kensington */
 #define	USB_VENDOR_LUCENT	0x047e		/* Lucent */
 #define	USB_VENDOR_STMICRO	0x0483		/* STMicroelectronics */
+#define	USB_VENDOR_YAMAHA	0x0499		/* YAMAHA */
 #define	USB_VENDOR_COMPAQ	0x049f		/* Compaq */
 #define	USB_VENDOR_ACERP	0x04a5		/* Acer Peripherals */
 #define	USB_VENDOR_VISIONEER	0x04a7		/* Visioneer */
 #define	USB_VENDOR_CANON	0x04a9		/* Canon */
+#define	USB_VENDOR_NIKON	0x04b0		/* Nikon */
 #define	USB_VENDOR_IBM	0x04b3		/* IBM */
 #define	USB_VENDOR_CYPRESS	0x04b4		/* Cypress Semiconductor */
 #define	USB_VENDOR_EPSON	0x04b8		/* Seiko Epson */
@@ -145,6 +147,7 @@
 #define	USB_VENDOR_YEDATA	0x057b		/* Y-E Data */
 #define	USB_VENDOR_AVM	0x057c		/* AVM */
 #define	USB_VENDOR_QUICKSHOT	0x057f		/* Quickshot */
+#define	USB_VENDOR_ROLAND	0x0582		/* Roland */
 #define	USB_VENDOR_ROCKFIRE	0x0583		/* Rockfire */
 #define	USB_VENDOR_ZYXEL	0x0586		/* ZyXEL Communication */
 #define	USB_VENDOR_ALCOR	0x058f		/* Alcor Micro */
@@ -227,6 +230,7 @@
 #define	USB_VENDOR_APTIO	0x07d2		/* Aptio Products */
 #define	USB_VENDOR_ARASAN	0x07da		/* Arasan Chip Systems */
 #define	USB_VENDOR_ALLIEDCABLE	0x07e6		/* Allied Cable */
+#define	USB_VENDOR_STSN	0x07ef		/* STSN */
 #define	USB_VENDOR_ZOOM	0x0803		/* Zoom Telephonics */
 #define	USB_VENDOR_BROADLOGIC	0x0827		/* BroadLogic */
 #define	USB_VENDOR_HANDSPRING	0x082d		/* Handspring */
@@ -275,6 +279,7 @@
 #define	USB_VENDOR_MOTOROLA	0x1063		/* Motorola */
 #define	USB_VENDOR_PLX	0x10b5		/* PLX */
 #define	USB_VENDOR_BELKIN2	0x1293		/* Belkin Components */
+#define	USB_VENDOR_SILICONPORTALS	0x1527		/* Silicon Portals */
 #define	USB_VENDOR_UMAX	0x1606		/* UMAX Data Systems */
 #define	USB_VENDOR_INSIDEOUT	0x1608		/* Inside Out Networks */
 #define	USB_VENDOR_ENTREGA	0x1645		/* Entrega */
@@ -358,6 +363,9 @@
 #define	USB_PRODUCT_ATEN_UC10T	0x2002		/* 10Mbps Ethernet */
 #define	USB_PRODUCT_ATEN_UC232A	0x2008		/* Serial adapter */
 
+/* Atmel Comp. products */
+#define	USB_PRODUCT_ATMEL_UHB124	0x3301		/* UHB124 hub */
+
 /* Avision products */
 #define	USB_PRODUCT_AVISION_1200U	0x0268		/* 1200U scanner */
 
@@ -458,10 +466,12 @@
 #define	USB_PRODUCT_EPSON_PRINTER1	0x0001		/* USB Printer */
 #define	USB_PRODUCT_EPSON_PRINTER2	0x0002		/* ISD Smart Cable for Mac */
 #define	USB_PRODUCT_EPSON_PRINTER3	0x0003		/* ISD Smart Cable */
+#define	USB_PRODUCT_EPSON_PRINTER5	0x0005		/* USB Printer */
 #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_1600	0x0107		/* Expression 1600 */
+#define	USB_PRODUCT_EPSON_1600	0x0107		/* Expression 1600 scanner */
+#define	USB_PRODUCT_EPSON_1640	0x010a		/* Expression 1640SU scanner */
 
 /* e-TEK Labs products */
 #define	USB_PRODUCT_ETEK_1COM	0x8007		/* Serial port */
@@ -473,7 +483,7 @@
 #define	USB_PRODUCT_GRAVIS_GAMEPADPRO	0x4001		/* GamePad Pro */
 
 /* Griffin Technology */
-#define	USB_PRODUCT_GRIFFIN_IMATE	0x0405		/* iMate, ABD adapter */
+#define	USB_PRODUCT_GRIFFIN_IMATE	0x0405		/* iMate, ADB adapter */
 
 /* Freecom products */
 #define	USB_PRODUCT_FREECOM_DVD	0xfc01		/* Connector for DVD drive */
@@ -516,8 +526,8 @@
 #define	USB_PRODUCT_INSYSTEM_USBCABLE	0x081a		/* USB cable */
 
 /* Intel products */
-#define	USB_PRODUCT_INTEL_TESTBOARD	0x9890		/* 82930 test board */
 #define	USB_PRODUCT_INTEL_EASYPC_CAMERA	0x0110		/* Easy PC Camera */
+#define	USB_PRODUCT_INTEL_TESTBOARD	0x9890		/* 82930 test board */
 
 /* I/O DATA products */
 #define	USB_PRODUCT_IODATA_USBETTX	0x0904		/* USB ETTX */
@@ -587,6 +597,7 @@
 #define	USB_PRODUCT_LOGITECH_N48	0xc001		/* N48 mouse */
 #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_BB13	0xc401		/* USB-PS/2 Trackball */
 #define	USB_PRODUCT_LOGITECH_WMPAD	0xc208		/* WingMan GamePad Extreme */
 #define	USB_PRODUCT_LOGITECH_WMJOY	0xc281		/* WingMan Force joystick */
@@ -603,7 +614,8 @@
 #define	USB_PRODUCT_MCT_USB232	0x0210		/* USB-232 Interface */
 
 /* Melco, Inc products */
-#define	USB_PRODUCT_MELCO_LUATX	0x0001		/* LU-ATX Ethernet */
+#define	USB_PRODUCT_MELCO_LUATX1	0x0001		/* LUA-TX Ethernet */
+#define	USB_PRODUCT_MELCO_LUATX5	0x0005		/* LUA-TX Ethernet */
 
 /* Metricom products */
 #define	USB_PRODUCT_METRICOM_RICOCHET_GS	0x0001		/* Ricochet GS */
@@ -618,10 +630,10 @@
 #define	USB_PRODUCT_MICROSOFT_INETPRO	0x002b		/* Internet Pro */
 
 /* Microtek products */
-#define	USB_PRODUCT_MICROTEK_X6U	0x0099		/* ScanMaker X6 - X6U */
 #define	USB_PRODUCT_MICROTEK_336CX	0x0094		/* Phantom 336CX - C3 scanner */
-#define	USB_PRODUCT_MICROTEK_336CX2	0x00a0		/* Phantom 336CX - C3 scanner */
+#define	USB_PRODUCT_MICROTEK_X6U	0x0099		/* ScanMaker X6 - X6U */
 #define	USB_PRODUCT_MICROTEK_C6	0x009a		/* Phantom C6 scanner */
+#define	USB_PRODUCT_MICROTEK_336CX2	0x00a0		/* Phantom 336CX - C3 scanner */
 #define	USB_PRODUCT_MICROTEK_V6USL	0x00a3		/* ScanMaker V6USL */
 #define	USB_PRODUCT_MICROTEK_V6USL2	0x80a3		/* ScanMaker V6USL */
 #define	USB_PRODUCT_MICROTEK_V6UL	0x80ac		/* ScanMaker V6UL */
@@ -655,6 +667,9 @@
 /* Netgear products */
 #define	USB_PRODUCT_NETGEAR_EA101	0x1001		/* Ethernet */
 
+/* Nikon products */
+#define	USB_PRODUCT_NIKON_E990	0x0102		/* Digital Camera E990 */
+
 /* OmniVision Technologies products */
 #define	USB_PRODUCT_OMNIVISION_OV511	0x0511		/* OV511 Camera */
 #define	USB_PRODUCT_OMNIVISION_OV511PLUS	0xa511		/* OV511+ Camera */
@@ -675,6 +690,9 @@
 #define	USB_PRODUCT_PHILIPS_PCVC680K	0x0308		/* PCVC680K Vesta Pro PC Camera */
 #define	USB_PRODUCT_PHILIPS_DSS150	0x0471		/* DSS 150 Digital Speaker System */
 
+/* Philips Semiconductor products */
+#define	USB_PRODUCT_PHILIPSSEMI_HUB1122	0x1122		/* hub */
+
 /* P.I. Engineering products */
 #define	USB_PRODUCT_PIENGINEERING_PS2USB	0x020b		/* PS2 to Mac Adapter */
 
@@ -701,6 +719,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_PL2305	0x2305		/* Parallel printer adapter */
 #define	USB_PRODUCT_PROLIFIC_ATAPI4	0x2307		/* ATAPI-4 Bridge Controller */
 
 /* Qtronix products */
@@ -712,18 +732,28 @@
 /* Rainbow Technologies products */
 #define	USB_PRODUCT_RAINBOW_IKEY2000	0x1200		/* i-Key 2000 */
 
+/* Roland products */
+#define	USB_PRODUCT_ROLAND_UM1	0x0009		/* UM-1 MIDI I/F */
+
 /* Rockfire products */
 #define	USB_PRODUCT_ROCKFIRE_GAMEPAD	0x2033		/* gamepad 203USB */
 
 /* SanDisk products */
 #define	USB_PRODUCT_SANDISK_IMAGEMATE	0x0001		/* USB ImageMate */
 
+/* ScanLogic products */
+#define	USB_PRODUCT_SCANLOGIC_336CX	0x0300		/* Phantom 336CX - C3 scanner */
+
 /* Shuttle Technology products */
 #define	USB_PRODUCT_SHUTTLE_EUSB	0x0001		/* E-USB Bridge */
 
 /* SIIG products */
 #define	USB_PRODUCT_SIIG_DIGIFILMREADER	0x0004		/* DigiFilm-Combo Reader */
 
+/* Silicon Portals Inc. */
+#define	USB_PRODUCT_SILICONPORTALS_YAPPH_NF	0x0200		/* YAP Phone (no firmware) */
+#define	USB_PRODUCT_SILICONPORTALS_YAPPHONE	0x0201		/* YAP Phone */
+
 /* Sirius Technologies products */
 #define	USB_PRODUCT_SIRIUS_ROADSTER	0x0001		/* NetComm Roadster II 56 USB */
 
@@ -744,6 +774,9 @@
 /* STMicroelectronics products */
 #define	USB_PRODUCT_STMICRO_COMMUNICATOR	0x7554		/* Communicator */
 
+/* STSN products */
+#define	USB_PRODUCT_STSN_STSN0001	0x0001		/* Internet Access Device */
+
 /* Sun Microsystems products */
 #define	USB_PRODUCT_SUN_KEYBOARD	0x0005		/* Type 6 USB */
 /* XXX The above is a North American PC style keyboard possibly */
@@ -760,7 +793,8 @@
 #define	USB_PRODUCT_TELEX_MIC1	0x0001		/* Microphone */
 
 /* Texas Intel products */
-#define	USB_PRODUCT_TI_UTUSB41	0x1446		/* UT-USB41 */
+#define	USB_PRODUCT_TI_UTUSB41	0x1446		/* UT-USB41 hub */
+#define	USB_PRODUCT_TI_TUSB2046	0x2046		/* TUSB2046 hub */
 
 /* Thrustmaster products */
 #define	USB_PRODUCT_THRUST_FUSION_PAD	0xa0a3		/* Fusion Digital Gamepad */
@@ -800,6 +834,9 @@
 /* Yano products */
 #define	USB_PRODUCT_YANO_U640MO	0x0101		/* U640MO-03 */
 
+/* Yamaha products */
+#define	USB_PRODUCT_YAMAHA_UX256	0x1000		/* UX256 MIDI I/F */
+
 /* Zoom Telephonics products */
 #define	USB_PRODUCT_ZOOM_2986L	0x9700		/* 2986L */
 
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 926cc01ba19..14b8d22a815 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.29 2001/01/27 04:02:16 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.30 2001/01/28 09:35:11 aaron Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -45,7 +45,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-struct usb_known_product usb_known_products[] = {
+const struct usb_known_product usb_known_products[] = {
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_HOMECONN,
 	    "HomeConnect Camera",
@@ -195,6 +195,10 @@ struct usb_known_product usb_known_products[] = {
 	    "Serial adapter",
 	},
 	{
+	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_UHB124,
+	    "UHB124 hub",
+	},
+	{
 	    USB_VENDOR_AVISION, USB_PRODUCT_AVISION_1200U,
 	    "1200U scanner",
 	},
@@ -391,6 +395,10 @@ struct usb_known_product usb_known_products[] = {
 	    "ISD Smart Cable",
 	},
 	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER5,
+	    "USB Printer",
+	},
+	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_636,
 	    "Perfection 636U / 636Photo scanner",
 	},
@@ -404,7 +412,11 @@ struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1600,
-	    "Expression 1600",
+	    "Expression 1600 scanner",
+	},
+	{
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1640,
+	    "Expression 1640SU scanner",
 	},
 	{
 	    USB_VENDOR_ETEK, USB_PRODUCT_ETEK_1COM,
@@ -420,7 +432,7 @@ struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_GRIFFIN, USB_PRODUCT_GRIFFIN_IMATE,
-	    "iMate, ABD adapter",
+	    "iMate, ADB adapter",
 	},
 	{
 	    USB_VENDOR_FREECOM, USB_PRODUCT_FREECOM_DVD,
@@ -511,14 +523,14 @@ struct usb_known_product usb_known_products[] = {
 	    "USB cable",
 	},
 	{
-	    USB_VENDOR_INTEL, USB_PRODUCT_INTEL_TESTBOARD,
-	    "82930 test board",
-	},
-	{
 	    USB_VENDOR_INTEL, USB_PRODUCT_INTEL_EASYPC_CAMERA,
 	    "Easy PC Camera",
 	},
 	{
+	    USB_VENDOR_INTEL, USB_PRODUCT_INTEL_TESTBOARD,
+	    "82930 test board",
+	},
+	{
 	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTX,
 	    "USB ETTX",
 	},
@@ -675,6 +687,10 @@ struct usb_known_product usb_known_products[] = {
 	    "WingMan Gaming Mouse",
 	},
 	{
+	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_BD58,
+	    "BD58 mouse",
+	},
+	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_BB13,
 	    "USB-PS/2 Trackball",
 	},
@@ -707,8 +723,12 @@ struct usb_known_product usb_known_products[] = {
 	    "USB-232 Interface",
 	},
 	{
-	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX,
-	    "LU-ATX Ethernet",
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX1,
+	    "LUA-TX Ethernet",
+	},
+	{
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX5,
+	    "LUA-TX Ethernet",
 	},
 	{
 	    USB_VENDOR_METRICOM, USB_PRODUCT_METRICOM_RICOCHET_GS,
@@ -743,22 +763,22 @@ struct usb_known_product usb_known_products[] = {
 	    "Internet Pro",
 	},
 	{
-	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_X6U,
-	    "ScanMaker X6 - X6U",
-	},
-	{
 	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_336CX,
 	    "Phantom 336CX - C3 scanner",
 	},
 	{
-	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_336CX2,
-	    "Phantom 336CX - C3 scanner",
+	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_X6U,
+	    "ScanMaker X6 - X6U",
 	},
 	{
 	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_C6,
 	    "Phantom C6 scanner",
 	},
 	{
+	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_336CX2,
+	    "Phantom 336CX - C3 scanner",
+	},
+	{
 	    USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6USL,
 	    "ScanMaker V6USL",
 	},
@@ -823,6 +843,10 @@ struct usb_known_product usb_known_products[] = {
 	    "Ethernet",
 	},
 	{
+	    USB_VENDOR_NIKON, USB_PRODUCT_NIKON_E990,
+	    "Digital Camera E990",
+	},
+	{
 	    USB_VENDOR_OMNIVISION, USB_PRODUCT_OMNIVISION_OV511,
 	    "OV511 Camera",
 	},
@@ -871,6 +895,10 @@ struct usb_known_product usb_known_products[] = {
 	    "DSS 150 Digital Speaker System",
 	},
 	{
+	    USB_VENDOR_PHILIPSSEMI, USB_PRODUCT_PHILIPSSEMI_HUB1122,
+	    "hub",
+	},
+	{
 	    USB_VENDOR_PIENGINEERING, USB_PRODUCT_PIENGINEERING_PS2USB,
 	    "PS2 to Mac Adapter",
 	},
@@ -947,6 +975,14 @@ struct usb_known_product usb_known_products[] = {
 	    "PL2302 Host-Host interface",
 	},
 	{
+	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303,
+	    "PL2303 Serial adapter (IODATA USB-RSAQ2)",
+	},
+	{
+	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2305,
+	    "Parallel printer adapter",
+	},
+	{
 	    USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_ATAPI4,
 	    "ATAPI-4 Bridge Controller",
 	},
@@ -963,6 +999,10 @@ struct usb_known_product usb_known_products[] = {
 	    "i-Key 2000",
 	},
 	{
+	    USB_VENDOR_ROLAND, USB_PRODUCT_ROLAND_UM1,
+	    "UM-1 MIDI I/F",
+	},
+	{
 	    USB_VENDOR_ROCKFIRE, USB_PRODUCT_ROCKFIRE_GAMEPAD,
 	    "gamepad 203USB",
 	},
@@ -971,6 +1011,10 @@ struct usb_known_product usb_known_products[] = {
 	    "USB ImageMate",
 	},
 	{
+	    USB_VENDOR_SCANLOGIC, USB_PRODUCT_SCANLOGIC_336CX,
+	    "Phantom 336CX - C3 scanner",
+	},
+	{
 	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSB,
 	    "E-USB Bridge",
 	},
@@ -979,6 +1023,14 @@ struct usb_known_product usb_known_products[] = {
 	    "DigiFilm-Combo Reader",
 	},
 	{
+	    USB_VENDOR_SILICONPORTALS, USB_PRODUCT_SILICONPORTALS_YAPPH_NF,
+	    "YAP Phone (no firmware)",
+	},
+	{
+	    USB_VENDOR_SILICONPORTALS, USB_PRODUCT_SILICONPORTALS_YAPPHONE,
+	    "YAP Phone",
+	},
+	{
 	    USB_VENDOR_SIRIUS, USB_PRODUCT_SIRIUS_ROADSTER,
 	    "NetComm Roadster II 56 USB",
 	},
@@ -1011,6 +1063,10 @@ struct usb_known_product usb_known_products[] = {
 	    "Communicator",
 	},
 	{
+	    USB_VENDOR_STSN, USB_PRODUCT_STSN_STSN0001,
+	    "Internet Access Device",
+	},
+	{
 	    USB_VENDOR_SUN, USB_PRODUCT_SUN_KEYBOARD,
 	    "Type 6 USB",
 	},
@@ -1036,7 +1092,11 @@ struct usb_known_product usb_known_products[] = {
 	},
 	{
 	    USB_VENDOR_TI, USB_PRODUCT_TI_UTUSB41,
-	    "UT-USB41",
+	    "UT-USB41 hub",
+	},
+	{
+	    USB_VENDOR_TI, USB_PRODUCT_TI_TUSB2046,
+	    "TUSB2046 hub",
 	},
 	{
 	    USB_VENDOR_THRUST, USB_PRODUCT_THRUST_FUSION_PAD,
@@ -1119,6 +1179,10 @@ struct usb_known_product usb_known_products[] = {
 	    "U640MO-03",
 	},
 	{
+	    USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX256,
+	    "UX256 MIDI I/F",
+	},
+	{
 	    USB_VENDOR_ZOOM, USB_PRODUCT_ZOOM_2986L,
 	    "2986L",
 	},
@@ -1129,7 +1193,7 @@ struct usb_known_product usb_known_products[] = {
 	{ 0, 0, NULL }
 };
 
-struct usb_known_vendor usb_known_vendors[] = {
+const struct usb_known_vendor usb_known_vendors[] = {
 	{
 	    USB_VENDOR_AOX,
 	    "AOX",
@@ -1275,6 +1339,10 @@ struct usb_known_vendor usb_known_vendors[] = {
 	    "STMicroelectronics",
 	},
 	{
+	    USB_VENDOR_YAMAHA,
+	    "YAMAHA",
+	},
+	{
 	    USB_VENDOR_COMPAQ,
 	    "Compaq",
 	},
@@ -1291,6 +1359,10 @@ struct usb_known_vendor usb_known_vendors[] = {
 	    "Canon",
 	},
 	{
+	    USB_VENDOR_NIKON,
+	    "Nikon",
+	},
+	{
 	    USB_VENDOR_IBM,
 	    "IBM",
 	},
@@ -1515,6 +1587,10 @@ struct usb_known_vendor usb_known_vendors[] = {
 	    "Quickshot",
 	},
 	{
+	    USB_VENDOR_ROLAND,
+	    "Roland",
+	},
+	{
 	    USB_VENDOR_ROCKFIRE,
 	    "Rockfire",
 	},
@@ -1843,6 +1919,10 @@ struct usb_known_vendor usb_known_vendors[] = {
 	    "Allied Cable",
 	},
 	{
+	    USB_VENDOR_STSN,
+	    "STSN",
+	},
+	{
 	    USB_VENDOR_ZOOM,
 	    "Zoom Telephonics",
 	},
@@ -2035,6 +2115,10 @@ struct usb_known_vendor usb_known_vendors[] = {
 	    "Belkin Components",
 	},
 	{
+	    USB_VENDOR_SILICONPORTALS,
+	    "Silicon Portals",
+	},
+	{
 	    USB_VENDOR_UMAX,
 	    "UMAX Data Systems",
 	},