regen

2 files changed, 95 insertions, 8 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 92f639856c6..789e4613328 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.218 2006/08/14 09:33:02 jsg Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.219 2006/08/14 12:55:40 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.213 2006/08/14 09:32:23 jsg Exp 
+ *	OpenBSD: usbdevs,v 1.214 2006/08/14 12:54:53 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -447,6 +447,7 @@
 #define	USB_VENDOR_NOVATEL	0x1410		/* Novatel Wireless */
 #define	USB_VENDOR_WISTRONNEWEB	0x1435		/* Wistron NeWeb */
 #define	USB_VENDOR_RADIOSHACK	0x1453		/* Radio Shack */
+#define	USB_VENDOR_HUAWEI3COM	0x1472		/* Huawei 3Com */
 #define	USB_VENDOR_SILICOM	0x1485		/* Silicom */
 #define	USB_VENDOR_RALINK	0x148f		/* Ralink Technology */
 #define	USB_VENDOR_CONCEPTRONIC2	0x14b2		/* Conceptronic */
@@ -464,6 +465,7 @@
 #define	USB_VENDOR_JABLOTRON	0x16d6		/* Jablotron */
 #define	USB_VENDOR_CMOTECH	0x16d8		/* CMOTECH CDMA Technologies */
 #define	USB_VENDOR_METAGEEK	0x1781		/* MetaGeek */
+#define	USB_VENDOR_QCOM	0x18e8		/* Qcom */
 #define	USB_VENDOR_LINKSYS3	0x1915		/* Linksys */
 #define	USB_VENDOR_DLINK	0x2001		/* D-Link */
 #define	USB_VENDOR_PLANEX2	0x2019		/* Planex Communications */
@@ -526,6 +528,7 @@
 #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 */
 
 /* Accton products */
 #define	USB_PRODUCT_ACCTON_USB320_EC	0x1046		/* USB320-EC Ethernet */
@@ -895,11 +898,12 @@
 /* Diamond products */
 #define	USB_PRODUCT_DIAMOND_RIO500USB	0x0001		/* Rio 500 */
 
-/* Dick Smith Electronics products */
+/* Dick Smith Electronics (really C-Net) products */
 #define	USB_PRODUCT_DICKSMITH_WL200U	0x0002		/* WL-200U */
 #define	USB_PRODUCT_DICKSMITH_CHUSB611G	0x0013		/* CHUSB 611G */
 #define	USB_PRODUCT_DICKSMITH_WL240U	0x0014		/* WL-240U */
 #define	USB_PRODUCT_DICKSMITH_XH1153	0x5743		/* XH1153 802.11b */
+#define	USB_PRODUCT_DICKSMITH_RT2573	0x9022		/* RT2573 */
 #define	USB_PRODUCT_DICKSMITH_CWD854F	0x9032		/* C-Net CWD-854 rev F */
 
 /* Digi International products */
@@ -1064,12 +1068,14 @@
 
 /* Gigaset products */
 #define	USB_PRODUCT_GIGASET_WLAN	0x0701		/* WLAN */
+#define	USB_PRODUCT_GIGASET_RT2573	0x0722		/* RT2573 */
 
 /* GoHubs products */
 #define	USB_PRODUCT_GOHUBS_GOCOM232	0x1001		/* GoCOM232 Serial converter */
 
 /* Good Way Technology products */
 #define	USB_PRODUCT_GOODWAY_GWUSB2E	0x6200		/* GWUSB2E */
+#define	USB_PRODUCT_GOODWAY_RT2573	0xc019		/* RT2573 */
 
 /* Gravis products */
 #define	USB_PRODUCT_GRAVIS_GAMEPADPRO	0x4001		/* GamePad Pro */
@@ -1154,6 +1160,7 @@
 #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 */
@@ -1431,6 +1438,9 @@
 #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 */
 
 /* Micronet Communications products */
 #define	USB_PRODUCT_MICRONET_SP128AR	0x0003		/* SP128AR EtherFast */
