regen

2 files changed, 116 insertions, 4 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index de774dd0e08..6c24ffe4e92 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.588 2012/04/08 03:09:59 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.589 2012/04/08 12:15:59 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.578 2012/04/08 03:09:19 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.579 2012/04/08 12:15:21 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -621,6 +621,7 @@
 #define	USB_VENDOR_ALLWIN	0x8516		/* ALLWIN Tech */
 #define	USB_VENDOR_SITECOM2	0x9016		/* Sitecom */
 #define	USB_VENDOR_MOSCHIP	0x9710		/* MosChip */
+#define	USB_VENDOR_NETGEAR4	0x9846		/* Netgear */
 #define	USB_VENDOR_MARVELL	0x9e88		/* Marvell */
 #define	USB_VENDOR_3COM3	0xa727		/* 3Com */
 #define	USB_VENDOR_CACE	0xcace		/* CACE Technologies */
@@ -956,6 +957,7 @@
 #define	USB_PRODUCT_ASUS_USBN10	0x1786		/* USB-N10 */
 #define	USB_PRODUCT_ASUS_RT3070_1	0x1790		/* RT3070 */
 #define	USB_PRODUCT_ASUS_RTL8192SU_1	0x1791		/* RTL8192SU */
+#define	USB_PRODUCT_ASUS_RTL8192CU	0x17ab		/* RTL8192CU */
 #define	USB_PRODUCT_ASUS_MYPAL_A730	0x4202		/* MyPal A730 */
 
 /* ASUSTeK Computer products */
@@ -1049,6 +1051,7 @@
 #define	USB_PRODUCT_AZUREWAVE_AR9271_4	0x3348		/* AR9271 */
 #define	USB_PRODUCT_AZUREWAVE_AR9271_5	0x3349		/* AR9271 */
 #define	USB_PRODUCT_AZUREWAVE_AR9271_6	0x3350		/* AR9271 */
+#define	USB_PRODUCT_AZUREWAVE_RTL8188CU	0x3357		/* RTL8188CU */
 #define	USB_PRODUCT_AZUREWAVE_RTL8188CE_1	0x3358		/* RTL8188CE */
 #define	USB_PRODUCT_AZUREWAVE_RTL8188CE_2	0x3359		/* RTL8188CE */
 
@@ -1102,6 +1105,7 @@
 #define	USB_PRODUCT_BELKIN_F6C1100	0x1100		/* F6C1100/1200 UPS */
 #define	USB_PRODUCT_BELKIN_RTL8188CU	0x1102		/* RTL8188CU */
 #define	USB_PRODUCT_BELKIN_F5U120	0x1203		/* F5U120-PC Hub */
+#define	USB_PRODUCT_BELKIN_RTL8192CU	0x2102		/* RTL8192CU */
 #define	USB_PRODUCT_BELKIN_F7D2102	0x2103		/* F7D2102 */
 #define	USB_PRODUCT_BELKIN_ZD1211B	0x4050		/* ZD1211B */
 #define	USB_PRODUCT_BELKIN_F5D5055	0x5055		/* F5D5055 */
@@ -1196,6 +1200,11 @@
 
 /* Chicony products */
 #define	USB_PRODUCT_CHICONY_KB8933	0x0001		/* KB-8933 keyboard */
+#define	USB_PRODUCT_CHICONY_RTL8188CUS_1	0xaff7		/* RTL8188CUS */
+#define	USB_PRODUCT_CHICONY_RTL8188CUS_2	0xaff8		/* RTL8188CUS */
+#define	USB_PRODUCT_CHICONY_RTL8188CUS_3	0xaff9		/* RTL8188CUS */
+#define	USB_PRODUCT_CHICONY_RTL8188CUS_4	0xaffa		/* RTL8188CUS */
+#define	USB_PRODUCT_CHICONY_RTL8188CUS_5	0xaffa		/* RTL8188CUS */
 
 /* CH Products */
 #define	USB_PRODUCT_CHPRODUCTS_PROTHROTTLE	0x00f1		/* Pro Throttle */
@@ -1946,6 +1955,7 @@
 #define	USB_PRODUCT_HAWKING_RTL8192SU_2	0x0016		/* RTL8192SU */
 #define	USB_PRODUCT_HAWKING_RT2870_4	0x0017		/* RT2870 */
 #define	USB_PRODUCT_HAWKING_RT2870_5	0x0018		/* RT2870 */
