regen

2 files changed, 108 insertions, 6 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 0c20386dbbc..6f68d5e1374 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.163 2005/07/07 06:35:17 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.164 2005/07/07 08:28:23 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.159 2005/07/07 06:35:13 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.160 2005/07/07 08:25:05 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -262,6 +262,7 @@
 #define	USB_VENDOR_DIGITALSTREAM	0x074e		/* Digital Stream */
 #define	USB_VENDOR_AUREAL	0x0755		/* Aureal Semiconductor */
 #define	USB_VENDOR_MIDIMAN	0x0763		/* Midiman */
+#define	USB_VENDOR_SURECOM	0x0769		/* Surecom Technology */
 #define	USB_VENDOR_LINKSYS2	0x077b		/* Linksys */
 #define	USB_VENDOR_GRIFFIN	0x077d		/* Griffin Technology */
 #define	USB_VENDOR_SANDISK	0x0781		/* SanDisk */
@@ -388,6 +389,7 @@
 #define	USB_VENDOR_OTI	0x0ea0		/* Ours Technology */
 #define	USB_VENDOR_PILOTECH	0x0eaf		/* Pilotech */
 #define	USB_VENDOR_AIRPRIME	0x0f3d		/* Airprime */
+#define	USB_VENDOR_VTECH	0x0f88		/* VTech */
 #define	USB_VENDOR_FALCOM	0x0f94		/* Falcom Wireless Communications GmbH */
 #define	USB_VENDOR_QUALCOMM2	0x1004		/* Qualcomm */
 #define	USB_VENDOR_GIGABYTE	0x1044		/* GIGABYTE */
@@ -437,6 +439,7 @@
 #define	USB_VENDOR_DELL	0x413c		/* Dell */
 #define	USB_VENDOR_AVERATEC	0x50c2		/* Averatec */
 #define	USB_VENDOR_ONSPEC2	0x55aa		/* OnSpec */
+#define	USB_VENDOR_ZINWELL	0x5a57		/* Zinwell */
 #define	USB_VENDOR_SITECOM	0x6189		/* Sitecom */
 #define	USB_VENDOR_INTEL	0x8086		/* Intel */
 #define	USB_VENDOR_SITECOM2	0x9016		/* Sitecom */
@@ -617,7 +620,8 @@
 #define	USB_PRODUCT_ASIX_AX88172	0x1720		/* USB 2.0 10/100 ethernet controller */
 
 /* ASUS products */
-#define	USB_PRODUCT_ASUS_RT2570	0x1707		/* RT2570 */
+#define	USB_PRODUCT_ASUS_RT2570	0x1706		/* RT2570 */
+#define	USB_PRODUCT_ASUS_RT2570_2	0x1707		/* RT2570 */
 
 /* ASUSTeK Computer products */
 #define	USB_PRODUCT_ASUSTEK_WL140	0x3300		/* WL-140 */
@@ -963,6 +967,7 @@
 
 /* Guillemot Corporation */
 #define	USB_PRODUCT_GUILLEMOT_DALEADER	0xa300		/* DA Leader */
+#define	USB_PRODUCT_GUILLEMOT_HWGUSB254	0xe000		/* HWGUSB2-54 WLAN */
 
 /* Hagiwara products */
 #define	USB_PRODUCT_HAGIWARA_FGSM	0x0002		/* FlashGate SmartMedia */
@@ -1277,7 +1282,9 @@
 #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 */
+#define	USB_PRODUCT_MELCO_KG54YB	0x005e		/* WLI-U2-KG54-YB WLAN */
 #define	USB_PRODUCT_MELCO_KG54	0x0066		/* WLI-U2-KG54 WLAN */
+#define	USB_PRODUCT_MELCO_KG54AI	0x0067		/* WLI-U2-KG54-AI WLAN */
 
 /* Metricom products */
 #define	USB_PRODUCT_METRICOM_RICOCHET_GS	0x0001		/* Ricochet GS */
@@ -1285,6 +1292,9 @@
 /* Micro Star International products */
 #define	USB_PRODUCT_MSI_WLAN	0x1020		/* WLAN */
 #define	USB_PRODUCT_MSI_BLUETOOTH	0x1967		/* Bluetooth */
+#define	USB_PRODUCT_MSI_RT2570	0x6861		/* RT2570 */
+#define	USB_PRODUCT_MSI_RT2570_2	0x6865		/* RT2570 */
+#define	USB_PRODUCT_MSI_RT2570_3	0x6869		/* RT2570 */
 
 /* Micronet Communications products */
 #define	USB_PRODUCT_MICRONET_SP128AR	0x0003		/* SP128AR EtherFast */
@@ -1562,6 +1572,7 @@
 /* Ralink Technology products */
 #define	USB_PRODUCT_RALINK_RT2570	0x1706		/* RT2570 */
 #define	USB_PRODUCT_RALINK_RT2570_2	0x2570		/* RT2570 */
+#define	USB_PRODUCT_RALINK_RT2570_3	0x9020		/* RT2570 */
 
 /* RATOC Systems products */
 #define	USB_PRODUCT_RATOC_REXUSB60	0xb000		/* USB serial REX-USB60 */
@@ -1749,7 +1760,8 @@
 #define	USB_PRODUCT_DIAMOND2_RIO800USB	0x5002		/* Rio 800 */
 #define	USB_PRODUCT_DIAMOND2_PSAPLAY120	0x5003		/* Nike psa[play 120 */
 
