regen

2 files changed, 105 insertions, 17 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index a258136ce87..e42127094be 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.263 2007/02/07 23:49:28 jsg Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.264 2007/02/08 05:24:11 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.257 2007/02/07 23:48:45 jsg Exp 
+ *	OpenBSD: usbdevs,v 1.258 2007/02/08 05:23:08 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -482,6 +482,7 @@
 #define	USB_VENDOR_LINKSYS4	0x1737		/* Linksys */
 #define	USB_VENDOR_SENAO	0x1740		/* Senao */
 #define	USB_VENDOR_METAGEEK	0x1781		/* MetaGeek */
+#define	USB_VENDOR_AMIT	0x18c5		/* AMIT */
 #define	USB_VENDOR_QCOM	0x18e8		/* Qcom */
 #define	USB_VENDOR_LINKSYS3	0x1915		/* Linksys */
 #define	USB_VENDOR_DLINK	0x2001		/* D-Link */
@@ -534,6 +535,8 @@
 #define	USB_PRODUCT_3COMUSR_HOMECONN	0x009d		/* 3Com HomeConnect */
 #define	USB_PRODUCT_3COMUSR_USR56K	0x3021		/* U.S.Robotics 56000 */
 
+#define	USB_PRODUCT_HUAWEI3COM_WUB320G	0x0009		/* Aolynk WUB320g */
+
 /* AboCom products */
 #define	USB_PRODUCT_ABOCOM_XX1	0x110c		/* XX1 */
 #define	USB_PRODUCT_ABOCOM_XX2	0x200c		/* XX2 */
@@ -550,7 +553,11 @@
 #define	USB_PRODUCT_ABOCOM_WL54	0x6001		/* WL54 */
 #define	USB_PRODUCT_ABOCOM_XX10	0xabc1		/* XX10 */
 #define	USB_PRODUCT_ABOCOM_BWU613	0xb000		/* BWU613 */
-#define	USB_PRODUCT_ABOCOM_RT2573	0xb21d		/* RT2573 */
+#define	USB_PRODUCT_ABOCOM_HWU54DM	0xb21b		/* HWU54DM */
+#define	USB_PRODUCT_ABOCOM_RT2573_2	0xb21c		/* RT2573 */
+#define	USB_PRODUCT_ABOCOM_RT2573_3	0xb21d		/* RT2573 */
+#define	USB_PRODUCT_ABOCOM_RT2573_4	0xb21e		/* RT2573 */
+#define	USB_PRODUCT_ABOCOM_WUG2700	0xb21f		/* WUG2700 */
 
 /* Accton products */
 #define	USB_PRODUCT_ACCTON_USB320_EC	0x1046		/* USB320-EC Ethernet */
@@ -670,6 +677,9 @@
 /* American Power Conversion products */
 #define	USB_PRODUCT_APC_UPSPRO500	0x0002		/* Back-UPS Pro 500 */
 
+/* AMIT products */
+#define	USB_PRODUCT_AMIT_CGWLUSB2GO	0x0002		/* CG-WLUSB2GO */
+
 /* Analog Devices, Inc. products */
 #define	USB_PRODUCT_ANALOG_EAGLEI	0x900f		/* Eagle I */
 #define	USB_PRODUCT_ANALOG_EAGLEI_NF	0x9010		/* Eagle I */
@@ -718,7 +728,8 @@
 /* ASUS products */
 #define	USB_PRODUCT_ASUS_RT2570	0x1706		/* RT2570 */
 #define	USB_PRODUCT_ASUS_RT2570_2	0x1707		/* RT2570 */
