regen

2 files changed, 86 insertions, 4 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index ae3d8beaffa..2c5d10c299c 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.439 2009/05/11 20:40:42 damien Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.440 2009/05/15 15:40:04 damien Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.429 2009/05/11 20:39:51 damien Exp 
+ *	OpenBSD: usbdevs,v 1.430 2009/05/15 15:39:12 damien Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -428,6 +428,7 @@
 #define	USB_VENDOR_ELCON	0x0db7		/* ELCON Systemtechnik */
 #define	USB_VENDOR_SITECOMEU	0x0df6		/* Sitecom Europe */
 #define	USB_VENDOR_MOBILEACTION	0x0df7		/* Mobile Action */
+#define	USB_VENDOR_AMIGO	0x0e0b		/* Amigo Technology */
 #define	USB_VENDOR_SPEEDDRAGON	0x0e55		/* Speed Dragon Multimedia */
 #define	USB_VENDOR_CTC	0x0e5e		/* CONWISE Technology */
 #define	USB_VENDOR_HAWKING	0x0e66		/* Hawking */
@@ -766,6 +767,10 @@
 /* American Power Conversion products */
 #define	USB_PRODUCT_APC_UPSPRO500	0x0002		/* Back-UPS Pro 500 */
 
+/* Amigo Technology products */
+#define	USB_PRODUCT_AMIGO_RT2870_1	0x9031		/* RT2870 */
+#define	USB_PRODUCT_AMIGO_RT2870_2	0x9041		/* RT2870 */
+
 /* AMIT products */
 #define	USB_PRODUCT_AMIT_CGWLUSB2GO	0x0002		/* CG-WLUSB2GO */
 #define	USB_PRODUCT_AMIT_CGWLUSB2GNR	0x0008		/* CG-WLUSB2GNR */
@@ -840,6 +845,8 @@
 #define	USB_PRODUCT_ASUS_RT2870_1	0x1731		/* RT2870 */
 #define	USB_PRODUCT_ASUS_RT2870_2	0x1732		/* RT2870 */
 #define	USB_PRODUCT_ASUS_RT2870_3	0x1742		/* RT2870 */
+#define	USB_PRODUCT_ASUS_RT2870_4	0x1760		/* RT2870 */
+#define	USB_PRODUCT_ASUS_RT2870_5	0x1761		/* RT2870 */
 #define	USB_PRODUCT_ASUS_MYPAL_A730	0x4202		/* MyPal A730 */
 
 /* ASUSTeK Computer products */
@@ -905,6 +912,7 @@
 
 /* AsureWave products */
 #define	USB_PRODUCT_AZUREWAVE_RT2870_1	0x3247		/* RT2870 */
+#define	USB_PRODUCT_AZUREWAVE_RT2870_2	0x3262		/* RT2870 */
 #define	USB_PRODUCT_AZUREWAVE_RT3070	0x3273		/* RT3070 */
 
 /* B&B Electronics products */
@@ -1601,6 +1609,7 @@
 #define	USB_PRODUCT_HAWKING_RT2870_1	0x0001		/* RT2870 */
 #define	USB_PRODUCT_HAWKING_RT2870_2	0x0003		/* RT2870 */
 #define	USB_PRODUCT_HAWKING_HWUN2	0x0009		/* HWUN2 */
+#define	USB_PRODUCT_HAWKING_RT3070	0x000b		/* RT3070 */
 #define	USB_PRODUCT_HAWKING_UF100	0x400c		/* 10/100 Ethernet */
 #define	USB_PRODUCT_ABOCOM_UF200	0x420a		/* UF200 Ethernet */
 
@@ -2323,6 +2332,7 @@
 #define	USB_PRODUCT_PAPOUCH_GOLIATH_MSR	0x8005		/* GOLIATH MSR */
 
 /* Pegatron products */
+#define	USB_PRODUCT_PEGATRON_RT2870	0x0002		/* RT2870 */
 #define	USB_PRODUCT_PEGATRON_RT3070	0x000c		/* RT3070 */
 
 /* Pen Driver */
@@ -2449,6 +2459,7 @@
 #define	USB_PRODUCT_QCOM_RT2573	0x6196		/* RT2573 */
 #define	USB_PRODUCT_QCOM_RT2573_2	0x6229		/* RT2573 */
 #define	USB_PRODUCT_QCOM_RT2573_3	0x6238		/* RT2573 */
+#define	USB_PRODUCT_QCOM_RT2870	0x6259		/* RT2870 */
 
 /* Qtronix products */
 #define	USB_PRODUCT_QTRONIX_980N	0x2011		/* Scorpion-980N */
@@ -2483,6 +2494,7 @@
 
 /* Ralink Technology products */
 #define	USB_PRODUCT_RALINK_RT2570	0x1706		/* RT2570 */
+#define	USB_PRODUCT_RALINK_RT2070	0x2070		/* RT2070 */
 #define	USB_PRODUCT_RALINK_RT2570_2	0x2570		/* RT2570 */
 #define	USB_PRODUCT_RALINK_RT2573	0x2573		/* RT2573 */
 #define	USB_PRODUCT_RALINK_RT2671	0x2671		/* RT2671 */
@@ -2624,6 +2636,8 @@
 #define	USB_PRODUCT_SEALEVEL_2803_8	0X2883		/* SeaLINK+8 (2803) Port 8 */
 
 /* Senao products */