@@ -1659,6 +1669,7 @@
 #define	USB_PRODUCT_PLANEX2_GW_US11S	0x3220		/* GW-US11S WLAN */
 #define	USB_PRODUCT_PLANEX3_GWUS54MINI	0xab13		/* GW-US54Mini */
 #define	USB_PRODUCT_PLANEX2_GWUS54GZL	0xc007		/* GW-US54GZL */
+#define	USB_PRODUCT_PLANEX2_GWUSMM	0xed02		/* GW-USMM */
 
 /* Plantronics products */
 #define	USB_PRODUCT_PLANTRONICS_HEADSET	0x0ca1		/* Platronics DSP-400 Headset */
@@ -1709,6 +1720,10 @@
 /* Putercom products */
 #define	USB_PRODUCT_PUTERCOM_UPA100	0x047e		/* USB-1284 BRIDGE */
 
+/* Qcom products */
+#define	USB_PRODUCT_QCOM_RT2573	0x6196		/* RT2573 */
+#define	USB_PRODUCT_QCOM_RT2573_2	0x6229		/* RT2573 */
+
 /* Qtronix products */
 #define	USB_PRODUCT_QTRONIX_980N	0x2011		/* Scorpion-980N */
 
@@ -1730,6 +1745,7 @@
 #define	USB_PRODUCT_RALINK_RT2570_2	0x2570		/* RT2570 */
 #define	USB_PRODUCT_RALINK_RT2570_3	0x9020		/* RT2570 */
 #define	USB_PRODUCT_RALINK_RT2573	0x2573		/* RT2573 */
+#define	USB_PRODUCT_RALINK_RT2671	0x2671		/* RT2671 */
 
 /* RATOC Systems products */
 #define	USB_PRODUCT_RATOC_REXUSB60	0xb000		/* USB serial REX-USB60 */
@@ -1871,6 +1887,8 @@
 
 /* Sitecom Europe products */
 #define	USB_PRODUCT_SITECOMEU_WL113	0x9071		/* WL-113 */
+#define	USB_PRODUCT_SITECOMEU_WL172	0x90ac		/* WL-172 */
+#define	USB_PRODUCT_SITECOMEU_WL113R2	0x9712		/* WL-113 rev 2 */
 
 /* SmartBridges products */
 #define	USB_PRODUCT_SMARTBRIDGES_SMARTLINK	0x0001		/* SmartLink Ethernet */
@@ -1954,8 +1972,9 @@
 #define	USB_PRODUCT_DIAMOND2_PSAPLAY120	0x5003		/* Nike psa[play 120 */
 
 /* Surecom Technology products */
-#define	USB_PRODUCT_SURECOM_RT2570	0x11f3		/* RT2570 */
 #define	USB_PRODUCT_ACERCM_EP1427X2	0x0893		/* EP-1427X-2 Ethernet */
+#define	USB_PRODUCT_SURECOM_RT2570	0x11f3		/* RT2570 */
+#define	USB_PRODUCT_SURECOM_RT2573	0x31f3		/* RT2573 */
 
 /* Susteen, Inc. products */
 #define	USB_PRODUCT_SUSTEEN_DCU11	0x0528		/* Ericsson DCU-10/11 */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 62da996d48f..5f859b8f48f 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.216 2006/08/14 09:33:02 jsg Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.217 2006/08/14 12:55:40 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.213 2006/08/14 09:32:23 jsg Exp 
+ *	OpenBSD: usbdevs,v 1.214 2006/08/14 12:54:53 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -155,6 +155,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "BWU613",
 	},
 	{
+	    USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT2573,
+	    "RT2573",
+	},
+	{
 	    USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_USB320_EC,
 	    "USB320-EC Ethernet",
 	},
@@ -1011,6 +1015,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "XH1153 802.11b",
 	},
 	{
+	    USB_VENDOR_DICKSMITH, USB_PRODUCT_DICKSMITH_RT2573,
+	    "RT2573",
+	},
+	{
 	    USB_VENDOR_DICKSMITH, USB_PRODUCT_DICKSMITH_CWD854F,
 	    "C-Net CWD-854 rev F",
 	},