-#define	USB_PRODUCT_ASUS_RT2573	0x1723		/* RT2573 */
+#define	USB_PRODUCT_ASUS_RT2573_1	0x1723		/* RT2573 */
+#define	USB_PRODUCT_ASUS_RT2573_2	0x1724		/* RT2573 */
 #define	USB_PRODUCT_ASUS_WL159G	0x170c		/* WL-159g */
 #define	USB_PRODUCT_ASUS_MYPAL_A730	0x4202		/* MyPal A730 */
 #define	USB_PRODUCT_ASUS_A9T_WIFI	0x171b		/* A9T wireless */
@@ -868,6 +879,7 @@
 #define	USB_PRODUCT_CISCOLINKSYS_WUSB54GP	0x0011		/* RT2570 */
 #define	USB_PRODUCT_CISCOLINKSYS_USB200MV2	0x0018		/* USB200M v2 */
 #define	USB_PRODUCT_CISCOLINKSYS_WUSB54GC	0x0020		/* WUSB54GC */
+#define	USB_PRODUCT_CISCOLINKSYS_WUSB54GR	0x0023		/* WUSB54GR */
 #define	USB_PRODUCT_CISCOLINKSYS_WUSBF54G	0x0024		/* WUSBF54G */
 #define	USB_PRODUCT_CISCOLINKSYS_HU200TS	0x001a		/* HU200-TS */
 
@@ -1180,6 +1192,8 @@
 /* Guillemot Corporation */
 #define	USB_PRODUCT_GUILLEMOT_DALEADER	0xa300		/* DA Leader */
 #define	USB_PRODUCT_GUILLEMOT_HWGUSB254	0xe000		/* HWGUSB2-54 WLAN */
+#define	USB_PRODUCT_GUILLEMOT_HWGUSB254LB	0xe010		/* HWGUSB2-54-LB */
+#define	USB_PRODUCT_GUILLEMOT_HWGUSB254V2AP	0xe020		/* HWGUSB2-54V2-AP */
 
 /* Hagiwara products */
 #define	USB_PRODUCT_HAGIWARA_FGSM	0x0002		/* FlashGate SmartMedia */
@@ -1248,7 +1262,6 @@
 #define	USB_PRODUCT_HP2_C500	0x6002		/* PhotoSmart C500 */
 
 /* HUAWEI products */
-#define	USB_PRODUCT_HUAWEI3COM_RT2573	0x0009		/* RT2573 */
 #define	USB_PRODUCT_HUAWEI_E618	0x1001		/* HUAWEI Mobile E618 */
 
 /* IBM Corporation */
@@ -1516,6 +1529,8 @@
 #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 */
+#define	USB_PRODUCT_MELCO_SG54HP	0x00d8		/* WLI-U2-SG54HP */
+#define	USB_PRODUCT_MELCO_G54HP	0x00d9		/* WLI-U2-G54HP */
 
 /* MetaGeek products */
 #define	USB_PRODUCT_METAGEEK_WISPY	0x083e		/* Wi-Spy */
@@ -1533,9 +1548,10 @@
 #define	USB_PRODUCT_MSI_RT2570	0x6861		/* RT2570 */
 #define	USB_PRODUCT_MSI_RT2570_2	0x6865		/* RT2570 */
 #define	USB_PRODUCT_MSI_RT2570_3	0x6869		/* RT2570 */
-#define	USB_PRODUCT_MSI_RT2573	0x6877		/* RT2573 */
-#define	USB_PRODUCT_MSI_RT2573_2	0xa861		/* RT2573 */
-#define	USB_PRODUCT_MSI_RT2573_3	0xa874		/* RT2573 */
+#define	USB_PRODUCT_MSI_RT2573_1	0x6874		/* RT2573 */
+#define	USB_PRODUCT_MSI_RT2573_2	0x6877		/* RT2573 */
+#define	USB_PRODUCT_MSI_RT2573_3	0xa861		/* RT2573 */
+#define	USB_PRODUCT_MSI_RT2573_4	0xa874		/* RT2573 */
 
 /* Micronet Communications products */
 #define	USB_PRODUCT_MICRONET_SP128AR	0x0003		/* SP128AR EtherFast */
