regen

2 files changed, 107 insertions, 6 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 3ab2aacd537..1c8718bcc63 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.122 2004/10/30 14:36:42 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.123 2004/10/31 00:18:44 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.118 2004/10/30 14:36:28 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.119 2004/10/31 00:17:13 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -366,6 +366,7 @@
 #define	USB_VENDOR_DMI	0x0c0b		/* DMI */
 #define	USB_VENDOR_EASYDISK	0x0c76		/* EasyDisk */
 #define	USB_VENDOR_ZCOM	0x0cde		/* Z-Com */
+#define	USB_VENDOR_ELCON	0x0db7		/* ELCON Systemtechnik */
 #define	USB_VENDOR_TANGTOP	0x0d3d		/* Tangtop */
 #define	USB_VENDOR_PEN	0x0d7d		/* Pen Drive */
 #define	USB_VENDOR_ABC	0x0d8c		/* ABC */
@@ -373,6 +374,7 @@
 #define	USB_VENDOR_HAWKING	0x0e66		/* Hawking */
 #define	USB_VENDOR_OTI	0x0ea0		/* Ours Technology Inc. */
 #define	USB_VENDOR_PILOTECH	0x0eaf		/* Pilotech */
+#define	USB_VENDOR_GIGABYTE	0x1044		/* GIGABYTE */
 #define	USB_VENDOR_MOTOROLA	0x1063		/* Motorola */
 #define	USB_VENDOR_CCYU	0x1065		/* CCYU Technology */
 #define	USB_VENDOR_PLX	0x10b5		/* PLX */
@@ -397,6 +399,7 @@
 #define	USB_VENDOR_TRIPPLITE	0x2478		/* Tripp-Lite */
 #define	USB_VENDOR_NHJ	0x2770		/* NHJ */
 #define	USB_VENDOR_PLANEX	0x2c02		/* Planex Communications */
+#define	USB_VENDOR_AEI	0x3334		/* AEI */
 #define	USB_VENDOR_PQI	0x3538		/* PQI */
 #define	USB_VENDOR_DAISY	0x3579		/* Daisy Technology */
 #define	USB_VENDOR_NI	0x3923		/* National Instruments */
@@ -477,14 +480,19 @@
 #define	USB_PRODUCT_ADDONICS2_205	0xa001		/* Cable 205 */
 
 /* ADMtek products */
+#define	USB_PRODUCT_ADMTEK_PEGASUSII_4	0x07c2		/* AN986A Ethernet */
 #define	USB_PRODUCT_ADMTEK_PEGASUS	0x0986		/* AN986 Ethernet */
 #define	USB_PRODUCT_ADMTEK_PEGASUSII	0x8511		/* AN8511 Ethernet */
 #define	USB_PRODUCT_ADMTEK_PEGASUSII_2	0x8513		/* AN8513 Ethernet */
+#define	USB_PRODUCT_ADMTEK_PEGASUSII_3	0x8515		/* AN8515 Ethernet */
 
 /* ADS products */
 #define	USB_PRODUCT_ADS_UBS10BT	0x0008		/* UBS-10BT Ethernet */
 #define	USB_PRODUCT_ADS_UBS10BTX	0x0009		/* UBS-10BT Ethernet */
 
+/* AEI products */
+#define	USB_PRODUCT_AEI_FASTETHERNET	0x1701		/* Fast Ethernet */
+
 /* Agate Technologies products */
 #define	USB_PRODUCT_AGATE_QDRIVE	0x0378		/* Q-Drive */
 
@@ -514,6 +522,9 @@
 #define	USB_PRODUCT_ALCOR_SM_KBD	0x9410		/* MicroConnectors/StrongMan */
 #define	USB_PRODUCT_ALCOR_NEC_KBD_HUB	0x9472		/* NEC Kbd Hub */
 
+/* Allied Telesyn International products */
+#define	USB_PRODUCT_ALLIEDTELESYN_ATUSB100	0xb100		/* AT-USB100 */
+
 /* Altec Lansing products */
 #define	USB_PRODUCT_ALTEC_ADA70	0x0070		/* ADA70 Speakers */
 #define	USB_PRODUCT_ALTEC_ASC495	0xff05		/* ASC495 Speakers */