+#define	USB_PRODUCT_SENAO_RT2870_3	0x0605		/* RT2870 */
+#define	USB_PRODUCT_SENAO_RT2870_4	0x0615		/* RT2870 */
 #define	USB_PRODUCT_SENAO_NUB8301	0x2000		/* NUB-8301 */
 #define	USB_PRODUCT_SENAO_NUB862	0x6100		/* NUB-862 */
 #define	USB_PRODUCT_SENAO_RT2870_1	0x9701		/* RT2870 */
@@ -2770,6 +2784,9 @@
 #define	USB_PRODUCT_SITECOMEU_RT2870_4	0x002d		/* RT2870 */
 #define	USB_PRODUCT_SITECOMEU_WL603	0x0036		/* WL-603 */
 #define	USB_PRODUCT_SITECOMEU_RT2770	0x0039		/* RT2770 */
+#define	USB_PRODUCT_SITECOMEU_RT3070_2	0x003b		/* RT3070 */
+#define	USB_PRODUCT_SITECOMEU_RT3070_3	0x003c		/* RT3070 */
+#define	USB_PRODUCT_SITECOMEU_RT3070_4	0x003d		/* RT3070 */
 #define	USB_PRODUCT_SITECOMEU_RT3070	0x003e		/* RT3070 */
 #define	USB_PRODUCT_SITECOMEU_LN028	0x061c		/* LN-028 */
 #define	USB_PRODUCT_SITECOMEU_LN030	0x0021		/* LN-030 */
@@ -2829,6 +2846,7 @@
 /* SparkLAN products */
 #define	USB_PRODUCT_SPARKLAN_RT2573	0x0004		/* RT2573 */
 #define	USB_PRODUCT_SPARKLAN_RT2870_1	0x0006		/* RT2870 */
+#define	USB_PRODUCT_SPARKLAN_RT3070	0x0010		/* RT3070 */
 
 /* Speed Dragon Multimedia products */
 #define	USB_PRODUCT_SPEEDDRAGON_MS3303H	0x110b		/* MS3303H Serial */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 805a9533a04..97c56d3a805 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.433 2009/05/11 20:40:42 damien Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.434 2009/05/15 15:40:04 damien Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.429 2009/05/11 20:39:51 damien Exp 
+ *	OpenBSD: usbdevs,v 1.430 2009/05/15 15:39:12 damien Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -526,6 +526,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "Back-UPS Pro 500",
 	},
 	{
+	    USB_VENDOR_AMIGO, USB_PRODUCT_AMIGO_RT2870_1,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_AMIGO, USB_PRODUCT_AMIGO_RT2870_2,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_AMIT, USB_PRODUCT_AMIT_CGWLUSB2GO,
 	    "CG-WLUSB2GO",
 	},
@@ -714,6 +722,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT2870",
 	},
 	{
+	    USB_VENDOR_ASUS, USB_PRODUCT_ASUS_RT2870_4,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_ASUS, USB_PRODUCT_ASUS_RT2870_5,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_ASUS, USB_PRODUCT_ASUS_MYPAL_A730,
 	    "MyPal A730",
 	},
@@ -862,6 +878,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT2870",
 	},
 	{
+	    USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_RT2870_2,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_RT3070,
 	    "RT3070",
 	},
@@ -2878,6 +2898,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "HWUN2",
 	},
 	{
+	    USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_RT3070,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_UF100,
 	    "10/100 Ethernet",
 	},
@@ -4938,6 +4962,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "GOLIATH MSR",
 	},
 	{
+	    USB_VENDOR_PEGATRON, USB_PRODUCT_PEGATRON_RT2870,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_PEGATRON, USB_PRODUCT_PEGATRON_RT3070,
 	    "RT3070",
 	},
@@ -5290,6 +5318,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT2573",
 	},
 	{
+	    USB_VENDOR_QCOM, USB_PRODUCT_QCOM_RT2870,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_QTRONIX, USB_PRODUCT_QTRONIX_980N,
 	    "Scorpion-980N",
 	},
@@ -5346,6 +5378,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT2570",
 	},
 	{
+	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2070,
+	    "RT2070",
+	},
+	{
 	    USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570_2,
 	    "RT2570",
 	},
@@ -5790,6 +5826,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "SeaLINK+8 (2803) Port 8",
 	},
 	{
+	    USB_VENDOR_SENAO, USB_PRODUCT_SENAO_RT2870_3,
+	    "RT2870",
+	},
+	{
+	    USB_VENDOR_SENAO, USB_PRODUCT_SENAO_RT2870_4,
+	    "RT2870",
+	},
+	{
 	    USB_VENDOR_SENAO, USB_PRODUCT_SENAO_NUB8301,
 	    "NUB-8301",
 	},
@@ -6230,6 +6274,18 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT2770",
 	},
 	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3070_2,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3070_3,
+	    "RT3070",
+	},
+	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3070_4,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3070,
 	    "RT3070",
 	},
@@ -6402,6 +6458,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT2870",
 	},
 	{
+	    USB_VENDOR_SPARKLAN, USB_PRODUCT_SPARKLAN_RT3070,
+	    "RT3070",
+	},
+	{
 	    USB_VENDOR_SPEEDDRAGON, USB_PRODUCT_SPEEDDRAGON_MS3303H,
 	    "MS3303H Serial",
 	},
@@ -8678,6 +8738,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Mobile Action",
 	},
 	{
+	    USB_VENDOR_AMIGO,
+	    "Amigo Technology",
+	},
+	{
 	    USB_VENDOR_SPEEDDRAGON,
 	    "Speed Dragon Multimedia",
 	},