regen

2 files changed, 137 insertions, 4 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index ecba58f9ee8..6efc2f4a839 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.117 2004/10/18 12:55:10 dlg Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.118 2004/10/20 12:57:35 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.113 2004/10/18 12:52:13 dlg Exp 
+ *	OpenBSD: usbdevs,v 1.114 2004/10/20 12:56:39 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -351,16 +351,19 @@
 #define	USB_VENDOR_NEODIO	0x0aec		/* Neodio */
 #define	USB_VENDOR_TODOS	0x0b0c		/* Todos Data System */
 #define	USB_VENDOR_SIIG2	0x0b39		/* SIIG */
+#define	USB_VENDOR_TEKRAM	0x0b3b		/* Tekram Technology */
 #define	USB_VENDOR_HAL	0x0b41		/* HAL Corporation */
 #define	USB_VENDOR_NEC2	0x0b62		/* NEC */
 #define	USB_VENDOR_ATI2	0x0b6f		/* ATI */
 #define	USB_VENDOR_KURUSUGAWA	0x0b7e		/* Kurusugawa Electronics, Inc. */
 #define	USB_VENDOR_ASIX	0x0b95		/* ASIX Electronics */
+#define	USB_VENDOR_USR	0x0baf		/* U.S. Robotics */
 #define	USB_VENDOR_GREENHOUSE2	0x0bda		/* GREENHOUSE */
 #define	USB_VENDOR_ADDONICS2	0x0bf6		/* Addonics Technology */
 #define	USB_VENDOR_AGATE	0x0c08		/* Agate Technologies */
 #define	USB_VENDOR_DMI	0x0c0b		/* DMI */
 #define	USB_VENDOR_EASYDISK	0x0c76		/* EasyDisk */
+#define	USB_VENDOR_ZCOM	0x0cde		/* Z-Com */
 #define	USB_VENDOR_TANGTOP	0x0d3d		/* Tangtop */
 #define	USB_VENDOR_PEN	0x0d7d		/* Pen Drive */
 #define	USB_VENDOR_ABC	0x0d8c		/* ABC */
@@ -389,12 +392,15 @@
 #define	USB_VENDOR_DLINK	0x2001		/* D-Link */
 #define	USB_VENDOR_TRIPPLITE	0x2478		/* Tripp-Lite */
 #define	USB_VENDOR_NHJ	0x2770		/* NHJ */
+#define	USB_VENDOR_PLANEX	0x2c02		/* Planex Communications */
 #define	USB_VENDOR_PQI	0x3538		/* PQI */
 #define	USB_VENDOR_DAISY	0x3579		/* Daisy Technology */
 #define	USB_VENDOR_NI	0x3923		/* National Instruments */
 #define	USB_VENDOR_MICRONET	0x3980		/* Micronet Communications */
 #define	USB_VENDOR_IODATA2	0x40bb		/* I-O Data */
 #define	USB_VENDOR_IRIVER	0x4102		/* iRiver */
+#define	USB_VENDOR_DELL	0x413c		/* Dell */
+#define	USB_VENDOR_AVERATEC	0x50c2		/* Averatec */
 #define	USB_VENDOR_ONSPEC2	0x55aa		/* OnSpec */
 #define	USB_VENDOR_SITECOM	0x6189		/* Sitecom */
 #define	USB_VENDOR_INTEL	0x8086		/* Intel */
@@ -433,6 +439,7 @@
 
 /* Accton products */
 #define	USB_PRODUCT_ACCTON_USB320_EC	0x1046		/* USB320-EC Ethernet */
+#define	USB_PRODUCT_ACCTON_111	0x3503		/* T-Sinus 111 WLAN */
 #define	USB_PRODUCT_ACCTON_SS1001	0x5046		/* SpeedStream Ethernet */
 
 /* Acer Products */
@@ -448,6 +455,7 @@
 /* Actiontec products */
 #define	USB_PRODUCT_ACTIONTEC_PRISM_25	0x0408		/* Prism2.5 WLAN */
 #define	USB_PRODUCT_ACTIONTEC_PRISM_25A	0x0421		/* Prism2.5 WLAN A */
+#define	USB_PRODUCT_ACTIONTEC_FREELAN	0x6106		/* ROPEX FreeLan 802.11b */
 
 /* ACTiSYS products */
 #define	USB_PRODUCT_ACTISYS_IR2000U	0x0011		/* ACT-IR2000U FIR */
@@ -456,6 +464,9 @@
 #define	USB_PRODUCT_ACTIVEWIRE_IOBOARD	0x0100		/* I/O Board */
 #define	USB_PRODUCT_ACTIVEWIRE_IOBOARD_FW1	0x0101		/* I/O Board, rev. 1 */
 