-/* Surecom products */
+/* Surecom Technology products */
+#define	USB_PRODUCT_SURECOM_RT2570	0x11f3		/* RT2570 */
 #define	USB_PRODUCT_ACERCM_EP1427X2	0x0893		/* EP-1427X-2 Ethernet */
 
 /* Susteen, Inc. products */
@@ -1848,6 +1860,9 @@
 /* Vivitar products */
 #define	USB_PRODUCT_VIVITAR_DSC350	0x0003		/* DSC350 */
 
+/* VTech products */
+#define	USB_PRODUCT_VTECH_RT2570	0x3012		/* RT2570 */
+
 /* Option products */
 #define	USB_PRODUCT_OPTION_VODAFONEMC3G	0x5000		/* Vodafone Mobile Connect 3G */
 #define	USB_PRODUCT_OPTION_GT3GFUSION	0x6000		/* GlobeTrotter 3G FUSION */
@@ -1882,6 +1897,9 @@
 #define	USB_PRODUCT_ZCOM_XI725	0x0002		/* XI-725/726 */
 #define	USB_PRODUCT_ZCOM_XI735	0x0005		/* XI-735 */
 
+/* Zinwell products */
+#define	USB_PRODUCT_ZINWELL_RT2570	0x0260		/* RT2570 */
+
 /* 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 f0717a329da..75e133be04a 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.162 2005/07/07 06:35:17 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.163 2005/07/07 08:28:24 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.159 2005/07/07 06:35:13 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.160 2005/07/07 08:25:05 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -653,6 +653,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "RT2570",
 	},
 	{
+	    USB_VENDOR_ASUS, USB_PRODUCT_ASUS_RT2570_2,
+	    0,
+	    "ASUS",
+	    "RT2570",
+	},
+	{
 	    USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_WL140,
 	    0,
 	    "ASUSTeK Computer",
@@ -1895,6 +1901,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "DA Leader",
 	},
 	{
+	    USB_VENDOR_GUILLEMOT, USB_PRODUCT_GUILLEMOT_HWGUSB254,
+	    0,
+	    "Guillemot",
+	    "HWGUSB2-54 WLAN",
+	},
+	{
 	    USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FGSM,
 	    0,
 	    "Hagiwara Sys-Com",
@@ -3263,12 +3275,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "WLI-USB-KB11 WLAN",
 	},
 	{
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54YB,
+	    0,
+	    "Melco",
+	    "WLI-U2-KG54-YB WLAN",
+	},
+	{
 	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54,
 	    0,
 	    "Melco",
 	    "WLI-U2-KG54 WLAN",
 	},
 	{
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54AI,
+	    0,
+	    "Melco",
+	    "WLI-U2-KG54-AI WLAN",
+	},
+	{
 	    USB_VENDOR_METRICOM, USB_PRODUCT_METRICOM_RICOCHET_GS,
 	    0,
 	    "Metricom",
@@ -3287,6 +3311,24 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Bluetooth",
 	},
 	{
+	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2570,
+	    0,
+	    "Micro Star International",
+	    "RT2570",
+	},
+	{
+	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2570_2,
+	    0,
+	    "Micro Star International",
+	    "RT2570",
+	},
+	{
+	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2570_3,
+	    0,
+	    "Micro Star International",
+	    "RT2570",
+	},
+	{
 	    USB_VENDOR_MICRONET, USB_PRODUCT_MICRONET_SP128AR,
 	    0,
 	    "Micronet Communications",
@@ -4331,6 +4373,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "RT2570",
 	},
 	{
+	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570_3,
+	    0,
+	    "Ralink Technology",
+	    "RT2570",
+	},
+	{
 	    USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60,
 	    0,
 	    "RATOC Systems",
@@ -5021,6 +5069,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Nike psa[play 120",
 	},
 	{
+	    USB_VENDOR_SURECOM, USB_PRODUCT_SURECOM_RT2570,
+	    0,
+	    "Surecom Technology",
+	    "RT2570",
+	},
+	{
 	    USB_VENDOR_ACERCM, USB_PRODUCT_ACERCM_EP1427X2,
 	    0,
 	    "Acer Communications & Multimedia",
@@ -5339,6 +5393,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "DSC350",
 	},
 	{
+	    USB_VENDOR_VTECH, USB_PRODUCT_VTECH_RT2570,
+	    0,
+	    "VTech",
+	    "RT2570",
+	},
+	{
 	    USB_VENDOR_OPTION, USB_PRODUCT_OPTION_VODAFONEMC3G,
 	    0,
 	    "Option",
@@ -5459,6 +5519,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "XI-735",
 	},
 	{
+	    USB_VENDOR_ZINWELL, USB_PRODUCT_ZINWELL_RT2570,
+	    0,
+	    "Zinwell",
+	    "RT2570",
+	},
+	{
 	    USB_VENDOR_ZOOM, USB_PRODUCT_ZOOM_2986L,
 	    0,
 	    "Zoom Telephonics",
@@ -6665,6 +6731,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_SURECOM, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Surecom Technology",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_LINKSYS2, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Linksys",
@@ -7421,6 +7493,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_VTECH, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "VTech",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_FALCOM, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Falcom Wireless Communications GmbH",
@@ -7715,6 +7793,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_ZINWELL, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Zinwell",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_SITECOM, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Sitecom",