@@ -544,6 +555,7 @@
 /* ATen products */
 #define	USB_PRODUCT_ATEN_UC1284	0x2001		/* Parallel */
 #define	USB_PRODUCT_ATEN_UC10T	0x2002		/* 10Mbps Ethernet */
+#define	USB_PRODUCT_ATEN_UC110T	0x2007		/* UC-110T Ethernet */
 #define	USB_PRODUCT_ATEN_UC232A	0x2008		/* Serial */
 #define	USB_PRODUCT_ATEN_DSB650C	0x4000		/* DSB-650C */
 
@@ -727,6 +739,9 @@
 #define	USB_PRODUCT_EIZO_HUB	0x0000		/* hub */
 #define	USB_PRODUCT_EIZO_MONITOR	0x0001		/* monitor */
 
+/* ELCON Systemtechnik products */
+#define	USB_PRODUCT_ELCON_PLAN	0x0002		/* Goldpfeil P-LAN */
+
 /* Elecom products */
 #define	USB_PRODUCT_ELECOM_MOUSE29UO	0x0002		/* 29UO */
 #define	USB_PRODUCT_ELECOM_LDUSBTX0	0x200c		/* LD-USB/TX */
@@ -807,6 +822,9 @@
 #define	USB_PRODUCT_GENESYS_GL650	0x0604		/* GL650 Hub */
 #define	USB_PRODUCT_GENESYS_GL641USB	0x0700		/* GL641USB CompactFlash */
 
+/* GIGABYTE products */
+#define	USB_PRODUCT_GIGABYTE_GNBR402W	0x8002		/* GN-BR402W */
+
 /* GoHubs products */
 #define	USB_PRODUCT_GOHUBS_GOCOM232	0x1001		/* GoCOM232 Serial converter */
 
@@ -1178,6 +1196,7 @@
 
 /* Mobility products */
 #define	USB_PRODUCT_MOBILITY_EA	0x0204		/* Ethernet */
+#define	USB_PRODUCT_MOBILITY_EASIDOCK	0x0304		/* EasiDock Ethernet */
 
 /* Motorola products */
 #define	USB_PRODUCT_MOTOROLA_MC141555	0x1555		/* MC141555 hub controller */
@@ -1245,6 +1264,9 @@
 #define	USB_PRODUCT_OLYMPUS_C1	0x0102		/* C-1 */
 #define	USB_PRODUCT_OLYMPUS_C700	0x0105		/* C-700 Ultra Zoom */
 
+/* Omnidirectional Control Technology products */
+#define	USB_PRODUCT_SIIG2_USBTOETHER	0x0109		/* USB TO Ethernet */
+
 /* OmniVision Technologies, Inc. products */
 #define	USB_PRODUCT_OMNIVISION_OV511	0x0511		/* OV511 */
 #define	USB_PRODUCT_OMNIVISION_OV511PLUS	0xa511		/* OV511+ */
@@ -1489,7 +1511,8 @@
 #define	USB_PRODUCT_SMC2_2020HUB	0x2020		/* Hub */
 
 /* SOHOware products */