@@ -1681,6 +1697,7 @@
 
 /* Nova Tech products */
 #define	USB_PRODUCT_NOVATECH_NV902W	0x9020		/* NV-902W */
+#define	USB_PRODUCT_NOVATECH_RT2573	0x9021		/* RT2573 */
 
 /* Novatel Wireless products */
 #define	USB_PRODUCT_NOVATEL_EXPRESSCARD	0x1100		/* ExpressCard 3G */
@@ -1785,8 +1802,10 @@
 /* Planex Communications products */
 #define	USB_PRODUCT_PLANEX_GW_US11H	0x14ea		/* GW-US11H WLAN */
 #define	USB_PRODUCT_PLANEX2_GW_US11S	0x3220		/* GW-US11S WLAN */
+#define	USB_PRODUCT_PLANEX2_GWUS54HP	0xab01		/* GW-US54HP */
 #define	USB_PRODUCT_PLANEX3_GU1000T	0xab11		/* GU-1000T */
 #define	USB_PRODUCT_PLANEX3_GWUS54MINI	0xab13		/* GW-US54Mini */
+#define	USB_PRODUCT_PLANEX2_GWUS54MINI2	0xab50		/* GW-US54Mini2 */
 #define	USB_PRODUCT_PLANEX2_GWUS54SG	0xc002		/* GW-US54SG */
 #define	USB_PRODUCT_PLANEX2_GWUS54GZL	0xc007		/* GW-US54GZL */
 #define	USB_PRODUCT_PLANEX2_GWUSMM	0xed02		/* GW-USMM */
@@ -1866,6 +1885,7 @@
 #define	USB_PRODUCT_RALINK_RT2570_3	0x9020		/* RT2570 */
 #define	USB_PRODUCT_RALINK_RT2573	0x2573		/* RT2573 */
 #define	USB_PRODUCT_RALINK_RT2671	0x2671		/* RT2671 */
+#define	USB_PRODUCT_RALINK_RT2573_2	0x9021		/* RT2573 */
 
 /* RATOC Systems products */
 #define	USB_PRODUCT_RATOC_REXUSB60	0xb000		/* USB serial REX-USB60 */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 7f3efd1dcbd..757536b63a3 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.260 2007/02/07 23:49:28 jsg Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.261 2007/02/08 05:24:11 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.257 2007/02/07 23:48:45 jsg Exp 
+ *	OpenBSD: usbdevs,v 1.258 2007/02/08 05:23:08 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -107,6 +107,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "U.S.Robotics 56000",
 	},
 	{
+	    USB_VENDOR_HUAWEI3COM, USB_PRODUCT_HUAWEI3COM_WUB320G,
+	    "Aolynk WUB320g",
+	},
+	{
 	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX1,
 	    "XX1",
 	},
@@ -167,10 +171,26 @@ const struct usb_known_product usb_known_products[] = {
 	    "BWU613",
 	},
 	{
-	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT2573,
+	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_HWU54DM,
+	    "HWU54DM",
+	},
+	{
+	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT2573_2,
+	    "RT2573",
+	},
+	{
+	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT2573_3,
+	    "RT2573",
+	},
+	{
+	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT2573_4,
 	    "RT2573",
 	},
 	{
+	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_WUG2700,
+	    "WUG2700",
+	},
+	{
 	    USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_USB320_EC,
 	    "USB320-EC Ethernet",
 	},
@@ -415,6 +435,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "Back-UPS Pro 500",
 	},
 	{
+	    USB_VENDOR_AMIT, USB_PRODUCT_AMIT_CGWLUSB2GO,
+	    "CG-WLUSB2GO",
+	},
+	{
 	    USB_VENDOR_ANALOG, USB_PRODUCT_ANALOG_EAGLEI,
 	    "Eagle I",
 	},