@@ -1439,6 +1447,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "WLAN",
 	},
 	{
+	    USB_VENDOR_GIGASET, USB_PRODUCT_GIGASET_RT2573,
+	    "RT2573",
+	},
+	{
 	    USB_VENDOR_GOHUBS, USB_PRODUCT_GOHUBS_GOCOM232,
 	    "GoCOM232 Serial converter",
 	},
@@ -1447,6 +1459,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "GWUSB2E",
 	},
 	{
+	    USB_VENDOR_GOODWAY, USB_PRODUCT_GOODWAY_RT2573,
+	    "RT2573",
+	},
+	{
 	    USB_VENDOR_GRAVIS, USB_PRODUCT_GRAVIS_GAMEPADPRO,
 	    "GamePad Pro",
 	},
@@ -1671,6 +1687,10 @@ 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",
 	},
@@ -2451,6 +2471,18 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT2570",
 	},
 	{
+	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2573,
+	    "RT2573",
+	},
+	{
+	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2573_2,
+	    "RT2573",
+	},
+	{
+	    USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2573_3,
+	    "RT2573",
+	},
+	{
 	    USB_VENDOR_MICRONET, USB_PRODUCT_MICRONET_SP128AR,
 	    "SP128AR EtherFast",
 	},
@@ -3031,6 +3063,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "GW-US54GZL",
 	},
 	{
+	    USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUSMM,
+	    "GW-USMM",
+	},
+	{
 	    USB_VENDOR_PLANTRONICS, USB_PRODUCT_PLANTRONICS_HEADSET,
 	    "Platronics DSP-400 Headset",
 	},
@@ -3163,6 +3199,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "USB-1284 BRIDGE",
 	},
 	{
+	    USB_VENDOR_QCOM, USB_PRODUCT_QCOM_RT2573,
+	    "RT2573",
+	},
+	{
+	    USB_VENDOR_QCOM, USB_PRODUCT_QCOM_RT2573_2,
+	    "RT2573",
+	},
+	{
 	    USB_VENDOR_QTRONIX, USB_PRODUCT_QTRONIX_980N,
 	    "Scorpion-980N",
 	},
@@ -3203,6 +3247,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT2573",
 	},
 	{
+	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2671,
+	    "RT2671",
+	},
+	{
 	    USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60,
 	    "USB serial REX-USB60",
 	},
@@ -3551,6 +3599,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "WL-113",
 	},
 	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL172,
+	    "WL-172",
+	},
+	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL113R2,
+	    "WL-113 rev 2",
+	},
+	{
 	    USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTLINK,
 	    "SmartLink Ethernet",
 	},
@@ -3751,12 +3807,16 @@ const struct usb_known_product usb_known_products[] = {
 	    "Nike psa[play 120",
 	},
 	{
+	    USB_VENDOR_ACERCM, USB_PRODUCT_ACERCM_EP1427X2,
+	    "EP-1427X-2 Ethernet",
+	},
+	{
 	    USB_VENDOR_SURECOM, USB_PRODUCT_SURECOM_RT2570,
 	    "RT2570",
 	},
 	{
-	    USB_VENDOR_ACERCM, USB_PRODUCT_ACERCM_EP1427X2,
-	    "EP-1427X-2 Ethernet",
+	    USB_VENDOR_SURECOM, USB_PRODUCT_SURECOM_RT2573,
+	    "RT2573",
 	},
 	{
 	    USB_VENDOR_SUSTEEN, USB_PRODUCT_SUSTEEN_DCU11,
@@ -5671,6 +5731,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Radio Shack",
 	},
 	{
+	    USB_VENDOR_HUAWEI3COM,
+	    "Huawei 3Com",
+	},
+	{
 	    USB_VENDOR_SILICOM,
 	    "Silicom",
 	},
@@ -5739,6 +5803,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "MetaGeek",
 	},
 	{
+	    USB_VENDOR_QCOM,
+	    "Qcom",
+	},
+	{
 	    USB_VENDOR_LINKSYS3,
 	    "Linksys",
 	},