+#define	USB_PRODUCT_HAWKING_RTL8192CU	0x0019		/* RTL8192CU */
 #define	USB_PRODUCT_HAWKING_UF100	0x400c		/* 10/100 Ethernet */
 #define	USB_PRODUCT_ABOCOM_UF200	0x420a		/* UF200 Ethernet */
 
@@ -2893,6 +2903,7 @@
 #define	USB_PRODUCT_NETGEAR_WN111V2	0x9001		/* WN111V2 */
 #define	USB_PRODUCT_NETGEAR_WNDA3100	0x9010		/* WNDA3100 */
 #define	USB_PRODUCT_NETGEAR_WNDA3200	0x9018		/* WNDA3200 */
+#define	USB_PRODUCT_NETGEAR_RTL8192CU	0x9021		/* RTL8192CU */
 #define	USB_PRODUCT_NETGEAR_WNA1100	0x9030		/* WNA1100 */
 #define	USB_PRODUCT_NETGEAR_WNA1000	0x9040		/* WNA1000 */
 #define	USB_PRODUCT_NETGEAR_WNA1000M	0x9041		/* WNA1000M */
@@ -2907,6 +2918,9 @@
 #define	USB_PRODUCT_NETGEAR3_WPN111	0x5f00		/* WPN111 */
 #define	USB_PRODUCT_NETGEAR3_WPN111_NF	0x5f01		/* WPN111 */
 
+/* Netgear(4) products */
+#define	USB_PRODUCT_NETGEAR4_RTL8188CU	0x9041		/* RTL8188CU */
+
 /* Nikon products */
 #define	USB_PRODUCT_NIKON_E990	0x0102		/* E990 */
 #define	USB_PRODUCT_NIKON_E880	0x0103		/* E880 */
@@ -3103,8 +3117,10 @@
 #define	USB_PRODUCT_PILOTECH_CRW600	0x0001		/* CRW-600 6-in-1 */
 
 /* Planex Communications products */
+#define	USB_PRODUCT_PLANEX2_RTL8188CUS	0x1201		/* RTL8188CUS */
 #define	USB_PRODUCT_PLANEX_GW_US11H	0x14ea		/* GW-US11H WLAN */
 #define	USB_PRODUCT_PLANEX2_GW_US11S	0x3220		/* GW-US11S WLAN */
+#define	USB_PRODUCT_PLANEX2_RTL8188CU_3	0x4902		/* RTL8188CU */
 #define	USB_PRODUCT_PLANEX2_GW_US54GXS	0x5303		/* GW-US54GXS WLAN */
 #define	USB_PRODUCT_PLANEX2_GW_US300	0x5304		/* GW-US300 */
 #define	USB_PRODUCT_PLANEX2_GWUS54HP	0xab01		/* GW-US54HP */
@@ -3112,6 +3128,7 @@
 #define	USB_PRODUCT_PLANEX3_GWUS54MINI	0xab13		/* GW-US54Mini */
 #define	USB_PRODUCT_PLANEX2_RTL8188CU_1	0xab2a		/* RTL8188CU */
 #define	USB_PRODUCT_PLANEX2_RTL8192CU	0xab2b		/* RTL8192CU */
+#define	USB_PRODUCT_PLANEX2_RTL8188CU_4	0xab2e		/* RTL8188CU */
 #define	USB_PRODUCT_PLANEX2_GWUS54MINI2	0xab50		/* GW-US54Mini2 */
 #define	USB_PRODUCT_PLANEX2_GWUS54SG	0xc002		/* GW-US54SG */
 #define	USB_PRODUCT_PLANEX2_GWUS54GZL	0xc007		/* GW-US54GZL */
@@ -3256,6 +3273,8 @@
 #define	USB_PRODUCT_RATOC_REXUSB60F	0xb020		/* REX-USB60F */
 
 /* Realtek products */
+#define	USB_PRODUCT_REALTEK_RTL8188CTV	0x018a		/* RTL8188CTV */
+#define	USB_PRODUCT_REALTEK_RTL8188RU_2	0x317f		/* RTL8188RU */
 #define	USB_PRODUCT_REALTEK_RTL8150	0x8150		/* RTL8150 */
 #define	USB_PRODUCT_REALTEK_RTL8151	0x8151		/* RTL8151 PNA */
 #define	USB_PRODUCT_REALTEK_RTL8188CE_0	0x8170		/* RTL8188CE */