-#define	USB_PRODUCT_SOHOWARE_NUB100	0x9100		/* 10/100 Ethernet */
+#define	USB_PRODUCT_SOHOWARE_NUB100	0x9100		/* NUB100 Ethernet */
+#define	USB_PRODUCT_SOHOWARE_NUB110	0x9110		/* NUB110 Ethernet */
 
 /* SOLID YEAR products */
 #define	USB_PRODUCT_SOLIDYEAR_KEYBOARD	0x2101		/* Keyboard */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 2e63a03361b..e0d63da3f7e 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.122 2004/10/30 14:36:42 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.123 2004/10/31 00:18:44 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.118 2004/10/30 14:36:28 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.119 2004/10/31 00:17:13 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -293,6 +293,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Cable 205",
 	},
 	{
+	    USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_4,
+	    0,
+	    "ADMtek",
+	    "AN986A Ethernet",
+	},
+	{
 	    USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS,
 	    0,
 	    "ADMtek",
@@ -311,6 +317,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "AN8513 Ethernet",
 	},
 	{
+	    USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_3,
+	    0,
+	    "ADMtek",
+	    "AN8515 Ethernet",
+	},
+	{
 	    USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BT,
 	    0,
 	    "ADS Technologies",
@@ -323,6 +335,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "UBS-10BT Ethernet",
 	},
 	{
+	    USB_VENDOR_AEI, USB_PRODUCT_AEI_FASTETHERNET,
+	    0,
+	    "AEI",
+	    "Fast Ethernet",
+	},
+	{
 	    USB_VENDOR_AGATE, USB_PRODUCT_AGATE_QDRIVE,
 	    0,
 	    "Agate Technologies",
@@ -431,6 +449,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "NEC Kbd Hub",
 	},
 	{
+	    USB_VENDOR_ALLIEDTELESYN, USB_PRODUCT_ALLIEDTELESYN_ATUSB100,
+	    0,
+	    "Allied Telesyn International",
+	    "AT-USB100",
+	},
+	{
 	    USB_VENDOR_ALTEC, USB_PRODUCT_ALTEC_ADA70,
 	    0,
 	    "Altec Lansing",
@@ -509,6 +533,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "10Mbps Ethernet",
 	},
 	{
+	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC110T,
+	    0,
+	    "ATEN International",
+	    "UC-110T Ethernet",
+	},
+	{
 	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC232A,
 	    0,
 	    "ATEN International",
@@ -1139,6 +1169,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "monitor",
 	},
 	{
+	    USB_VENDOR_ELCON, USB_PRODUCT_ELCON_PLAN,
+	    0,
+	    "ELCON Systemtechnik",
+	    "Goldpfeil P-LAN",
+	},
+	{
 	    USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_MOUSE29UO,
 	    0,
 	    "Elecom",
@@ -1475,6 +1511,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "GL641USB CompactFlash",
 	},
 	{
+	    USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNBR402W,
+	    0,
+	    "GIGABYTE",
+	    "GN-BR402W",
+	},
+	{
 	    USB_VENDOR_GOHUBS, USB_PRODUCT_GOHUBS_GOCOM232,
 	    0,
 	    "GoHubs",
@@ -2999,6 +3041,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Ethernet",
 	},
 	{
+	    USB_VENDOR_MOBILITY, USB_PRODUCT_MOBILITY_EASIDOCK,
+	    0,
+	    "Mobility",
+	    "EasiDock Ethernet",
+	},
+	{
 	    USB_VENDOR_MOTOROLA, USB_PRODUCT_MOTOROLA_MC141555,
 	    0,
 	    "Motorola",
@@ -3227,6 +3275,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "C-700 Ultra Zoom",
 	},
 	{
+	    USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_USBTOETHER,
+	    0,
+	    "SIIG",
+	    "USB TO Ethernet",
+	},
+	{
 	    USB_VENDOR_OMNIVISION, USB_PRODUCT_OMNIVISION_OV511,
 	    0,
 	    "OmniVision",
@@ -4142,7 +4196,13 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB100,
 	    0,
 	    "SOHOware",
-	    "10/100 Ethernet",
+	    "NUB100 Ethernet",
+	},
+	{
+	    USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB110,
+	    0,
+	    "SOHOware",
+	    "NUB110 Ethernet",
 	},
 	{
 	    USB_VENDOR_SOLIDYEAR, USB_PRODUCT_SOLIDYEAR_KEYBOARD,
@@ -6521,6 +6581,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ELCON, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "ELCON Systemtechnik",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_TANGTOP, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Tangtop",
@@ -6563,6 +6629,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_GIGABYTE, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "GIGABYTE",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_MOTOROLA, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Motorola",
@@ -6707,6 +6779,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_AEI, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "AEI",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_PQI, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "PQI",