+/* Adaptec products */
+#define	USB_PRODUCT_ADAPTEC_AWN8020	0x0020		/* AWN-8020 WLAN */
+
 /* Addonics products */
 #define	USB_PRODUCT_ADDONICS2_205	0xa001		/* Cable 205 */
 
@@ -541,6 +552,9 @@
 /* Avance Logic products */
 #define	USB_PRODUCT_AVANCELOGIC_USBAUDIO	0x0100		/* USB Audio Speaker */
 
+/* Averatec products */
+#define	USB_PRODUCT_AVERATEC_USBWLAN	0x4013		/* WLAN */
+
 /* Avision products */
 #define	USB_PRODUCT_AVISION_1200U	0x0268		/* 1200U */
 
@@ -660,6 +674,9 @@
 #define	USB_PRODUCT_DALLAS_J6502	0x4201		/* J-6502 speakers */
 #define	USB_PRODUCT_DALLAS_USB_FOB_IBUTTON	0x2490		/* USB-FOB/iBUTTON */
 
+/* Dell products */
+#define	USB_PRODUCT_DELL_TM1180	0x8100		/* TrueMobile 1180 WLAN */
+
 /* Diamond products */
 #define	USB_PRODUCT_DIAMOND_RIO500USB	0x0001		/* Rio 500 */
 
@@ -1085,6 +1102,7 @@
 #define	USB_PRODUCT_MELCO_DUBPXXG	0x001c		/* USB-IDE Bridge: DUB-PxxG */
 #define	USB_PRODUCT_MELCO_KS11G	0x0027		/* WLI-USB-KS11G wlan */
 #define	USB_PRODUCT_MELCO_LUAU2KTX	0x003d		/* LUA-U2-KTX Ethernet */
+#define	USB_PRODUCT_MELCO_KB11	0x0044		/* WLI-USB-KB11 WLAN */
 
 /* Metricom products */
 #define	USB_PRODUCT_METRICOM_RICOCHET_GS	0x0001		/* Ricochet GS */
@@ -1278,6 +1296,9 @@
 /* Pilotech Systems Co., Ltd products */
 #define	USB_PRODUCT_PILOTECH_CRW600	0x0001		/* CRW-600 6-in-1 */
 
+/* Planex Communications products */
+#define	USB_PRODUCT_PLANEX_GW_US11H	0x14ea		/* GW-US11H WLAN */
+
 /* Plantronics products */
 #define	USB_PRODUCT_PLANTRONICS_HEADSET	0x0ca1		/* Platronics DSP-400 Headset */
 
@@ -1524,6 +1545,10 @@
 /* TEAC products */
 #define	USB_PRODUCT_TEAC_FD05PUB	0x0000		/* FD-05PUB */
 
+/* Tekram Technology products */
+#define	USB_PRODUCT_TEKRAM_0193	0x1601		/* ALLNET 0193 WLAN */
+#define	USB_PRODUCT_TEKRAM_ZYAIR_B200	0x1602		/* ZyXEL ZyAIR B200 WLAN */
+
 /* Telex Communications products */
 #define	USB_PRODUCT_TELEX_MIC1	0x0001		/* Microphone */
 
@@ -1566,6 +1591,9 @@
 /* Universal Access products */
 #define	USB_PRODUCT_UNIACCESS_PANACHE	0x0101		/* Panache Surf ISDN */
 
+/* U.S. Robotics products */
+#define	USB_PRODUCT_USR_USR1120	0x00eb		/* USR1120 WLAN */
+
 /* ViewSonic products */
 #define	USB_PRODUCT_VIEWSONIC_G773HUB	0x00fe		/* G773 Monitor Hub */
 #define	USB_PRODUCT_VIEWSONIC_P815HUB	0x00ff		/* P815 Monitor Hub */
@@ -1606,6 +1634,9 @@
 /* Yano products */
 #define	USB_PRODUCT_YANO_U640MO	0x0101		/* U640MO-03 */
 