@@ -3273,11 +3292,13 @@
 #define	USB_PRODUCT_REALTEK_RTL8188CE_1	0x817e		/* RTL8188CE */
 #define	USB_PRODUCT_REALTEK_RTL8187	0x8187		/* RTL8187 */
 #define	USB_PRODUCT_REALTEK_RTL8187B_0	0x8189		/* RTL8187B */
+#define	USB_PRODUCT_REALTEK_RTL8188CUS	0x818a		/* RTL8188CUS */
 #define	USB_PRODUCT_REALTEK_RTL8187B_1	0x8197		/* RTL8187B */
 #define	USB_PRODUCT_REALTEK_RTL8192U	0x8192		/* RTL8192U */
 #define	USB_PRODUCT_REALTEK_RTL8187B_2	0x8198		/* RTL8187B */
 #define	USB_PRODUCT_REALTEK_RTL8712	0x8712		/* RTL8712 */
 #define	USB_PRODUCT_REALTEK_RTL8713	0x8712		/* RTL8713 */
+#define	USB_PRODUCT_REALTEK_RTL8188CU_COMBO	0x8754		/* RTL8188CU */
 #define	USB_PRODUCT_REALTEK_RTL8192SU	0xc512		/* RTL8192SU */
 
 /* Research In Motion products */
@@ -3580,8 +3601,10 @@
 #define	USB_PRODUCT_SITECOMEU_WL349V4	0x0050		/* WL-349 v4 */
 #define	USB_PRODUCT_SITECOMEU_RT3070_1	0x0051		/* RT3070 */
 #define	USB_PRODUCT_SITECOMEU_RTL8188CU	0x0052		/* RTL8188CU */
+#define	USB_PRODUCT_SITECOMEU_RTL8188CU_2	0x005c		/* RTL8188CU */
 #define	USB_PRODUCT_SITECOMEU_RT3072_5	0x005f		/* RT3072 */
 #define	USB_PRODUCT_SITECOMEU_WLA4000	0x0060		/* WLA-4000 */
+#define	USB_PRODUCT_SITECOMEU_RTL8192CU	0x0061		/* RTL8192CU */
 #define	USB_PRODUCT_SITECOMEU_WLA5000	0x0062		/* WLA-5000 */
 #define	USB_PRODUCT_SITECOMEU_LN028	0x061c		/* LN-028 */
 #define	USB_PRODUCT_SITECOMEU_LN030	0x0021		/* LN-030 */
@@ -3818,6 +3841,7 @@
 #define	USB_PRODUCT_TREK_THUMBDRIVE_8MB	0x9988		/* ThumbDrive 8MB */
 
 /* TRENDnet products */
+#define	USB_PRODUCT_TRENDNET_RTL8192CU	0x624d		/* RTL8192CU */
 #define	USB_PRODUCT_TRENDNET_RTL8188CU	0x648b		/* RTL8188CU */
 
 /* Tripp-Lite products */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 82cdf8a806a..2e4074ce77a 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.582 2012/04/08 03:09:59 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.583 2012/04/08 12:15:59 jsg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.578 2012/04/08 03:09:19 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.579 2012/04/08 12:15:21 jsg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -930,6 +930,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "RTL8192SU",
 	},
 	{
+	    USB_VENDOR_ASUS, USB_PRODUCT_ASUS_RTL8192CU,
+	    "RTL8192CU",
+	},
+	{
 	    USB_VENDOR_ASUS, USB_PRODUCT_ASUS_MYPAL_A730,
 	    "MyPal A730",
 	},
@@ -1190,6 +1194,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "AR9271",
 	},
 	{
+	    USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_RTL8188CU,
+	    "RTL8188CU",
+	},
+	{
 	    USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_RTL8188CE_1,
 	    "RTL8188CE",
 	},
@@ -1366,6 +1374,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "F5U120-PC Hub",
 	},
 	{
+	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_RTL8192CU,
+	    "RTL8192CU",
+	},
+	{
 	    USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F7D2102,
 	    "F7D2102",
 	},