@@ -523,7 +547,11 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT2570",
 	},
 	{
-	    USB_VENDOR_ASUS, USB_PRODUCT_ASUS_RT2573,
+	    USB_VENDOR_ASUS, USB_PRODUCT_ASUS_RT2573_1,
+	    "RT2573",
+	},
+	{
+	    USB_VENDOR_ASUS, USB_PRODUCT_ASUS_RT2573_2,
 	    "RT2573",
 	},
 	{
@@ -911,6 +939,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "WUSB54GC",
 	},
 	{
+	    USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54GR,
+	    "WUSB54GR",
+	},
+	{
 	    USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSBF54G,
 	    "WUSBF54G",
 	},
@@ -1707,6 +1739,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "HWGUSB2-54 WLAN",
 	},
 	{
+	    USB_VENDOR_GUILLEMOT, USB_PRODUCT_GUILLEMOT_HWGUSB254LB,
+	    "HWGUSB2-54-LB",
+	},
+	{
+	    USB_VENDOR_GUILLEMOT, USB_PRODUCT_GUILLEMOT_HWGUSB254V2AP,
+	    "HWGUSB2-54V2-AP",
+	},
+	{
 	    USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FGSM,
 	    "FlashGate SmartMedia",
 	},
@@ -1907,10 +1947,6 @@ const struct usb_known_product usb_known_products[] = {
 	    "PhotoSmart C500",
 	},
 	{
-	    USB_VENDOR_HUAWEI3COM, USB_PRODUCT_HUAWEI3COM_RT2573,
-	    "RT2573",
-	},
-	{
 	    USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E618,
 	    "HUAWEI Mobile E618",
 	},
@@ -2675,6 +2711,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "WLI-U2-KG54-AI WLAN",
 	},
 	{
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_SG54HP,
+	    "WLI-U2-SG54HP",
+	},
+	{
+	    USB_VENDOR_MELCO, USB_PRODUCT_MELCO_G54HP,
+	    "WLI-U2-G54HP",
+	},
+	{
 	    USB_VENDOR_METAGEEK, USB_PRODUCT_METAGEEK_WISPY,
 	    "Wi-Spy",
 	},
@@ -2711,7 +2755,7 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT2570",
 	},
 	{
-	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2573,
+	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2573_1,
 	    "RT2573",
 	},
 	{
@@ -2723,6 +2767,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT2573",
 	},
 	{
+	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2573_4,
+	    "RT2573",
+	},
+	{
 	    USB_VENDOR_MICRONET, USB_PRODUCT_MICRONET_SP128AR,
 	    "SP128AR EtherFast",
 	},
@@ -3095,6 +3143,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "NV-902W",
 	},
 	{
+	    USB_VENDOR_NOVATECH, USB_PRODUCT_NOVATECH_RT2573,
+	    "RT2573",
+	},
+	{
 	    USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_EXPRESSCARD,
 	    "ExpressCard 3G",
 	},
@@ -3371,6 +3423,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "GW-US11S WLAN",
 	},
 	{
+	    USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS54HP,
+	    "GW-US54HP",
+	},
+	{
 	    USB_VENDOR_PLANEX3, USB_PRODUCT_PLANEX3_GU1000T,
 	    "GU-1000T",
 	},
@@ -3379,6 +3435,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "GW-US54Mini",
 	},
 	{
+	    USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS54MINI2,
+	    "GW-US54Mini2",
+	},
+	{
 	    USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS54SG,
 	    "GW-US54SG",
 	},
@@ -3575,6 +3635,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT2671",
 	},
 	{
+	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2573_2,
+	    "RT2573",
+	},
+	{
 	    USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60,
 	    "USB serial REX-USB60",
 	},
@@ -6359,6 +6423,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "MetaGeek",
 	},
 	{
+	    USB_VENDOR_AMIT,
+	    "AMIT",
+	},
+	{
 	    USB_VENDOR_QCOM,
 	    "Qcom",
 	},