2 files changed, 55 insertions, 2 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 7fde34e16a55..c99140b20b07 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.5 2000/05/07 19:54:11 n_hibma Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.11.2.6 2000/06/13 07:58:19 n_hibma Exp 
  */
 
 /*
@@ -70,6 +70,7 @@
 #define	USB_VENDOR_ANALOGDEVICES	0x0456		/* Analog Devices, Inc. */
 #define	USB_VENDOR_KYE	0x0458		/* KYE Systems Corp. */
 #define	USB_VENDOR_MICROSOFT	0x045e		/* Microsoft */
+#define	USB_VENDOR_SUPRA	0x045a		/* Supra */
 #define	USB_VENDOR_PRIMAX	0x0461		/* Primax Electronics */
 #define	USB_VENDOR_AMP	0x0464		/* AMP, Inc. */
 #define	USB_VENDOR_CHERRY	0x046a		/* Cherry Mikroschalter GmbH */
@@ -230,6 +231,7 @@
 #define	USB_VENDOR_BROADCOM	0x0a5c		/* Broadcom Corp. */
 #define	USB_VENDOR_MOTOROLA	0x1063		/* Motorola */
 #define	USB_VENDOR_PLX	0x10b5		/* PLX */
+#define	USB_VENDOR_BELKIN2	0x1293		/* Belkin Components (second entry) */
 #define	USB_VENDOR_INSIDEOUT	0x1608		/* Inside Out Networks */
 #define	USB_VENDOR_ENTREGA	0x1645		/* Entrega */
 #define	USB_VENDOR_ACTIONTEC	0x1668		/* Actiontec Electronics, Inc. */
@@ -272,6 +274,10 @@
 /* AKS products */
 #define	USB_PRODUCT_AKS_USBHASP	0x0001		/* USB-HASP 0.06 */
 
+/* ALCOR products */
+#define	USB_PRODUCT_ALCOR_STRONGMAN	0x9213		/* Strong Man Keyboard hub */
+#define	USB_PRODUCT_ALCOR_STRONGMAN_KBD	0x9410		/* Strong Man Keyboard */
+
 /* Altec Lansing products */
 #define	USB_PRODUCT_ALTEC_ADA70	0x0070		/* ADA70 Speakers */
 #define	USB_PRODUCT_ALTEC_ASC495	0xff05		/* ASC495 Speakers */
@@ -292,6 +298,7 @@
 
 /* Belkin products */
 /*product BELKIN F5U111		0x????	F5U111 Ethernet adapter*/
+#define	USB_PRODUCT_BELKIN2_F5U002	0x0002		/* F5U002 Parallel printer adapter */
 
 /* Billionton products */
 #define	USB_PRODUCT_BILLIONTON_USB100	0x0986		/* USB100N 10/100 FastEthernet Adapter */
@@ -408,6 +415,7 @@
 #define	USB_PRODUCT_INSYSTEM_F5U002	0x0002		/* Parallel printer 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 */
 
 /* Intel products */
 #define	USB_PRODUCT_INTEL_TESTBOARD	0x9890		/* 82930 test board */
@@ -588,6 +596,9 @@
 #define	USB_PRODUCT_SUN_KEYBOARD	0x0005		/* Type 6 USB */
 /* XXX The above is a North American PC style keyboard possibly */
 
+/* Supra products */
+#define	USB_PRODUCT_SUPRA_SUPRAEXPRESS56K	0x07da		/* Supra Express 56K modem */
+
 /* Telex Communications products */
 #define	USB_PRODUCT_TELEX_MIC1	0x0001		/* Enhanced USB Microphone */
 
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index ff5e9b157ab0..d2b85a9b9806 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.11.2.5 2000/05/07 19:54:11 n_hibma Exp 
+ *	FreeBSD: src/sys/dev/usb/usbdevs,v 1.11.2.6 2000/06/13 07:58:19 n_hibma Exp 
  */
 
 /*
@@ -136,6 +136,18 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "USB-HASP 0.06",
 	},
 	{
+	    USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_STRONGMAN,
+	    0,
+	    "Alcor Micro, Inc.",
+	    "Strong Man Keyboard hub",
+	},
+	{
+	    USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_STRONGMAN_KBD,
+	    0,
+	    "Alcor Micro, Inc.",
+	    "Strong Man Keyboard",
+	},
+	{
 	    USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ADA70,
 	    0,
 	    "Altec Lansing Technologies, Inc.",
@@ -184,6 +196,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "10Mbps ethernet adapter",
 	},
 	{
+	    USB_VENDOR_BELKIN2, USB_PRODUCT_BELKIN2_F5U002,
+	    0,
+	    "Belkin Components (second entry)",
+	    "F5U002 Parallel printer adapter",
+	},
+	{
 	    USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100,
 	    0,
 	    "Billionton Systems, Inc.",
@@ -538,6 +556,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "IDE adapter ISD105",
 	},
 	{
+	    USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_USBCABLE,
+	    0,
+	    "In-System Design",
+	    "USB cable",
+	},
+	{
 	    USB_VENDOR_INTEL, USB_PRODUCT_INTEL_TESTBOARD,
 	    0,
 	    "Intel",
@@ -1054,6 +1078,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Type 6 USB",
 	},
 	{
+	    USB_VENDOR_SUPRA, USB_PRODUCT_SUPRA_SUPRAEXPRESS56K,
+	    0,
+	    "Supra",
+	    "Supra Express 56K modem",
+	},
+	{
 	    USB_VENDOR_TELEX, USB_PRODUCT_TELEX_MIC1,
 	    0,
 	    "Telex Communications, Inc.",
@@ -1246,6 +1276,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_SUPRA, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Supra",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_PRIMAX, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Primax Electronics",
@@ -2206,6 +2242,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_BELKIN2, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Belkin Components (second entry)",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_INSIDEOUT, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Inside Out Networks",