@@ -1614,6 +1626,26 @@ const struct usb_known_product usb_known_products[] = {
 	    "KB-8933 keyboard",
 	},
 	{
+	    USB_VENDOR_CHICONY, USB_PRODUCT_CHICONY_RTL8188CUS_1,
+	    "RTL8188CUS",
+	},
+	{
+	    USB_VENDOR_CHICONY, USB_PRODUCT_CHICONY_RTL8188CUS_2,
+	    "RTL8188CUS",
+	},
+	{
+	    USB_VENDOR_CHICONY, USB_PRODUCT_CHICONY_RTL8188CUS_3,
+	    "RTL8188CUS",
+	},
+	{
+	    USB_VENDOR_CHICONY, USB_PRODUCT_CHICONY_RTL8188CUS_4,
+	    "RTL8188CUS",
+	},
+	{
+	    USB_VENDOR_CHICONY, USB_PRODUCT_CHICONY_RTL8188CUS_5,
+	    "RTL8188CUS",
+	},
+	{
 	    USB_VENDOR_CHPRODUCTS, USB_PRODUCT_CHPRODUCTS_PROTHROTTLE,
 	    "Pro Throttle",
 	},
@@ -3918,6 +3950,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT2870",
 	},
 	{
+	    USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_RTL8192CU,
+	    "RTL8192CU",
+	},
+	{
 	    USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_UF100,
 	    "10/100 Ethernet",
 	},
@@ -6946,6 +6982,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "WNDA3200",
 	},
 	{
+	    USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_RTL8192CU,
+	    "RTL8192CU",
+	},
+	{
 	    USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_WNA1100,
 	    "WNA1100",
 	},
@@ -6982,6 +7022,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "WPN111",
 	},
 	{
+	    USB_VENDOR_NETGEAR4, USB_PRODUCT_NETGEAR4_RTL8188CU,
+	    "RTL8188CU",
+	},
+	{
 	    USB_VENDOR_NIKON, USB_PRODUCT_NIKON_E990,
 	    "E990",
 	},
@@ -7534,6 +7578,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "CRW-600 6-in-1",
 	},
 	{
+	    USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_RTL8188CUS,
+	    "RTL8188CUS",
+	},
+	{
 	    USB_VENDOR_PLANEX, USB_PRODUCT_PLANEX_GW_US11H,
 	    "GW-US11H WLAN",
 	},
@@ -7542,6 +7590,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "GW-US11S WLAN",
 	},
 	{
+	    USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_RTL8188CU_3,
+	    "RTL8188CU",
+	},
+	{
 	    USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GW_US54GXS,
 	    "GW-US54GXS WLAN",
 	},
@@ -7570,6 +7622,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "RTL8192CU",
 	},
 	{
+	    USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_RTL8188CU_4,
+	    "RTL8188CU",
+	},
+	{
 	    USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS54MINI2,
 	    "GW-US54Mini2",
 	},
@@ -7962,6 +8018,14 @@ const struct usb_known_product usb_known_products[] = {
 	    "REX-USB60F",
 	},
 	{
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188CTV,
+	    "RTL8188CTV",
+	},
+	{
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188RU_2,
+	    "RTL8188RU",
+	},
+	{
 	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8150,
 	    "RTL8150",
 	},
@@ -8030,6 +8094,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "RTL8187B",
 	},
 	{
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188CUS,
+	    "RTL8188CUS",
+	},
+	{
 	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8187B_1,
 	    "RTL8187B",
 	},
@@ -8050,6 +8118,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "RTL8713",
 	},
 	{
+	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8188CU_COMBO,
+	    "RTL8188CU",
+	},
+	{
 	    USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8192SU,
 	    "RTL8192SU",
 	},
@@ -9002,6 +9074,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "RTL8188CU",
 	},
 	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RTL8188CU_2,
+	    "RTL8188CU",
+	},
+	{
 	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3072_5,
 	    "RT3072",
 	},
@@ -9010,6 +9086,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "WLA-4000",
 	},
 	{
+	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RTL8192CU,
+	    "RTL8192CU",
+	},
+	{
 	    USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WLA5000,
 	    "WLA-5000",
 	},
@@ -9594,6 +9674,10 @@ const struct usb_known_product usb_known_products[] = {
 	    "ThumbDrive 8MB",
 	},
 	{
+	    USB_VENDOR_TRENDNET, USB_PRODUCT_TRENDNET_RTL8192CU,
+	    "RTL8192CU",
+	},
+	{
 	    USB_VENDOR_TRENDNET, USB_PRODUCT_TRENDNET_RTL8188CU,
 	    "RTL8188CU",
 	},
@@ -12470,6 +12554,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "MosChip",
 	},
 	{
+	    USB_VENDOR_NETGEAR4,
+	    "Netgear",
+	},
+	{
 	    USB_VENDOR_MARVELL,
 	    "Marvell",
 	},