+/* Z-Com products */
+#define	USB_PRODUCT_ZCOM_725	0x0002		/* 725/726 Prism2.5 WLAN */
+
 /* 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 3bd047ff477..8f2bb6dc4d3 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.117 2004/10/18 12:55:10 dlg Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.118 2004/10/20 12:57:35 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.113 2004/10/18 12:52:13 dlg Exp 
+ *	OpenBSD: usbdevs,v 1.114 2004/10/20 12:56:39 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -185,6 +185,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USB320-EC Ethernet",
 	},
 	{
+	    USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_111,
+	    0,
+	    "Accton Technology",
+	    "T-Sinus 111 WLAN",
+	},
+	{
 	    USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_SS1001,
 	    0,
 	    "Accton Technology",
@@ -239,6 +245,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Prism2.5 WLAN A",
 	},
 	{
+	    USB_VENDOR_ACTIONTEC, USB_PRODUCT_ACTIONTEC_FREELAN,
+	    0,
+	    "Actiontec Electronics",
+	    "ROPEX FreeLan 802.11b",
+	},
+	{
 	    USB_VENDOR_ACTISYS, USB_PRODUCT_ACTISYS_IR2000U,
 	    0,
 	    "ACTiSYS",
@@ -257,6 +269,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "I/O Board, rev. 1",
 	},
 	{
+	    USB_VENDOR_ADAPTEC, USB_PRODUCT_ADAPTEC_AWN8020,
+	    0,
+	    "Adaptec",
+	    "AWN-8020 WLAN",
+	},
+	{
 	    USB_VENDOR_ADDONICS2, USB_PRODUCT_ADDONICS2_205,
 	    0,
 	    "Addonics Technology",
@@ -521,6 +539,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USB Audio Speaker",
 	},
 	{
+	    USB_VENDOR_AVERATEC, USB_PRODUCT_AVERATEC_USBWLAN,
+	    0,
+	    "Averatec",
+	    "WLAN",
+	},
+	{
 	    USB_VENDOR_AVISION, USB_PRODUCT_AVISION_1200U,
 	    0,
 	    "Avision",
@@ -947,6 +971,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USB-FOB/iBUTTON",
 	},
 	{
+	    USB_VENDOR_DELL, USB_PRODUCT_DELL_TM1180,
+	    0,
+	    "Dell",
+	    "TrueMobile 1180 WLAN",
+	},
+	{
 	    USB_VENDOR_DIAMOND, USB_PRODUCT_DIAMOND_RIO500USB,
 	    0,
 	    "Diamond",
@@ -2693,6 +2723,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "LUA-U2-KTX Ethernet",
 	},
 	{
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KB11,
+	    0,
+	    "Melco",
+	    "WLI-USB-KB11 WLAN",
+	},
+	{
 	    USB_VENDOR_METRICOM, USB_PRODUCT_METRICOM_RICOCHET_GS,
 	    0,
 	    "Metricom",
@@ -3407,6 +3443,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "CRW-600 6-in-1",
 	},
 	{
+	    USB_VENDOR_PLANEX, USB_PRODUCT_PLANEX_GW_US11H,
+	    0,
+	    "Planex Communications",
+	    "GW-US11H WLAN",
+	},
+	{
 	    USB_VENDOR_PLANTRONICS, USB_PRODUCT_PLANTRONICS_HEADSET,
 	    0,
 	    "Plantronics",
@@ -4289,6 +4331,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "FD-05PUB",
 	},
 	{
+	    USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_0193,
+	    0,
+	    "Tekram Technology",
+	    "ALLNET 0193 WLAN",
+	},
+	{
+	    USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_ZYAIR_B200,
+	    0,
+	    "Tekram Technology",
+	    "ZyXEL ZyAIR B200 WLAN",
+	},
+	{
 	    USB_VENDOR_TELEX, USB_PRODUCT_TELEX_MIC1,
 	    0,
 	    "Telex Communications",
@@ -4409,6 +4463,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Panache Surf ISDN",
 	},
 	{
+	    USB_VENDOR_USR, USB_PRODUCT_USR_USR1120,
+	    0,
+	    "U.S. Robotics",
+	    "USR1120 WLAN",
+	},
+	{
 	    USB_VENDOR_VIEWSONIC, USB_PRODUCT_VIEWSONIC_G773HUB,
 	    0,
 	    "ViewSonic",
@@ -4541,6 +4601,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "U640MO-03",
 	},
 	{
+	    USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_725,
+	    0,
+	    "Z-Com",
+	    "725/726 Prism2.5 WLAN",
+	},
+	{
 	    USB_VENDOR_ZOOM, USB_PRODUCT_ZOOM_2986L,
 	    0,
 	    "Zoom Telephonics",
@@ -6281,6 +6347,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_TEKRAM, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Tekram Technology",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_HAL, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "HAL Corporation",
@@ -6311,6 +6383,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_USR, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "U.S. Robotics",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_GREENHOUSE2, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "GREENHOUSE",
@@ -6341,6 +6419,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ZCOM, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Z-Com",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_TANGTOP, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Tangtop",
@@ -6509,6 +6593,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_PLANEX, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Planex Communications",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_PQI, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "PQI",
@@ -6545,6 +6635,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_DELL, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Dell",
+	    NULL,
+	},
+	{
+	    USB_VENDOR_AVERATEC, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Averatec",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ONSPEC2, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "OnSpec",